From 892b089adc787f5d0bd1810098338eee97f8aa91 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 23 Jan 2012 11:39:51 -0800
Subject: [PATCH] Take all files into account when tailing, but only read
 needed files

---
 syslog/save_log.cgi | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/syslog/save_log.cgi b/syslog/save_log.cgi
index 378e7890e..f108edf52 100755
--- a/syslog/save_log.cgi
+++ b/syslog/save_log.cgi
@@ -90,7 +90,7 @@ elsif ($in{'view'}) {
 			@cats = ( "cat ".quotemeta($file) );
 			}
 		$cat = "(".join(" ; ", @cats).")";
-		$got = &foreign_call("proc", "safe_process_exec",
+		$got = &proc::safe_process_exec(
 			"$cat | grep -i $filter | $tailcmd",
 			0, 0, STDOUT, undef, 1, 0, undef, 1);
 	} else {
@@ -100,25 +100,28 @@ elsif ($in{'view'}) {
 			$fullcmd = $cmd." | ".$tailcmd;
 			}
 		elsif ($config{'compressed'}) {
-			# Find the first non-empty file, newest first
-			$catter = "cat ".quotemeta($file);
-			if (!-s $file) {
-				foreach $l (reverse(&all_log_files($file))) {
-					next if (!-s $l);
-					$c = &catter_command($l);
-					if ($c) {
-						$catter = $c;
-						last;
-						}
+			# Cat all compressed files
+			local @cats;
+			$total = 0;
+			foreach $l (reverse(&all_log_files($file))) {
+				next if (!-s $l);
+				$c = &catter_command($l);
+				if ($c) {
+					$len = int(&backquote_command(
+							"$c | wc -l"));
+					$total += $len;
+					push(@cats, $c);
+					last if ($total > $in{'lines'});
 					}
 				}
-			$fullcmd = $catter." | ".$tailcmd;
+			$cat = "(".join(" ; ", reverse(@cats)).")";
+			$fullcmd = $cat." | ".$tailcmd;
 			}
 		else {
 			# Just run tail on the file
 			$fullcmd = $tailcmd." ".quotemeta($file);
 			}
-		$got = &foreign_call("proc", "safe_process_exec",
+		$got = &proc::safe_process_exec(
 			$fullcmd, 0, 0, STDOUT, undef, 1, 0, undef, 1);
 		}
 	print "<i>$text{'view_empty'}</i>\n" if (!$got);