X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=download.c;h=f826e7014bbb851eb398fd019299ea66bad56e51;hb=22774edd6523d566f539f4f633a6f276bfbd6224;hp=b3ae0c1544d18137b2a5cdc0b34039c6bb061cc7;hpb=204781f47bcc0ab8682926689607affa437de4ac;p=thirdparty%2Fsarg.git diff --git a/download.c b/download.c index b3ae0c1..f826e70 100644 --- a/download.c +++ b/download.c @@ -1,6 +1,6 @@ /* * SARG Squid Analysis Report Generator http://sarg.sourceforge.net - * 1998, 2013 + * 1998, 2015 * * SARG donations: * please look at http://sarg.sourceforge.net/donations.php @@ -61,17 +61,17 @@ Open a file to store the denied accesses. void download_open(void) { if ((ReportType & REPORT_TYPE_DOWNLOADS) == 0) { - if (debugz>=LogLevel_Process) debugaz(_("Download report not produced as it is not requested\n")); + if (debugz>=LogLevel_Process) debugaz(__FILE__,__LINE__,_("Download report not produced as it is not requested\n")); return; } if (Privacy) { - if (debugz>=LogLevel_Process) debugaz(_("Download report not produced because privacy option is active\n")); + if (debugz>=LogLevel_Process) debugaz(__FILE__,__LINE__,_("Download report not produced because privacy option is active\n")); return; } snprintf(download_unsort,sizeof(download_unsort),"%s/download.int_unsort",tmp); if ((fp_download=MY_FOPEN(download_unsort,"w"))==NULL) { - debuga(_("Cannot open file \"%s\": %s\n"),download_unsort,strerror(errno)); + debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),download_unsort,strerror(errno)); exit(EXIT_FAILURE); } return; @@ -102,7 +102,7 @@ void download_close(void) if (fp_download) { if (fclose(fp_download)==EOF) { - debuga(_("Write error in \"%s\": %s\n"),download_unsort,strerror(errno)); + debuga(__FILE__,__LINE__,_("Write error in \"%s\": %s\n"),download_unsort,strerror(errno)); exit(EXIT_FAILURE); } fp_download=NULL; @@ -137,18 +137,18 @@ static void download_sort(const char *report_in) clen=snprintf(csort,sizeof(csort),"sort -T \"%s\" -t \"\t\" -k 3,3 -k 1,1 -k 2,2 -k 5,5 -o \"%s\" \"%s\"", tmp, report_in, download_unsort); if (clen>=sizeof(csort)) { - debuga(_("Path too long to sort the file: %s\n"),download_unsort); + debuga(__FILE__,__LINE__,_("Path too long to sort file \"%s\"\n"),download_unsort); exit(EXIT_FAILURE); } cstatus=system(csort); if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) { - debuga(_("sort command return status %d\n"),WEXITSTATUS(cstatus)); - debuga(_("sort command: %s\n"),csort); + debuga(__FILE__,__LINE__,_("sort command return status %d\n"),WEXITSTATUS(cstatus)); + debuga(__FILE__,__LINE__,_("sort command: %s\n"),csort); exit(EXIT_FAILURE); } if (!KeepTempLog) { if (unlink(download_unsort)) { - debuga(_("Cannot delete \"%s\": %s\n"),download_unsort,strerror(errno)); + debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),download_unsort,strerror(errno)); exit(EXIT_FAILURE); } download_unsort[0]='\0'; @@ -161,7 +161,8 @@ is set with set_download_suffix(). */ void download_report(void) { - FILE *fp_in = NULL, *fp_ou = NULL; + FileObject *fp_in = NULL; + FILE *fp_ou = NULL; char *buf; char *url; @@ -186,14 +187,14 @@ void download_report(void) if (!download_exists) { if (!KeepTempLog && download_unsort[0]!='\0' && unlink(download_unsort)) - debuga(_("Cannot delete \"%s\": %s\n"),download_unsort,strerror(errno)); + debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),download_unsort,strerror(errno)); download_unsort[0]='\0'; - if (debugz>=LogLevel_Process) debugaz(_("No downloaded files to report\n")); + if (debugz>=LogLevel_Process) debugaz(__FILE__,__LINE__,_("No downloaded files to report\n")); return; } if (debugz>=LogLevel_Process) - debuga(_("Creating download report...\n")); + debuga(__FILE__,__LINE__,_("Creating download report...\n")); ouser[0]='\0'; ouser2[0]='\0'; @@ -204,13 +205,13 @@ void download_report(void) // produce the report. snprintf(report,sizeof(report),"%s/download.html",outdirname); - if((fp_in=MY_FOPEN(report_in,"r"))==NULL) { - debuga(_("Cannot open file \"%s\": %s\n"),report_in,strerror(errno)); + if((fp_in=FileObject_Open(report_in))==NULL) { + debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),report_in,FileObject_GetLastOpenError()); exit(EXIT_FAILURE); } if((fp_ou=MY_FOPEN(report,"w"))==NULL) { - debuga(_("Cannot open file \"%s\": %s\n"),report,strerror(errno)); + debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),report,strerror(errno)); exit(EXIT_FAILURE); } @@ -225,7 +226,7 @@ void download_report(void) fprintf(fp_ou,"