Be more consistent with the use of the temporary directory (i.e. always use /tmp...

[thirdparty/sarg.git] / topuser.c

diff --git a/topuser.c b/topuser.c
index a86417718930a0ababe45d807bcbed8433a8081f..444cfc2ac6bdb59c50fa5321057feac1be416477 100644 (file)
--- a/topuser.c
+++ b/topuser.c
@@ -49,11 +49,8 @@ void topuser(void)
    const char *order="-r";
    char title[80];
    char *warea;
-   char ltext110[100];
    int  totuser=0;
    int  topcount=0;
-   int i;
-   char *s;
    int cstatus;
    struct getwordstruct gwarea;
    longline line;
@@ -63,23 +60,14 @@ void topuser(void)
    ipantes[0]='\0';
    nameantes[0]='\0';
 
-   strcpy(wger,outdirname);
-   strcpy(top1,outdirname);
-   strcpy(top2,outdirname);
-   strcpy(top3,outdirname);
-   strcpy(tusr,outdirname);
-   strcat(wger,"/sarg-general");
-   strcat(top1,"/top");
-   strcat(top2,"/top.tmp");
-   strcat(tusr,"/sarg-users");
-   strcat(top3,"/index.html");
-
    ntopuser = 0;
+   snprintf(wger,sizeof(wger),"%s/sarg-general",outdirname);
    if((fp_in=fopen(wger,"r"))==NULL) {
       debuga(_("(topuser) Cannot open file %s\n"),wger);
       exit(EXIT_FAILURE);
    }
 
+   snprintf(top2,sizeof(top2),"%s/top.tmp",outdirname);
    if((fp_top2=fopen(top2,"w"))==NULL) {
       debuga(_("(topuser) Cannot open file %s\n"),top2);
       exit(EXIT_FAILURE);
@@ -100,7 +88,11 @@ void topuser(void)
          totuser++;
 
          if (olduser[0] != '\0') {
-            fprintf(fp_top2,"%s\t%lld\t%lld\t%lld\t%lld\t%lld\n",olduser,tnbytes,tnacc,tnelap,tnincache,tnoucache);
+            /*
+            This complicated printf is due to Microsoft's inability to comply with any standard. Msvcrt is unable
+            to print a long long int unless it is exactly 64-bits long.
+            */
+            fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap,(uint64_t)tnincache,(uint64_t)tnoucache);
 
             ttnbytes+=tnbytes;
             ttnacc+=tnacc;
@@ -126,7 +118,11 @@ void topuser(void)
    longline_destroy(&line);
 
    if (olduser[0] != '\0') {
-      fprintf(fp_top2,"%s\t%lld\t%lld\t%lld\t%lld\t%lld\n",olduser,tnbytes,tnacc,tnelap,tnincache,tnoucache);
+      /*
+      This complicated printf is due to Microsoft's inability to comply with any standard. Msvcrt is unable
+      to print a long long int unless it is exactly 64-bits long.
+      */
+      fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap,(uint64_t)tnincache,(uint64_t)tnoucache);
 
       ttnbytes+=tnbytes;
       ttnacc+=tnacc;
@@ -151,7 +147,8 @@ void topuser(void)
    if(strcmp(TopuserSortOrder,"normal") == 0)
       order="";
 
-   sprintf(csort,"sort -T \"%s\" %s %s -o \"%s\" \"%s\"", TempDir, order, sfield, top1, top2);
+   snprintf(top1,sizeof(top1),"%s/top",outdirname);
+   sprintf(csort,"sort -T \"%s\" %s %s -o \"%s\" \"%s\"", tmp, order, sfield, top1, top2);
    cstatus=system(csort);
    if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
       debuga(_("sort command return status %d\n"),WEXITSTATUS(cstatus));
@@ -166,6 +163,7 @@ void topuser(void)
 
    unlink(top2);
 
+   snprintf(top3,sizeof(top3),"%s/index.html",outdirname);
    if((fp_top3=fopen(top3,"w"))==NULL) {
       debuga(_("(topuser) Cannot open file %s\n"),top3);
       exit(EXIT_FAILURE);
@@ -181,14 +179,13 @@ void topuser(void)
    close_html_header(fp_top3);
 
    fputs("<div class=\"report\"><table cellpadding=\"1\" cellspacing=\"2\">\n",fp_top3);
-   fputs("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n",fp_top3);
 
    if((ReportType & REPORT_TYPE_TOPSITES) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"topsites.html\">%s</a></td></tr>\n",_("Top sites"));
    if((ReportType & REPORT_TYPE_SITES_USERS) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"siteuser.html\">%s</a></td></tr>\n",_("Sites & Users"));
    if(dansguardian_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"dansguardian.html\">%s</a></td></tr>\n",_("DansGuardian"));
-   if(squidguard_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"squidguard.html\">%s</a></td></tr>\n",_("squidGuard"));
+   if(squidguard_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"redirector.html\">%s</a></td></tr>\n",_("Redirector"));
    if ((ReportType & REPORT_TYPE_DOWNLOADS) != 0 && download_count && !Privacy && ndownload) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"download.html\">%s</a></td></tr>\n",_("Downloads"));
-   if ((ReportType & REPORT_TYPE_DENIED) != 0 && denied_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"denied.html\">%s</a></td></tr>\n",_("Denied"));
+   if ((ReportType & REPORT_TYPE_DENIED) != 0 && denied_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"denied.html\">%s</a></td></tr>\n",_("Denied accesses"));
    if ((ReportType & REPORT_TYPE_AUTH_FAILURES) != 0 && authfail_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"authfail.html\">%s</a></td></tr>\n",_("Authentication Failures"));
    if(smartfilter) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"smartfilter.html\">%s</a></td></tr>\n",_("SmartFilter"));
    if(UserAgentLog[0] != '\0' && useragent_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"useragent.html\">%s</a></td></tr>\n",_("Useragent"));
@@ -279,21 +276,14 @@ void topuser(void)
          fprintf(fp_top3,"<td class=\"data\">%d</td>",posicao);
 
       if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0) {
-         s=_("DATE/TIME");
-         for(i=0 ; i<sizeof(ltext110)-1 && s[i] ; i++)
-            ltext110[i]=tolower(s[i]);
-         ltext110[i]='\0';
          fputs("<td class=\"data2\">",fp_top3);
 #ifdef HAVE_GD
          if(Graphs && GraphFont[0]!='\0') {
-            fprintf(fp_top3,"<a href=\"%s/graph_day.png\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",uinfo->filename,ImageFile,_("Graphic"));
+            //fprintf(fp_top3,"<a href=\"%s/graph_day.png\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",uinfo->filename,ImageFile,_("Graphic"));
+            fprintf(fp_top3,"<a href=\"%s/graph.html\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",uinfo->filename,ImageFile,_("Graphic"));
          }
 #endif
-         fprintf(fp_top3,"<a href=\"%s/d%s.html\"><img src=\"%s/datetime.png\" title=\"%s",uinfo->filename,uinfo->filename,ImageFile,ltext110);
-#ifdef HAVE_GD
-         fprintf(fp_top3," %s",_("Report"));
-#endif
-         fputs("\" alt=\"T\"></a></td>",fp_top3);
+         fprintf(fp_top3,"<a href=\"%s/d%s.html\"><img src=\"%s/datetime.png\" title=\"%s\" alt=\"T\"></a></td>",uinfo->filename,uinfo->filename,ImageFile,_("date/time report"));
       } else {
          sprintf(val1,"%s/d%s.html",outdirname,uinfo->filename);
          unlink(val1);
@@ -393,12 +383,14 @@ void topuser(void)
    if (fclose(fp_top3)==EOF)
       debuga(_("Failed to close the top user list %s - %s\n"),top3,strerror(errno));
 
+   snprintf(tusr,sizeof(tusr),"%s/sarg-users",outdirname);
    if((fp_ou=fopen(tusr,"w"))==NULL) {
       debuga(_("(topuser) Cannot open file %s\n"),tusr);
       exit(EXIT_FAILURE);
    }
    fprintf(fp_ou,"%d\n",totuser);
-   fclose(fp_ou);
+   if (fclose(fp_ou)==EOF)
+      debuga(_("Failed to close file %s - %s\n"),tusr,strerror(errno));
 
    return;
 }