When multiple access.log are read, any empty access.log prevents the generation of...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8688f5a2102f51aabd6938edc312a7ac47e1af85..07b616c5735494abe91d81571d69b7bb0b7b0a02 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
 SET(sarg_BUILD "6rc1")
-SET(sarg_BUILDDATE "Oct-30-2009")
+SET(sarg_BUILDDATE "Nov-04-2009")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/include/info.h b/include/info.h
index d5ac2661cf7d48b6cd290064ad7a9514eabadb0d..bc0735f97c9dee40b2683264ac37a98ae2a30475 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Oct-30-2009"
+#define VERSION PACKAGE_VERSION" Nov-04-2009"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"

diff --git a/languages/Bulgarian_windows1251 b/languages/Bulgarian_windows1251
index b91b1bacc815f0e5758e7faf46e74f630fc7bf17..d6a3cd5d7b450fb14e891cfcd28ebef61afbef73 100644 (file)
--- a/languages/Bulgarian_windows1251
+++ b/languages/Bulgarian_windows1251
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Catalan b/languages/Catalan
index f8361fb61d9471ece5d1d4345832bc7d7c37c3af..455d5cbe225a3a9d953429bdc20fe12705158430 100644 (file)
--- a/languages/Catalan
+++ b/languages/Catalan
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Czech b/languages/Czech
index f910de6b38b72077c8e3acb16825e9d2973563f8..8a05cbd606c7ab3aaf4b55ded50d8d8f60a5bbd5 100644 (file)
--- a/languages/Czech
+++ b/languages/Czech
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Czech_UTF8 b/languages/Czech_UTF8
index 4fc4163aa4794eb8f399723edf7248928b269371..d4578af4d95bf9f0eb328da30e51fd84b93cc277 100644 (file)
--- a/languages/Czech_UTF8
+++ b/languages/Czech_UTF8
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Dutch b/languages/Dutch
index c24d70d40dd5af98cab59fc2837f400edfb36f49..ff58a80a29ba66b08f75c3654a61b2e30243ca70 100644 (file)
--- a/languages/Dutch
+++ b/languages/Dutch
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/English b/languages/English
index 8ac9a27f2c3ed4a62738d62717f48a7a607aa299..a33ae95353aa921c6023df7a7dbd237df71d61d0 100644 (file)
--- a/languages/English
+++ b/languages/English
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/French b/languages/French
index ba3f78892ec6731ba32c5298dc59ca2218ec6067..da76f30500833226a2822de472ad627ad8c975dd 100644 (file)
--- a/languages/French
+++ b/languages/French
@@ -139,3 +139,5 @@
 "Pré triage des fichiers"
 "Guillemet manquant après le paramètre"
 "Option inconnue"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/German b/languages/German
index 12fb4db6b7403bbeb34e9adbf9ad2b076b76b415..3e5d20f07366ec3c35fa7fb1dc8f3c39b8964035 100644 (file)
--- a/languages/German
+++ b/languages/German
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Greek b/languages/Greek
index f736401895e72fb861f435ef80b00bdfea7cb508..ee48a159ca225814cc74b77b6728a48a8466cf33 100644 (file)
--- a/languages/Greek
+++ b/languages/Greek
@@ -139,3 +139,5 @@
 "pre-sorting files"\r
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Hungarian b/languages/Hungarian
index 042cab0b06e428cf36355ce4ba22ec223a774487..8635103932539494531194ffa104f2462d340105 100644 (file)
--- a/languages/Hungarian
+++ b/languages/Hungarian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Indonesian b/languages/Indonesian
index 6e5773d6b08ab3b8e13f0ddb2c64fcaf146764f5..47a9727f425a1524a9c76aabac290438e26ce4f5 100644 (file)
--- a/languages/Indonesian
+++ b/languages/Indonesian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Italian b/languages/Italian
index bb2b7fff5bbb7a2b1f9216fcd3a533d0b9a6b659..3fa5118b790e0e88e26cb1bf4b70bb7ca1b1941b 100644 (file)
--- a/languages/Italian
+++ b/languages/Italian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Japanese b/languages/Japanese
index 92f7bcfdaed91bcf1dd9cd732cacc9b1d8594eda..8aab07cb308884a37475b57d5df06ca954eee68f 100644 (file)
--- a/languages/Japanese
+++ b/languages/Japanese
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Latvian b/languages/Latvian
index 3c3db77c75bf88436dcbb1a37b3d1eaa3c2c5786..74db2ac398c5ceeb2b643f959216330c2cee2d6f 100644 (file)
--- a/languages/Latvian
+++ b/languages/Latvian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Polish b/languages/Polish
index 461ef37441f7ab6d585f6d8bda0936c6c4d7b49e..2171437f12ba0d7be8455c08ffcbe9ac2eaf9233 100644 (file)
--- a/languages/Polish
+++ b/languages/Polish
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Polish_windows1250 b/languages/Polish_windows1250
index 08baf6ed2a40fa4ce82ae912803ecc80e432170e..7c2727845268c6fef295e1b31dcb45dd82da0f69 100644 (file)
--- a/languages/Polish_windows1250
+++ b/languages/Polish_windows1250
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Portuguese b/languages/Portuguese
index a6d3dd99a41ef4a6252f234d0771d3615a33a087..a06d6df692954ec765fb9158017679dd23737e8b 100644 (file)
--- a/languages/Portuguese
+++ b/languages/Portuguese
@@ -139,3 +139,5 @@
 "pre-classificando arquivos"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Romanian b/languages/Romanian
index 657f8f2d5365de73bf929d8b400e9635654cf953..21d4c05af6a35da12457822a00f911cbb43402a3 100644 (file)
--- a/languages/Romanian
+++ b/languages/Romanian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Russian_UTF-8 b/languages/Russian_UTF-8
index d05721637cbf663ce34222950c9e1b58a6141c77..aabf185c35d267052a71fcee8d26756f80b4d92d 100755 (executable)
--- a/languages/Russian_UTF-8
+++ b/languages/Russian_UTF-8
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Russian_koi8 b/languages/Russian_koi8
index 341991fd8d86f30f0bfae3ce9c906eebd6815d15..f6308f634cf4dfb0d892e5b31f33fbbc9e07fae5 100644 (file)
--- a/languages/Russian_koi8
+++ b/languages/Russian_koi8
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Russian_windows1251 b/languages/Russian_windows1251
index 754dab77169fc28eb2c04682f10639d7fe0c973f..c393fb6c81f02548c031aebf41a8a6c934327a86 100644 (file)
--- a/languages/Russian_windows1251
+++ b/languages/Russian_windows1251
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Serbian b/languages/Serbian
index 94826404dd459df5a1b3e88f59fe7a996e632eea..db76c32512600db822cb2442861e3d06e1b2aeee 100644 (file)
--- a/languages/Serbian
+++ b/languages/Serbian
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Slovak b/languages/Slovak
index de2944a21beadeb5b9e9343f8abfa169611027f4..4b596f83c850e59f51b6072af8f09eb45c4eca25 100644 (file)
--- a/languages/Slovak
+++ b/languages/Slovak
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Spanish b/languages/Spanish
index 9b86ef0bdc7e32a74f5c3f1fce90601b9ee675cf..0dcf0031684d85f036aa2d700b643c43f43126e4 100644 (file)
--- a/languages/Spanish
+++ b/languages/Spanish
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Turkish b/languages/Turkish
index 6dcd938d015ac6b150d46c5190e5a3546c92f356..65927435b212db84ced5e4639722ac409fd62e66 100644 (file)
--- a/languages/Turkish
+++ b/languages/Turkish
@@ -139,3 +139,5 @@
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/languages/Ukrainian_windows1251 b/languages/Ukrainian_windows1251
index b6beb80e83e66c3ee6a03ce0230805389c2ff12b..2e3f8a9ad964ab15897eadee758f04d92b7e0145 100644 (file)
--- a/languages/Ukrainian_windows1251
+++ b/languages/Ukrainian_windows1251
@@ -139,3 +139,5 @@ DansGuardian"
 "pre-sorting files"
 "Missing double quote after parameter"
 "Unknown option"
+"unexpected end of file encountered in"
+"skipping to next file"

diff --git a/log.c b/log.c
index b997c0965cce335ad3a90f8d6a057674b153a5cf..1a46301ee794d2121ef452842960865991f14e65 100644 (file)
--- a/log.c
+++ b/log.c
@@ -717,6 +717,12 @@ int main(int argc,char *argv[])
          exit(1);
       }
       if (!fgets(bufz,sizeof(bufz),fp_in)) {
+         if (feof(fp_in)) {
+            fprintf(stderr,"SARG: %s %s\n",text[141],arq);
+            if (narq>0) fprintf(stderr,"SARG: %s\n",text[142]);
+            fclose(fp_in);
+            continue;
+         }
          fprintf(stderr,"SARG: read error in %s\n",arq);
          exit(1);
       }