Don't translate the boolean flags from sarg.conf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffac54fd5fde3811d12996d459e17fce0f4802b7..c7721b81449c9209f979f51e67608616cbdfa99c 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 "7")
-SET(sarg_BUILDDATE "Jan-26-2010")
+SET(sarg_BUILDDATE "Jan-27-2010")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/ChangeLog b/ChangeLog
index 24e6e1def41bcc654e987d6957c27e1776caac1a..e20c67e33230cf8cb48059b7e84967cdecc9d953 100644 (file)
--- 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 9a0dfe5d4c754dbcfa4b63871e581e6bb438efbc..7a9af39e4554e57955fb60ded9970f15aaf4274f 100644 (file)
--- 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 1fb8de39e01b254e2ab0baba4c03716ae2ab7275..be804d816a3b43553b244d7d3cf96dce64e92e06 100755 (executable)
--- 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 4df79e4002a6d64d5538c9c83caac95c11bdea2b..904225037c1b53ef28cb472121723e50c79e49c6 100644 (file)
--- 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 c1ad1de8b99dc0c0818e7bb1de9f403103ee6a1f..d20522a84a0450adb5b770669254d8ce5d208818 100644 (file)
--- 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 f7d659bb1db217fbba1076d947f49cb3f288dc6d..dfbda8f90f4cd5ecf70c97f4bddb861abf3ae9ec 100644 (file)
--- 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 ef028ff5c3646704ee4e1f388d6cad962e1622bb..b05f09207cf5907e957f3cb7867759f95cfe7afc 100644 (file)
--- 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 0b8a5888609abf7a2c31cd253fac527df343d8dc..85e978a5a1444d026b1c4643467a8d69938cd5f6 100644 (file)
--- 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 d9ae4d03714a68ffe7e9fe3e03f65b1c3917d006..ed66ad214e4504883e232c65ed4f9c3e74d3961b 100644 (file)
--- 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 d3ec084cc1da099c1f161284a2e3f5194adf2a9d..88b0abcb751ee819bc1632d49112e8c5620920cd 100644 (file)
--- 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 c0b67e9165547f04d2c06760cb3d43d6d67c1a64..77ed28d43c8c015ae99a600f49f35fd80761b16b 100644 (file)
--- 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 625efb3ff70040c2234acaef0d2df5e045874b65..143d7ee96c9124c0bd64f0da3f8f92d192c88209 100644 (file)
--- 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 652062ca5954e735e765b7a70ded830b2dc9389a..28ee7eccabc365c8d9c0f1785cf753397348952f 100644 (file)
--- 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 f4990ec310278ae7b12b745d32f0920290fc9944..32f196819dc1f338f03b5b09a7299ab6bfaf2573 100644 (file)
--- 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 743e500a922860763867eb1bd7ae0cfca0db3515..41835059253539d6e6f7fe41c0df3b2e0e3e25bd 100644 (file)
--- 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 320d082383256b158bfc41099b2c55fe2fb61b63..690114a795848790b6171ec546c21efa471c649a 100644 (file)
--- 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 3fca7bd8beffb9c099fe27a054872bd0de80bced..769c421eb6bbd2d0e59286f80127a007d0fea2b2 100644 (file)
--- 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 1eb3f83acc941392b7a958fc21c1c947710a4adb..f0f1aa19f5fa8a32cbde5f99cc4b3c6cbb10766b 100644 (file)
--- 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 d140934ef075daa048e0aebc8d17a391ae029104..87bf355aedee51050ce6d796a0eba3f1322773ff 100644 (file)
--- 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 676ded1d3b4b9655c1d57ff6951dca7c108d99ca..ed5f018e5b5b8a53d705916df5b9d55d9f52479c 100644 (file)
--- 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 0e9247430d4bb941ba7dfacb771930634a41dcc0..8ff6942c4942ae62beac045661e1188c3b91bc5f 100644 (file)
--- 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 f540b4630b733fab2ec2eadeb0dd10accbd2f439..f8385632df4d5dd6c33b0c6907872875a4e095f0 100755 (executable)
--- 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 30ccf037b1a8ba4b3e87306bebe8361d35b3651c..fb33afd9754692bcc118ffca3e99ee5f845f9e43 100644 (file)
--- 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 dbf1883176dc5f2f767e79eb8623778dfb09ee0e..9fbadb5766eedb14c95373bbab666a3e7794c2ab 100644 (file)
--- 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 9bb0f68771c71549769c7f27ac805301c0e4c900..b9d16bb964c7367e2b4f42223335f5dc148cf9d4 100644 (file)
--- 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 d831a3f76fad0fd92878ac53f0b1b7de106014b3..a2335b27fc3f98be9cdac0b53348f1d84f378e79 100644 (file)
--- 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 b02442a0b3f3ecab7e4e9f500253df2083c8988e..437e153a86f6693aa7d05d501f1acef00ea1bcdf 100644 (file)
--- 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 0f07619744b97fe2ba27687e24ffbaa3d7892508..d3ca5ac06f97f542a8da373110d978308c73d127 100644 (file)
--- 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 505e85b9fe6268ba073982e41200f470d32ed991..dd1acc43c1bdcd2702a5d6daf7dc1e70c8ca6712 100644 (file)
--- 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"