LDAP usertab feature added

[thirdparty/sarg.git] / totday.c

diff --git a/totday.c b/totday.c
index fb1b07968d4680997c58656ac428a701121c915c..27730feabb3b8df05cd505012ac960723feb5d02 100644 (file)
--- a/totday.c
+++ b/totday.c
@@ -1,6 +1,6 @@
 /*
  * AUTHOR: Pedro Lineu Orso                         pedro.orso@gmail.com
- *                                                            1998, 2008
+ *                                                            1998, 2009
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
  *
  * SARG donations:
@@ -24,12 +24,13 @@
  */
 
 #include "include/conf.h"
+#include "include/defs.h"
 
-void day_totalize(const char *tmp, char *user, int indexonly)
+void day_totalize(const char *tmp, const char *user, int indexonly)
 {
 
    FILE *fp_in, *fp_ou;
-      
+
    char data[20];
    char hora[20];
    char min[20];
@@ -55,7 +56,7 @@ void day_totalize(const char *tmp, char *user, int indexonly)
    sprintf(arqout,"%s/%s.day",tmp,user);
    sprintf(sortout,"%s/%s.sort",tmp,user);
 
-   sprintf(csort,"sort -k 1,1 -k 2,2 -o '%s' '%s'",sortout,wdirname);
+   sprintf(csort,"sort -k 1,1 -k 2,2 -o \"%s\" \"%s\"",sortout,wdirname);
    cstatus=system(csort);
    if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
       fprintf(stderr, "SARG: sort command return status %d\n",WEXITSTATUS(cstatus));
@@ -78,9 +79,9 @@ void day_totalize(const char *tmp, char *user, int indexonly)
    while(fgets(buf,sizeof(buf),fp_in)!=NULL) {
       if(strstr(buf,"\n") != 0)
          buf[strlen(buf)-1]='\0';
-         
-      if (getword(data,sizeof(data),buf,' ')<0 || getword(hora,sizeof(hora),buf,':')<0 ||
-          getword(min,sizeof(min),buf,':')<0 || getword(elap,sizeof(elap),buf,' ')<0 ||
+
+      if (getword(data,sizeof(data),buf,'\t')<0 || getword(hora,sizeof(hora),buf,':')<0 ||
+          getword(min,sizeof(min),buf,':')<0 || getword(elap,sizeof(elap),buf,'\t')<0 ||
           getword(elap,sizeof(elap),buf,0)<0) {
          printf("SARG: Maybe you have a broken record or garbage in your %s file.\n",sortout);
          exit(1);
@@ -100,8 +101,7 @@ void day_totalize(const char *tmp, char *user, int indexonly)
             tused=telap;
 
          my_lltoa(telap,val1,15);
-         sprintf(buf,"%s %s %s\n",odata,ohora,val1);
-         fputs(buf, fp_ou);
+         fprintf(fp_ou,"%s\t%s\t%s\n",odata,ohora,val1);
          strcpy(odata,data);
          strcpy(ohora,hora);
          strcpy(ohm,hm);
@@ -115,15 +115,14 @@ void day_totalize(const char *tmp, char *user, int indexonly)
       }
 
       telap+=my_atoll(elap);
-          
+
    }
 
    if(tused > telap)
       tused=telap;
 
    my_lltoa(telap,val1,15);
-   sprintf(buf,"%s %s %s\n",data,hora,val1);
-   fputs(buf, fp_ou);
+   fprintf(fp_ou,"%s\t%s\t%s\n",data,hora,val1);
 
    fclose(fp_in);
    fclose(fp_ou);