Use boolean to enable all the options instead of string compares.

[thirdparty/sarg.git] / report.c

diff --git a/report.c b/report.c
index bdf8a3d3117e450732050705f9c0bc88f2d23fe1..9928ead75517d4ec685a5433537e7b2b120143be 100644 (file)
--- a/report.c
+++ b/report.c
@@ -41,13 +41,12 @@ void gerarel(void)
    FILE *fp_gen;
 
    char accdia[11], acchora[9], accuser[MAXLEN], accip[MAXLEN], accurl[MAXLEN];
-   char oldaccdia[11], oldacchora[9], oldaccip[MAXLEN], wdir[MAXLEN], per1[MAXLEN];
+   char oldaccdia[11], oldacchora[9], oldaccip[MAXLEN];
    char wdirname[MAXLEN], oldurl[MAXLEN], oldaccuser[MAXLEN];
    char olduser[MAXLEN], oldmsg[50], acccode[MAXLEN/2 - 1], oldacccode[MAXLEN/2 - 1], user[MAXLEN];
    char ipantes[MAXLEN], nameantes[MAXLEN];
    char accsmart[MAXLEN];
    char crc2[MAXLEN/2 -1];
-   char dirname[MAXLEN];
    long long int nbytes=0;
    long long int nelap=0;
    long long int nacc=0;
@@ -68,13 +67,10 @@ void gerarel(void)
    smartfilter=0;
 
    sprintf(dirname, "%s%s", outdir, period);
-   sprintf(wdir, "%s%s", outdir, period);
-   strcpy(per1,period);
-   vrfydir(wdir, per1, addr, site, us, email);
+   vrfydir(period, addr, site, us, email);
 
    if(debugz){
       debugaz("dirname",dirname);
-      debugaz("wdir",wdir);
    }
 
    gperiod(dirname,period);
@@ -138,13 +134,16 @@ void gerarel(void)
              getword(accuser,sizeof(accuser),&gwarea,'\t')<0 || getword(accip,sizeof(accip),&gwarea,'\t')<0 ||
              getword(accurl,sizeof(accurl),&gwarea,'\t')<0 || getword_atoll(&accbytes,&gwarea,'\t')<0 ||
              getword(acccode,sizeof(acccode),&gwarea,'\t')<0) {
-            printf("SARG: Maybe you have a broken record or garbage in your %s file.\n",tmp3);
+            printf("SARG: Maybe you have a broken record or garbage in your %s file (%d).\n",tmp3,__LINE__);
             exit(1);
          }
          if(strncmp(acccode,"TCP_DENIED/407",14) == 0) continue;
-         if (getword_atoll(&accelap,&gwarea,'\t')<0 || getword_skip(20000,&gwarea,'\t')<0 ||
-             getword(accsmart,sizeof(accsmart),&gwarea,'"')<0) {
-            printf("SARG: Maybe you have a broken record or garbage in your %s file.\n",tmp3);
+         if (getword_atoll(&accelap,&gwarea,'\t')<0 || getword_skip(20000,&gwarea,'\t')<0) {
+            printf("SARG: Maybe you have a broken elapsed time in your %s file (%d).\n",tmp3,__LINE__);
+            exit(1);
+         }
+         if (getword(accsmart,sizeof(accsmart),&gwarea,'"')<0) {
+            printf("SARG: Maybe you have a broken smart info in your %s file (%d).\n",tmp3,__LINE__);
             exit(1);
          }
 
@@ -236,7 +235,7 @@ void gerarel(void)
                ttopen=1;
 
                /*
-               if(strcmp(Privacy,"yes") == 0)
+               if(Privacy)
                   sprintf(httplink,"<font size=%s color=%s><href=http://%s>%s",        \
                               FontSize,PrivacyStringColor,PrivacyString,PrivacyString);
                else
@@ -358,12 +357,12 @@ void gerarel(void)
 
       make_index();
 
-      if(strncmp(SuccessfulMsg,"yes",3) == 0) fprintf(stderr, "SARG: %s %s\n",text[47],dirname);
+      if(SuccessfulMsg) fprintf(stderr, "SARG: %s %s\n",text[47],dirname);
     } else {
       strcpy(wdirname,dirname);
       geramail(wdirname, debug, outdir, userip, email, TempDir);
 
-      if((strcmp(email,"stdout") != 0) && (strncmp(SuccessfulMsg,"yes",3) == 0))
+      if((strcmp(email,"stdout") != 0) && SuccessfulMsg)
             fprintf(stderr, "SARG: %s %s\n",text[48],email);
    }