Report an error if the tail command cannot read the last lines of the log file when...

Surrond the log file name with quotes in the command that read the trailing lines of the log file when creating a realtime report.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14c2970bc98297c558a88b6161095200491a8420..9b6d7de44b9ca546d23a6f18e401704eb147577d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION "3.1-pre1")
 SET(sarg_BUILD "")
-SET(sarg_BUILDDATE "Aug-27-2010")
+SET(sarg_BUILDDATE "Sep-02-2010")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/ChangeLog b/ChangeLog
index a41db3971be94f13edb2157d58d2f4c3c1bccd37..c0a39d38d0339397ba97e61e198676418e26a615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Aug-27-2010 Version 2.3.1
+Sep-02-2010 Version 2.3.1
                - Remove the distinct printf for the alpha architecture as it doesn't work anymore and is not necessary anyway.
                - Don't abort if "onload" or "script" is found in the user agent string.
                - Take the configured locale path into account when installing sarg.
@@ -13,6 +13,7 @@ Aug-27-2010 Version 2.3.1
                - Report an error if the output directory is a subdirectory of the temporary directory.
                - Use a more robust protection against an attack using javascript in the useragent string.
                - Prevent a segfault if the parameter passed to command line option -d is invalid (thanks to ItalianPenguin).
+               - Check for the return code of the tail command to generate the realtime report.
 
 Jun-21-2010 Version 2.3
                - LDAP usertab added. 

diff --git a/include/info.h b/include/info.h
index 70dfd87cda5b4f6eec1c96c1efa94cc467f9ef1c..6549948a4b14a3c6b57597ce02ba657007405a54 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Aug-27-2010"
+#define VERSION PACKAGE_VERSION" Sep-02-2010"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"

diff --git a/realtime.c b/realtime.c
index 4f6f456c3fd265a2e6667acaa83002d51f05eca5..9d47fdd4e21b667089c791dff877ed6ffc9b9a69 100755 (executable)
--- a/realtime.c
+++ b/realtime.c
@@ -65,8 +65,13 @@ static void getlog(void)
       exit(EXIT_FAILURE);
    }
 
-   sprintf(cmd,"tail -%d %s",realtime_access_log_lines,AccessLog[0]);
+   sprintf(cmd,"tail -%d \"%s\"",realtime_access_log_lines,AccessLog[0]);
    fp = popen(cmd, "r");
+   if (!fp) {
+      debuga(_("Failed to get the %d trailing lines of %s: %s\n"),realtime_access_log_lines,AccessLog[0],strerror(errno));
+      debuga(_("tail command: %s\n"),cmd);
+      exit(EXIT_FAILURE);
+   }
    while((buf=longline_read(fp,line)) != NULL )
       if (getdata(buf,tmp)<0) {
          debuga(_("Maybe a broken record or garbage was returned by %s\n"),cmd);