From: Frédéric Marchal Date: Wed, 4 Nov 2009 08:50:47 +0000 (+0000) Subject: When multiple access.log are read, any empty access.log prevents the generation of... X-Git-Tag: v2_2_6~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f59b6fde0ae3eb0f3a525b634351cc430a5daa8f;p=thirdparty%2Fsarg.git When multiple access.log are read, any empty access.log prevents the generation of the report even if valid records are found in another access.log. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8688f5a..07b616c 100755 --- 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 d5ac266..bc0735f 100755 --- 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 b91b1ba..d6a3cd5 100644 --- 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 f8361fb..455d5cb 100644 --- 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 f910de6..8a05cbd 100644 --- 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 4fc4163..d4578af 100644 --- 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 c24d70d..ff58a80 100644 --- 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 8ac9a27..a33ae95 100644 --- 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 ba3f788..da76f30 100644 --- 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 12fb4db..3e5d20f 100644 --- 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 f736401..ee48a15 100644 --- a/languages/Greek +++ b/languages/Greek @@ -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/Hungarian b/languages/Hungarian index 042cab0..8635103 100644 --- 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 6e5773d..47a9727 100644 --- 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 bb2b7ff..3fa5118 100644 --- 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 92f7bcf..8aab07c 100644 --- 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 3c3db77..74db2ac 100644 --- 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 461ef37..2171437 100644 --- 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 08baf6e..7c27278 100644 --- 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 a6d3dd9..a06d6df 100644 --- 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 657f8f2..21d4c05 100644 --- 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 d057216..aabf185 100755 --- 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 341991f..f6308f6 100644 --- 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 754dab7..c393fb6 100644 --- 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 9482640..db76c32 100644 --- 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 de2944a..4b596f8 100644 --- 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 9b86ef0..0dcf003 100644 --- 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 6dcd938..6592743 100644 --- 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 b6beb80..2e3f8a9 100644 --- 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 b997c09..1a46301 100644 --- 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); }