From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Mon, 3 Aug 2009 17:12:59 +0000 (+0000)
Subject: Minor changes.
X-Git-Tag: v2_2_6~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5542cb595bd870cebe994de5cdebcbf0ddfe6bc2;p=thirdparty%2Fsarg.git

Minor changes.
---

diff --git a/datafile.c b/datafile.c
index f0dea83..d12998e 100644
--- a/datafile.c
+++ b/datafile.c
@@ -27,7 +27,6 @@
 #include "include/defs.h"
 
 void saverecs(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache);
-void grava_SmartFilter(char *dirname, char *user, char *ip, char *data, char *hora, char *url, char *smart);
 
 void data_file(char *tmp)
 {
@@ -38,7 +37,7 @@ void data_file(char *tmp)
    char oldaccdia[11], oldacchora[9], oldaccip[MAXLEN];
    char dirname[MAXLEN], wdirname[MAXLEN], oldurl[MAXLEN], oldaccuser[MAXLEN];
    char olduser[MAXLEN], oldmsg[50], acccode[50], oldaccelap[10], oldacccode[50];
-   char ipantes[MAXLEN], nameantes[MAXLEN]; 
+   char ipantes[MAXLEN], nameantes[MAXLEN];
    char accsmart[MAXLEN];
    char wcrc[50];
    char crc2[50];
@@ -46,8 +45,8 @@ void data_file(char *tmp)
    char wname2[MAXLEN];
    DIR *dirp;
    struct dirent *direntp;
-   long long int nbytes=0; 
-   long long int nelap=0; 
+   long long int nbytes=0;
+   long long int nelap=0;
    long long int nacc=0;
    long long int rtotal=0;
    long long int incache=0;
@@ -86,16 +85,16 @@ void data_file(char *tmp)
             printf("SARG: Maybe you have a broken record or garbage in your %s file.\n",tmp3);
             exit(1);
          }
-   
+
          if(strcmp(Ip2Name,"yes") == 0) {
             if(strcmp(accip,ipantes) != 0) {
                strcpy(ipantes,accip);
                ip2name(accip,sizeof(accip));
                strcpy(nameantes,accip);
-            } 
-	    else strcpy(accip,nameantes);
+            }
+            else strcpy(accip,nameantes);
          }
-   
+
          if(!rtotal){
             strcpy(oldurl,accurl);
             strcpy(oldacccode,acccode);
@@ -106,7 +105,7 @@ void data_file(char *tmp)
             strcpy(oldacchora,acchora);
             rtotal++;
          }
-   
+
          if(strcmp(oldurl,accurl) != 0 || strcmp(oldaccuser,accuser) != 0){
             strcpy(oldmsg,"OK");
             if(strstr(oldacccode,"DENIED") != 0) strcpy(oldmsg,text[46]);
@@ -125,7 +124,7 @@ void data_file(char *tmp)
          nacc++;
          nbytes+=my_atoll(accbytes);
          nelap+=my_atoll(accelap);
-   
+
          strcpy(wcrc,acccode);
          if (getword(crc2,sizeof(crc2),wcrc,'/')<0) {
             printf("SARG: Maybe you have a broken record or garbage in your %s file.\n",tmp3);
@@ -134,7 +133,7 @@ void data_file(char *tmp)
 
          if(strstr(crc2,"MISS") != 0) oucache+=my_atoll(accbytes);
          else incache+=my_atoll(accbytes);
-   
+
          strcpy(oldurl,accurl);
          strcpy(oldaccuser,accuser);
          strcpy(oldacccode,acccode);
@@ -143,10 +142,10 @@ void data_file(char *tmp)
          strcpy(oldaccdia,accdia);
          strcpy(oldacchora,acchora);
       }
-   
+
       fclose(fp_in);
 }
-   
+
    (void)closedir( dirp );
    if(debug)
       debuga("Datafile %s successfully",DataFile);
diff --git a/log.c b/log.c
index 421dd89..e73b727 100644
--- a/log.c
+++ b/log.c
@@ -1059,23 +1059,20 @@ int main(int argc,char *argv[])
             sprintf(user,"%s.%s",w,wuser);
          }
 
-         str=user;
-         for(z1=0; str[z1]; z1++) {
-            if(isalnum(str[z1]) || ispunct(str[z1])) {
-            if(str[z1]=='.') dotinuser++;
-            if(str[z1]=='?' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\')
-               str[z1]='_';
-            }
+         for(str=user; *str; str++) {
+            if(*str=='.') dotinuser++;
+            if(*str=='?' || *str=='.' || *str==':' || *str=='/' || *str=='\\')
+               *str='_';
          }
 
          strlow(user);
          if(strncmp(NtlmUserFormat,"user",4) == 0) {
-            if(strstr(user,"_") != 0)
+            if(strchr(user,'_') != 0)
                if (getword_multisep(warea,sizeof(warea),user,'_')<0){
                   printf("SARG: Maybe you have a broken user in your %s file.\n",arq);
                   exit(1);
                }
-            if(strstr(user,"+") != 0)
+            if(strchr(user,'+') != 0)
                if (getword_multisep(warea,sizeof(warea),user,'+')<0){
                   printf("SARG: Maybe you have a broken user in your %s file.\n",arq);
                   exit(1);
@@ -1189,7 +1186,7 @@ int main(int argc,char *argv[])
             printf("DATE=%s IDATA=%d DFROM=%d DUNTIL=%d\n",date,idata,dfrom,duntil);
 
          l=1;
-         if(strlen(us)>0){
+         if(us[0] != '\0'){
             if(strcmp(user,us)==0)
                l=1;
             else
@@ -1197,7 +1194,7 @@ int main(int argc,char *argv[])
          }
 
          if(l){
-            if(strlen(addr)>0){
+            if(addr[0] != '\0'){
                if(strcmp(addr,ip)==0)
                   l=1;else l=0;
             }
@@ -1212,13 +1209,13 @@ int main(int argc,char *argv[])
          }
 
          if(l){
-            if(strlen(date) > 0){
+            if(date[0] != '\0'){
                if(idata >= dfrom && idata <= duntil)
                   l=1;else l=0;
             }
          }
          if(l){
-            if(strlen(hm)>0) {
+            if(hm[0] != '\0') {
                strcpy(whm,hora);
                bzero(hmr,15);
                chm++;
@@ -1237,7 +1234,7 @@ int main(int argc,char *argv[])
             }
          }
          if(l){
-            if(strlen(site)>0){
+            if(site[0] != '\0'){
                if(strstr(url,site)!=0)
                   l=1;else l=0;
             }
@@ -1281,7 +1278,7 @@ int main(int argc,char *argv[])
                fixip(user);
          }
 
-         if(l&&max_elapsed) {
+         if(l && max_elapsed) {
             if(atol(elap)>max_elapsed) {
                elap[0]='0';
                elap[1]='\0';
@@ -1289,7 +1286,7 @@ int main(int argc,char *argv[])
          }
 
          if(l) {
-            if(strcmp(user,"-") !=0 && strlen(url) > 0 && strcmp(user," ") !=0 && strcmp(user,"") !=0 && strcmp(user,":") !=0){
+            if(strcmp(user,"-") !=0 && url[0] != '\0' && strcmp(user," ") !=0 && strcmp(user,"") !=0 && strcmp(user,":") !=0){
                if((str=(char *) strstr(bufz, "[SmartFilter:")) != (char *) NULL ) {
                   str[strlen(str)-1]='\0';
                   sprintf(smartfilter,"\"%s\"",str+1);
@@ -1518,7 +1515,7 @@ int main(int argc,char *argv[])
    if(strstr(ReportType,"denied") != 0)
       unlink(tmp5);
 
-   if((strlen(zip) > 0 && strcmp(zip,"zcat") !=0)) {
+   if(zip[0] != '\0' && strcmp(zip,"zcat") !=0) {
       recomp(arq, zip);
    }
 //   else  unlink(arq);
diff --git a/report.c b/report.c
index 28c987a..1d0bf8e 100644
--- a/report.c
+++ b/report.c
@@ -321,7 +321,7 @@ void gerarel(void)
    strcpy(wdirname,dirname);
    totalger(wdirname, debug, outdir);
 
-   if(strlen(email) == 0) {
+   if(email[0] == '\0') {
       if(strstr(ReportType,"downloads") != 0) download_report();
 
       if(strlen(DansGuardianConf) > 0) {
diff --git a/sort.c b/sort.c
index 3ee1d88..b4e5a83 100644
--- a/sort.c
+++ b/sort.c
@@ -78,7 +78,7 @@ void tmpsort(void)
       } else {
          wnome[0]='\0';
       }
-      
+
       strcpy(arqou,tmp);
       strcat(arqou,"/");
       strcpy(arqin,arqou);
@@ -142,10 +142,10 @@ void sort_users_log(const char *tmp, int debug)
 
       if(strcmp(direntp->d_name,"download.unsort") == 0)
          sprintf(csort,"sort -T %s -k 3,3 -k 1,1 -k 2,2 -k 5,5 -o '%s/%s.log' '%s/%s.unsort'",
-					tmp, wtmp, user, wtmp, user);
+              tmp, wtmp, user, wtmp, user);
       else
-         sprintf(csort,"sort -T %s -k 5,5 -k 1,1 -k 2,2 -o '%s/%s.log' '%s/%s.unsort'", 
-					tmp, wtmp, user, wtmp, user);
+         sprintf(csort,"sort -T %s -k 5,5 -k 1,1 -k 2,2 -o '%s/%s.log' '%s/%s.unsort'",
+              tmp, wtmp, user, wtmp, user);
       cstatus=system(csort);
       if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
          fprintf(stderr, "SARG: sort command return status %d\n",WEXITSTATUS(cstatus));