Add support to decompress xz files

[thirdparty/sarg.git] / report.c

diff --git a/report.c b/report.c
index acf37feeb6bf1113cf9dcc6da96dc6912821bb43..3a82015917f169ff80b4f05a0c64c68e6aee9676 100644 (file)
--- a/report.c
+++ b/report.c
@@ -59,7 +59,8 @@ void gerarel(void)
        char oldacciptt[256];
        char wdirname[MAXLEN];
        char *oldurl=NULL;
-       char oldmsg[50], acccode[MAXLEN/2 - 1], oldacccode[MAXLEN/2 - 1];
+       const char *oldmsg;
+       char acccode[MAXLEN/2 - 1], oldacccode[MAXLEN/2 - 1];
        char ipantes[256], nameantes[MAXLEN];
        char accsmart[MAXLEN];
        char crc2[MAXLEN/2 -1];
@@ -100,9 +101,9 @@ void gerarel(void)
                        exit(EXIT_FAILURE);
                }
        } else {
-               if (snprintf(outdirname,sizeof(outdirname),"%semailrep",outdir)>=sizeof(outdirname)) {
+               if (snprintf(outdirname,sizeof(outdirname),"%s/emailrep",tmp)>=sizeof(outdirname)) {
                        debuga(__FILE__,__LINE__,_("Path too long: "));
-                       debuga_more("%semailrep\n",outdir);
+                       debuga_more("%s/emailrep\n",tmp);
                        exit(EXIT_FAILURE);
                }
                my_mkdir(outdirname);
@@ -112,7 +113,11 @@ void gerarel(void)
                debugaz(__FILE__,__LINE__,_("outdirname=%s\n"),outdirname);
        }
 
-       if (!FileList_IsEmpty(UserAgentLog) && email[0] == '\0') useragent();
+       if (email[0] == '\0' && !FileList_IsEmpty(UserAgentLog))
+               UserAgent_Readlog();
+
+       UserAgent();
+       init_usertab(UserTabFile);
 
        snprintf(wdirname,sizeof(wdirname),"%s/sarg-general",outdirname);
        if((fp_gen=MY_FOPEN(wdirname,"w"))==NULL){
@@ -238,9 +243,9 @@ void gerarel(void)
                        if(site[0] == '\0') {
                                if(!same_url){
                                        if(strstr(oldacccode,"DENIED") != 0)
-                                               strcpy(oldmsg,"DENIED");
+                                               oldmsg="DENIED";
                                        else
-                                               strcpy(oldmsg,"OK");
+                                               oldmsg="OK";
                                        if (fp_tmp) gravatmp(fp_tmp,oldurl,nacc,nbytes,oldmsg,nelap,incache,oucache);
                                        gravager(fp_gen,wdirname,uinfo,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
                                        nacc=0;
@@ -350,9 +355,9 @@ void gerarel(void)
                if (oldurltt) free(oldurltt);
                if (oldurl) {
                        if(strstr(oldacccode,"DENIED") != 0)
-                               strcpy(oldmsg,"DENIED");
+                               oldmsg="DENIED";
                        else
-                               strcpy(oldmsg,"OK");
+                               oldmsg="OK";
                        if (fp_tmp) gravatmp(fp_tmp,oldurl,nacc,nbytes,oldmsg,nelap,incache,oucache);
                        closett();
                        gravager(fp_gen,wdirname,uinfo,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
@@ -438,7 +443,7 @@ void gerarel(void)
 
                if(SuccessfulMsg) debuga(__FILE__,__LINE__,_("Successful report generated on %s\n"),outdirname);
        } else {
-               geramail(outdirname, debug, email, tmp);
+               topuser();
 
                if((strcmp(email,"stdout") != 0) && SuccessfulMsg)
                        debuga(__FILE__,__LINE__,_("Successful report generated and sent to %s\n"),email);