Append \n at the end of every debuga

[thirdparty/sarg.git] / report.c

diff --git a/report.c b/report.c
index 443597c0897ef11be18f0847913c6f2a0b77efb0..8037b6824885ebee01f6b60ebfce5dcabce4addd 100644 (file)
--- a/report.c
+++ b/report.c
@@ -132,7 +132,7 @@ void gerarel(void)
 
       uinfo=userinfo_find_from_file(user);
       if (!uinfo) {
-         debuga(_("Ignoring unknown user file %s"),user);
+         debuga(_("Ignoring unknown user file %s\n"),user);
          continue;
       }
       strcpy(u2,uinfo->id);
@@ -155,7 +155,7 @@ void gerarel(void)
       new_user=1;
 
       if (longline_prepare(&line)<0) {
-         debuga(_("Not enough memory to read the downloaded files."));
+         debuga(_("Not enough memory to read the downloaded files\n"));
          exit(1);
       }
 
@@ -165,16 +165,16 @@ void gerarel(void)
              getword(accip,sizeof(accip),&gwarea,'\t')<0 ||
              getword_ptr(buf,&accurl,&gwarea,'\t')<0 || getword_atoll(&accbytes,&gwarea,'\t')<0 ||
              getword(acccode,sizeof(acccode),&gwarea,'\t')<0) {
-            debuga(_("There is a broken record or garbage in file %s"),tmp3);
+            debuga(_("There is a broken record or garbage in file %s\n"),tmp3);
             exit(1);
          }
          if(strncmp(acccode,"TCP_DENIED/407",14) == 0) continue;
          if (getword_atoll(&accelap,&gwarea,'\t')<0) {
-            debuga(_("There is a broken elapsed time in file %s"),tmp3);
+            debuga(_("There is a broken elapsed time in file %s\n"),tmp3);
             exit(1);
          }
          if (getword_skip(20000,&gwarea,'"')<0 || getword(accsmart,sizeof(accsmart),&gwarea,'"')<0) {
-            debuga(_("There is a broken smart info in file %s"),tmp3);
+            debuga(_("There is a broken smart info in file %s\n"),tmp3);
             exit(1);
          }
 
@@ -206,7 +206,7 @@ void gerarel(void)
                ourl_size=url_len+1;
                oldurl=realloc(oldurl,ourl_size);
                if (!oldurl) {
-                  debuga(_("Not enough memory to store the url"));
+                  debuga(_("Not enough memory to store the url\n"));
                   exit(1);
                }
             }
@@ -299,7 +299,7 @@ void gerarel(void)
                ourltt_size=url_len+1;
                oldurltt=realloc(oldurltt,ourltt_size);
                if (!oldurltt) {
-                  debuga(_("Not enough memory to store the url"));
+                  debuga(_("Not enough memory to store the url\n"));
                   exit(1);
                }
             }
@@ -330,7 +330,7 @@ void gerarel(void)
                ourl_size=url_len+1;
                oldurl=realloc(oldurl,ourl_size);
                if (!oldurl) {
-                  debuga(_("Not enough memory to store the url"));
+                  debuga(_("Not enough memory to store the url\n"));
                   exit(1);
                }
             }
@@ -431,9 +431,9 @@ static void maketmp(const char *user, const char *dirname, int debug, int indexo
    if(indexonly) return;
    if((ReportType & REPORT_TYPE_USERS_SITES) == 0) return;
 
-   if(debug) debuga("%s: %s/%s",_("Making file"),tmp,user);
+   if(debug) debuga(_("Making file: %s/%s\n"),tmp,user);
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.utmp",tmp,user)>=sizeof(wdirname)) {
-      debuga(_("Temporary file name too long: %s/%s.utmp"),tmp,user);
+      debuga(_("Temporary file name too long: %s/%s.utmp\n"),tmp,user);
       exit(1);
    }
 
@@ -458,7 +458,7 @@ static void maketmp_hour(const char *user, const char *dirname, int indexonly)
    if((ReportType & REPORT_TYPE_USERS_SITES) == 0) return;
 
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.htmp",tmp,user)>=sizeof(wdirname)) {
-      debuga(_("Temporary file name too long: %s/%s.htmp"),tmp,user);
+      debuga(_("Temporary file name too long: %s/%s.htmp\n"),tmp,user);
       exit(1);
    }
 
@@ -481,7 +481,7 @@ void gravatmp(const struct userinfostruct *uinfo, const char *oldurl, long long
    if((ReportType & REPORT_TYPE_USERS_SITES) == 0) return;
 
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.utmp",tmp,uinfo->filename)>=sizeof(wdirname)) {
-      debuga(_("Temporary file name too long: %s/%s.utmp"),tmp,uinfo->filename);
+      debuga(_("Temporary file name too long: %s/%s.utmp\n"),tmp,uinfo->filename);
       exit(1);
    }
 
@@ -513,7 +513,7 @@ static void gravatmpf(const struct userinfostruct *uinfo,const char *oldurl, lon
    if(indexonly || (ReportType & REPORT_TYPE_USERS_SITES) == 0) return;
 
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.utmp",tmp,uinfo->filename)>=sizeof(wdirname)) {
-      debuga(_("Path too long %s/%s.utmp"),tmp,uinfo->filename);
+      debuga(_("Path too long %s/%s.utmp\n"),tmp,uinfo->filename);
       exit(1);
    }
 
@@ -547,12 +547,12 @@ static void gravatmp_hora(const char *dirname, const struct userinfostruct *uinf
    if(indexonly || ((ReportType & REPORT_TYPE_USERS_SITES) == 0)) return;
 
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.htmp",tmp,uinfo->filename)>=sizeof(wdirname)) {
-      debuga(_("Path too long %s/%s.htmp"),tmp,uinfo->filename);
+      debuga(_("Path too long %s/%s.htmp\n"),tmp,uinfo->filename);
       exit(1);
    }
 
    if((fp_ou=MY_FOPEN(wdirname,"a"))==NULL){
-      fprintf(stderr, "SARG: (report-2) %s: %s - %s\n",_("Cannot open file"),wdirname,strerror(errno));
+      debuga(_("(report-2) Cannot open file: %s - %s\n"),wdirname,strerror(errno));
       exit(1);
    }
 
@@ -574,7 +574,7 @@ static void gravaporuser(const struct userinfostruct *uinfo, const char *dirname
    if(indexonly || ((ReportType & REPORT_TYPE_USERS_SITES) == 0)) return;
 
    if (snprintf(wdirname,sizeof(wdirname),"%s/%s.ip",tmp,uinfo->filename)>=sizeof(wdirname)) {
-      fprintf(stderr,"SARG: Path too long %s/%s.ip\n",tmp,uinfo->filename);
+      debuga(_("Path too long %s/%s.ip\n"),tmp,uinfo->filename);
       exit(1);
    }
 
@@ -619,7 +619,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid total number of accesses in %s"),filename);
+         debuga(_("Invalid total number of accesses in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -636,7 +636,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid total size in %s"),filename);
+         debuga(_("Invalid total size in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -653,7 +653,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid total elapsed time in %s"),filename);
+         debuga(_("Invalid total elapsed time in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -670,7 +670,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid total cache hit in %s"),filename);
+         debuga(_("Invalid total cache hit in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -687,7 +687,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\0') {
-         debuga(_("Invalid total cache miss in %s"),filename);
+         debuga(_("Invalid total cache miss in %s\n"),filename);
          exit(1);
       }
       item->oucache=number*sign;
@@ -697,7 +697,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       item->user=buffer;
       for (i=0 ; i<MAX_USER_LEN-1 && (unsigned char)*buffer>=' ' ; i++) buffer++;
       if (*buffer!='\t') {
-         debuga(_("User name too long or invalid in %s"),filename);
+         debuga(_("User name too long or invalid in %s\n"),filename);
          exit(1);
       }
       *buffer++='\0';
@@ -713,7 +713,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid number of accesses in %s"),filename);
+         debuga(_("Invalid number of accesses in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -730,7 +730,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid number of bytes in %s"),filename);
+         debuga(_("Invalid number of bytes in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -739,7 +739,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       item->url=buffer;
       while ((unsigned char)*buffer>=' ') buffer++;
       if (*buffer!='\t') {
-         debuga(_("URL too long or invalid in %s"),filename);
+         debuga(_("URL too long or invalid in %s\n"),filename);
          exit(1);
       }
       *buffer++='\0';
@@ -747,7 +747,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       item->ip=buffer;
       for (i=0 ; i<MAX_IP_LEN-1 && (unsigned char)*buffer>=' ' ; i++) buffer++;
       if (*buffer!='\t') {
-         debuga(_("IP address too long or invalid in %s"),filename);
+         debuga(_("IP address too long or invalid in %s\n"),filename);
          exit(1);
       }
       *buffer++='\0';
@@ -755,7 +755,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       item->time=buffer;
       for (i=0 ; i<MAX_DATETIME_LEN-1 && (unsigned char)*buffer>=' ' ; i++) buffer++;
       if (*buffer!='\t') {
-         debuga(_("Time too long or invalid in %s"),filename);
+         debuga(_("Time too long or invalid in %s\n"),filename);
          exit(1);
       }
       *buffer++='\0';
@@ -763,7 +763,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       item->date=buffer;
       for (i=0 ; i<MAX_DATETIME_LEN-1 && (unsigned char)*buffer>=' ' ; i++) buffer++;
       if (*buffer!='\t') {
-         debuga(_("Date too long or invalid in %s"),filename);
+         debuga(_("Date too long or invalid in %s\n"),filename);
          exit(1);
       }
       *buffer++='\0';
@@ -779,7 +779,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid elapsed time in %s"),filename);
+         debuga(_("Invalid elapsed time in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -796,7 +796,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\t') {
-         debuga(_("Invalid cache hit size in %s"),filename);
+         debuga(_("Invalid cache hit size in %s\n"),filename);
          exit(1);
       }
       buffer++;
@@ -813,7 +813,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename)
       while (isdigit(*buffer))
          number=(number * 10) + (*buffer++)-'0';
       if (*buffer!='\0') {
-         debuga(_("Invalid cache miss size in %s"),filename);
+         debuga(_("Invalid cache miss size in %s\n"),filename);
          exit(1);
       }
       item->oucache=number*sign;