From: Frédéric Marchal Date: Wed, 27 Jan 2010 07:40:58 +0000 (+0000) Subject: Don't translate the boolean flags from sarg.conf X-Git-Tag: v2_2_7~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6ff06fa7d9cf714f4724407e913d0dc12379b0a;p=thirdparty%2Fsarg.git Don't translate the boolean flags from sarg.conf --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ffac54f..c7721b8 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 "7") -SET(sarg_BUILDDATE "Jan-26-2010") +SET(sarg_BUILDDATE "Jan-27-2010") INCLUDE(AddFileDependencies) INCLUDE(CheckIncludeFile) diff --git a/ChangeLog b/ChangeLog index 24e6e1d..e20c67e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ SARG ChangeLog -Jan-26-2010 Version 2.2.7 +Jan-27-2010 Version 2.2.7 - Extra compile and run time protection (FORTIFY_SOURCE) fixed in configure. - Use tabulations as columns separator in intermediary files to avoid problems when a field of the log contains a space. - Input log file type detection partly rewritten to clearly distinguish which type is processed where. diff --git a/getconf.c b/getconf.c index 9a0dfe5..7a9af39 100644 --- a/getconf.c +++ b/getconf.c @@ -149,8 +149,8 @@ static int getparam_int(const char *param,char *buf,int *value) static int getparam_bool(const char *param,char *buf,int *value) { int plen; - char *str; int i; + const char *bool_str="yes,true,on,1"; plen=strlen(param); if (strncmp(buf,param,plen) != 0) return(0); @@ -159,15 +159,13 @@ static int getparam_bool(const char *param,char *buf,int *value) while (*buf && (unsigned char)*buf<=' ') buf++; *value=0; - str=text[144]; - if (str == NULL || *str == '\0') str="yes"; - for ( ; *str ; str+=i) { - for (i=0 ; str[i] && str[i]!=',' ; i++); - if (strncasecmp(str,buf,i)==0) { + for ( ; *bool_str ; bool_str+=i) { + for (i=0 ; bool_str[i] && bool_str[i]!=',' ; i++); + if (strncasecmp(bool_str,buf,i)==0) { *value=1; break; } - if (str[i]==',') i++; + if (bool_str[i]==',') i++; } return(1); } diff --git a/include/info.h b/include/info.h index 1fb8de3..be804d8 100755 --- a/include/info.h +++ b/include/info.h @@ -1,3 +1,3 @@ -#define VERSION PACKAGE_VERSION" Jan-26-2010" +#define VERSION PACKAGE_VERSION" Jan-27-2010" #define PGM PACKAGE_NAME #define URL "http://sarg.sourceforge.net" diff --git a/languages/Bulgarian_windows1251 b/languages/Bulgarian_windows1251 index 4df79e4..9042250 100644 --- a/languages/Bulgarian_windows1251 +++ b/languages/Bulgarian_windows1251 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Catalan b/languages/Catalan index c1ad1de..d20522a 100644 --- a/languages/Catalan +++ b/languages/Catalan @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Czech b/languages/Czech index f7d659b..dfbda8f 100644 --- a/languages/Czech +++ b/languages/Czech @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Czech_UTF8 b/languages/Czech_UTF8 index ef028ff..b05f092 100644 --- a/languages/Czech_UTF8 +++ b/languages/Czech_UTF8 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Dutch b/languages/Dutch index 0b8a588..85e978a 100644 --- a/languages/Dutch +++ b/languages/Dutch @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/English b/languages/English index d9ae4d0..ed66ad2 100644 --- a/languages/English +++ b/languages/English @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/French b/languages/French index d3ec084..88b0abc 100644 --- a/languages/French +++ b/languages/French @@ -142,4 +142,3 @@ "fin du fichier atteinte prématurément pour" "analyse du fichier suivant" "Log produit par Microsoft ISA" -"yes,true,on,1,oui,vrai" diff --git a/languages/German b/languages/German index c0b67e9..77ed28d 100644 --- a/languages/German +++ b/languages/German @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Greek b/languages/Greek index 625efb3..143d7ee 100644 --- a/languages/Greek +++ b/languages/Greek @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Hungarian b/languages/Hungarian index 652062c..28ee7ec 100644 --- a/languages/Hungarian +++ b/languages/Hungarian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Indonesian b/languages/Indonesian index f4990ec..32f1968 100644 --- a/languages/Indonesian +++ b/languages/Indonesian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Italian b/languages/Italian index 743e500..4183505 100644 --- a/languages/Italian +++ b/languages/Italian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Japanese b/languages/Japanese index 320d082..690114a 100644 --- a/languages/Japanese +++ b/languages/Japanese @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Latvian b/languages/Latvian index 3fca7bd..769c421 100644 --- a/languages/Latvian +++ b/languages/Latvian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Polish b/languages/Polish index 1eb3f83..f0f1aa1 100644 --- a/languages/Polish +++ b/languages/Polish @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Polish_windows1250 b/languages/Polish_windows1250 index d140934..87bf355 100644 --- a/languages/Polish_windows1250 +++ b/languages/Polish_windows1250 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Portuguese b/languages/Portuguese index 676ded1..ed5f018 100644 --- a/languages/Portuguese +++ b/languages/Portuguese @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Romanian b/languages/Romanian index 0e92474..8ff6942 100644 --- a/languages/Romanian +++ b/languages/Romanian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Russian_UTF-8 b/languages/Russian_UTF-8 index f540b46..f838563 100755 --- a/languages/Russian_UTF-8 +++ b/languages/Russian_UTF-8 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Russian_koi8 b/languages/Russian_koi8 index 30ccf03..fb33afd 100644 --- a/languages/Russian_koi8 +++ b/languages/Russian_koi8 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Russian_windows1251 b/languages/Russian_windows1251 index dbf1883..9fbadb5 100644 --- a/languages/Russian_windows1251 +++ b/languages/Russian_windows1251 @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Serbian b/languages/Serbian index 9bb0f68..b9d16bb 100644 --- a/languages/Serbian +++ b/languages/Serbian @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Slovak b/languages/Slovak index d831a3f..a2335b2 100644 --- a/languages/Slovak +++ b/languages/Slovak @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Spanish b/languages/Spanish index b02442a..437e153 100644 --- a/languages/Spanish +++ b/languages/Spanish @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Turkish b/languages/Turkish index 0f07619..d3ca5ac 100644 --- a/languages/Turkish +++ b/languages/Turkish @@ -142,4 +142,3 @@ "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1" diff --git a/languages/Ukrainian_windows1251 b/languages/Ukrainian_windows1251 index 505e85b..dd1acc4 100644 --- a/languages/Ukrainian_windows1251 +++ b/languages/Ukrainian_windows1251 @@ -142,4 +142,3 @@ DansGuardian" "unexpected end of file encountered in" "skipping to next file" "Log is from Microsoft ISA" -"yes,true,on,1"