From 00d1f9edfc63326a84d1968b5dbf8b321ecea357 Mon Sep 17 00:00:00 2001 From: Frederic Marchal Date: Sun, 26 Apr 2015 13:30:40 +0200 Subject: [PATCH] Merge the messages about invalid data There were far too many redundant messages to be translated just to report errors in the data read from a file. The messages have been merged to reduce the diversity in vocabulary. --- authfail.c | 12 +++++------ convlog.c | 2 +- dansguardian_log.c | 16 +++++++-------- dansguardian_report.c | 6 +++--- datafile.c | 4 ++-- denied.c | 6 +++--- download.c | 6 +++--- email.c | 10 +++++----- getconf.c | 2 +- grepday.c | 8 ++++---- html.c | 46 +++++++++++++++++++++---------------------- index.c | 12 +++++------ readlog.c | 2 +- redirector.c | 28 +++++++++++++------------- repday.c | 10 +++++----- report.c | 36 ++++++++++++++++----------------- siteuser.c | 2 +- smartfilter.c | 4 ++-- splitlog.c | 2 +- topsites.c | 8 ++++---- topuser.c | 14 ++++++------- useragent.c | 20 +++++++++---------- util.c | 8 ++++---- 23 files changed, 132 insertions(+), 132 deletions(-) diff --git a/authfail.c b/authfail.c index c2e8ce3..f1121ad 100644 --- a/authfail.c +++ b/authfail.c @@ -191,23 +191,23 @@ void authfail_report(void) while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,'\t')<0) { - debuga(_("There is a broken date in file %s\n"),authfail_sort); + debuga(_("Invalid date in file \"%s\"\n"),authfail_sort); exit(EXIT_FAILURE); } if (getword(hora,sizeof(hora),&gwarea,'\t')<0) { - debuga(_("There is a broken time in file %s\n"),authfail_sort); + debuga(_("Invalid time in file \"%s\"\n"),authfail_sort); exit(EXIT_FAILURE); } if (getword(user,sizeof(user),&gwarea,'\t')<0) { - debuga(_("There is a broken user ID in file %s\n"),authfail_sort); + debuga(_("Invalid user ID in file \"%s\"\n"),authfail_sort); exit(EXIT_FAILURE); } if (getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("There is a broken IP address in file %s\n"),authfail_sort); + debuga(_("Invalid IP address in file \"%s\"\n"),authfail_sort); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("There is a broken url in file %s\n"),authfail_sort); + debuga(_("Invalid url in file \"%s\"\n"),authfail_sort); exit(EXIT_FAILURE); } if (sscanf(data,"%d/%d/%d",&day,&month,&year)!=3) continue; @@ -216,7 +216,7 @@ void authfail_report(void) uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,authfail_sort); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,authfail_sort); exit(EXIT_FAILURE); } diff --git a/convlog.c b/convlog.c index 9673d96..f906772 100644 --- a/convlog.c +++ b/convlog.c @@ -55,7 +55,7 @@ void convlog(const char *arq, char df, int dfrom, int duntil) while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken record or garbage in file %s\n"),arq); + debuga(_("Invalid record in file \"%s\"\n"),arq); exit(EXIT_FAILURE); } tt=atoi(data); diff --git a/dansguardian_log.c b/dansguardian_log.c index 7004a2e..ddec52a 100644 --- a/dansguardian_log.c +++ b/dansguardian_log.c @@ -74,7 +74,7 @@ void dansguardian_log(void) if(strstr(buf,"loglocation ") != 0) { getword_start(&gwarea,buf); if (getword_skip(MAXLEN,&gwarea,'\'')<0 || getword(loglocation,sizeof(loglocation),&gwarea,'\'')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),DansGuardianConf); + debuga(_("Invalid record in file \"%s\"\n"),DansGuardianConf); exit(EXIT_FAILURE); } if (debug) debuga(_("Using the dansguardian log file \"%s\" found in your configuration file \"%s\"\n"), @@ -101,32 +101,32 @@ void dansguardian_log(void) getword_start(&gwarea,buf); if (getword_atoi(&year,&gwarea,'.')<0 || getword_atoi(&mon,&gwarea,'.')<0 || getword_atoi(&day,&gwarea,' ')<0) { - debuga(_("Invalid date found in your dansguardian log file %s\n"),loglocation); + debuga(_("Invalid date in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword_atoi(&hour,&gwarea,':')<0 || getword(minsec,sizeof(minsec),&gwarea,' ')<0) { - debuga(_("Invalid time found in your dansguardian log file %s\n"),loglocation); + debuga(_("Invalid time in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword(user,sizeof(user),&gwarea,' ')<0) { - debuga(_("Invalid user found in your dansguardian log file %s\n"),loglocation); + debuga(_("Invalid user in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword(ip,sizeof(ip),&gwarea,' ')<0) { - debuga(_("Invalid IP address found in your dansguardian log file %s\n"),loglocation); + debuga(_("Invalid IP address in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword_skip(MAXLEN,&gwarea,'/')<0 || getword_skip(MAXLEN,&gwarea,'/')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),loglocation); + debuga(_("Invalid record in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,' ')<0) { - debuga(_("Maybe you have a broken url in your %s file\n"),loglocation); + debuga(_("Invalid url in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } if (getword_skip(255,&gwarea,' ')<0 || getword(code1,sizeof(code1),&gwarea,' ')<0 || getword(code2,sizeof(code2),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),loglocation); + debuga(_("Invalid record in file \"%s\"\n"),loglocation); exit(EXIT_FAILURE); } idata = year*10000+mon*100+day; diff --git a/dansguardian_report.c b/dansguardian_report.c index 466fc19..f73460e 100644 --- a/dansguardian_report.c +++ b/dansguardian_report.c @@ -92,15 +92,15 @@ void dansguardian_report(void) getword_start(&gwarea,buf); if (getword(user,sizeof(user),&gwarea,'\t')<0 || getword(date2,sizeof(date2),&gwarea,'\t')<0 || getword(hour,sizeof(hour),&gwarea,'\t')<0 || getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),dansguardian_in); + debuga(_("Invalid record in file \"%s\"\n"),dansguardian_in); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken url in your %s file\n"),dansguardian_in); + debuga(_("Invalid url in file \"%s\"\n"),dansguardian_in); exit(EXIT_FAILURE); } if (getword(rule,sizeof(rule),&gwarea,'\n')<0) { - debuga(_("Maybe you have a broken rule in your %s file\n"),dansguardian_in); + debuga(_("Invalid rule in file \"%s\"\n"),dansguardian_in); exit(EXIT_FAILURE); } diff --git a/datafile.c b/datafile.c index 020e0b4..46a9a26 100644 --- a/datafile.c +++ b/datafile.c @@ -109,11 +109,11 @@ void data_file(char *tmp) 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 || getword_atoll(&accelap,&gwarea,'\t')<0) { - debuga(_("There is a broken record or garbage in file %s\n"),tmp3); + debuga(_("Invalid record in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_skip(20000,&gwarea,'"')<0 || getword(accsmart,sizeof(accsmart),&gwarea,'"')<0) { - debuga(_("There is an invalid smart info in file %s\n"),tmp3); + debuga(_("Invalid smart info in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } diff --git a/denied.c b/denied.c index daa071e..443d785 100644 --- a/denied.c +++ b/denied.c @@ -198,11 +198,11 @@ void gen_denied_report(void) getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,'\t')<0 || getword(hora,sizeof(hora),&gwarea,'\t')<0 || getword(user,sizeof(user),&gwarea,'\t')<0 || getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("There is a broken record or garbage in file %s\n"),denied_sort); + debuga(_("Invalid record in file \"%s\"\n"),denied_sort); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("There is a broken url in file %s\n"),denied_sort); + debuga(_("Invalid url in file \"%s\"\n"),denied_sort); exit(EXIT_FAILURE); } if (sscanf(data,"%d/%d/%d",&day,&month,&year)!=3) continue; @@ -211,7 +211,7 @@ void gen_denied_report(void) uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,denied_sort); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,denied_sort); exit(EXIT_FAILURE); } diff --git a/download.c b/download.c index 10145c6..69bc443 100644 --- a/download.c +++ b/download.c @@ -233,11 +233,11 @@ void download_report(void) getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,'\t')<0 || getword(hora,sizeof(hora),&gwarea,'\t')<0 || getword(user,sizeof(user),&gwarea,'\t')<0 || getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("There is a broken record or garbage in file %s\n"),report_in); + debuga(_("Invalid record in file \"%s\"\n"),report_in); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("There is a broken url in file %s\n"),report_in); + debuga(_("Invalid url in file \"%s\"\n"),report_in); exit(EXIT_FAILURE); } if (sscanf(data,"%d/%d/%d",&day,&month,&year)!=3) continue; @@ -246,7 +246,7 @@ void download_report(void) uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,report_in); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,report_in); exit(EXIT_FAILURE); } new_user=false; diff --git a/email.c b/email.c index e375fc3..c0be2f4 100644 --- a/email.c +++ b/email.c @@ -191,25 +191,25 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema fixendofline(warea); getword_start(&gwarea,warea); if (getword(user,sizeof(user),&gwarea,'\t')<0) { - debuga(_("There is an invalid user ID in file %s\n"),top1); + debuga(_("Invalid user ID in file \"%s\"\n"),top1); exit(EXIT_FAILURE); } if (getword_atoll(&nbytes,&gwarea,'\t')<0) { - debuga(_("There is an invalid number of bytes in file %s\n"),top1); + debuga(_("Invalid number of bytes in file \"%s\"\n"),top1); exit(EXIT_FAILURE); } if (getword_atoll(&nacc,&gwarea,'\t')<0) { - debuga(_("There is an invalid number of access in file %s\n"),top1); + debuga(_("Invalid number of accesses in file \"%s\"\n"),top1); exit(EXIT_FAILURE); } if (getword_atoll(&elap,&gwarea,'\0')<0) { - debuga(_("There is an invalid elapsed time in file %s\n"),top1); + debuga(_("Invalid elapsed time in file \"%s\"\n"),top1); exit(EXIT_FAILURE); } uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,top1); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,top1); exit(EXIT_FAILURE); } diff --git a/getconf.c b/getconf.c index 4c6dfee..58716a3 100644 --- a/getconf.c +++ b/getconf.c @@ -636,7 +636,7 @@ static void parmtest(char *buf) if (is_param("date_format",buf)) { getword_start(&gwarea,buf); if (getword_multisep(wbuf,sizeof(wbuf),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken record or garbage in \"date_format\" parameter\n")); + debuga(_("Invalid record in \"date_format\" parameter\n")); exit(EXIT_FAILURE); } DateFormat=gwarea.current[0]; diff --git a/grepday.c b/grepday.c index 87449a2..18f3fe2 100644 --- a/grepday.c +++ b/grepday.c @@ -696,25 +696,25 @@ void greport_day(const struct userinfostruct *uinfo) fixendofline(buf); getword_start(&gwarea,buf); if (getword_atoll(&llday,&gwarea,'/')<0) { - debuga(_("Invalid date in file %s\n"),wdirname); + debuga(_("Invalid date in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } day=(int)llday; if (day<1 || day>31) continue; if (getword_skip(20,&gwarea,'\t')<0 || getword_skip(20,&gwarea,'\t')<0) { - debuga(_("Invalid entry in file %s\n"),wdirname); + debuga(_("Invalid entry in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } if ((datetimeby & DATETIME_BYTE)!=0) { if (getword_atoll(&bytes,&gwarea,'\t')<0) { - debuga(_("Invalid number of bytes in file %s\n"),wdirname); + debuga(_("Invalid number of bytes in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } bytespoints[day-1]+=bytes; } if ((datetimeby & DATETIME_ELAP)!=0) { if (getword_atoll(&elap,&gwarea,'\0')<0) { - debuga(_("Invalid elapsed time in file %s\n"),wdirname); + debuga(_("Invalid elapsed time in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } elappoints[day-1]+=elap; diff --git a/html.c b/html.c index 329d160..113742f 100644 --- a/html.c +++ b/html.c @@ -182,35 +182,35 @@ void htmlrel(void) while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword_atoll(<emp,&gwarea,'\t')<0) { - debuga(_("There is a broken number of access in file %s\n"),arqin); + debuga(_("Invalid number of accesses in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } tnacc+=ltemp; if (getword_atoll(<emp,&gwarea,'\t')<0) { - debuga(_("There is a broken downloaded size in file %s\n"),arqin); + debuga(_("Invalid downloaded size in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } tnbytes+=ltemp; if (getword_ptr(NULL,NULL,&gwarea,'\t')<0) { - debuga(_("There is a broken url in file %s\n"),arqin); + debuga(_("Invalid url in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_skip(MAXLEN,&gwarea,'\t')<0) { - debuga(_("There is a broken access code in file %s\n"),arqin); + debuga(_("Invalid access code in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_atoll(<emp,&gwarea,'\t')<0) { - debuga(_("There is a broken elapsed time in file %s\n"),arqin); + debuga(_("Invalid elapsed time in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } tnelap+=ltemp; if (getword_atoll(<emp,&gwarea,'\t')<0) { - debuga(_("There is a broken in-cache volume in file %s\n"),arqin); + debuga(_("Invalid in-cache size in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } tnincache+=ltemp; if (getword_atoll(<emp,&gwarea,'\n')<0) { - debuga(_("There is a broken out-cache volume in file %s\n"),arqin); + debuga(_("Invalid out-of-cache size in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } tnoucache+=ltemp; @@ -272,31 +272,31 @@ void htmlrel(void) while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword_atoll(&twork,&gwarea,'\t')<0) { - debuga(_("There is a broken number of access in file %s\n"),arqin); + debuga(_("Invalid number of accesses in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_atoll(&nnbytes,&gwarea,'\t')<0) { - debuga(_("There is a broken number of bytes in file %s\n"),arqin); + debuga(_("Invalid number of bytes in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("There is a broken url in file %s\n"),arqin); + debuga(_("Invalid url in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword(tmsg,sizeof(tmsg),&gwarea,'\t')<0) { - debuga(_("There is a broken access code in file %s\n"),arqin); + debuga(_("Invalid access code in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_atoll(&nnelap,&gwarea,'\t')<0) { - debuga(_("There is a broken elapsed time in file %s\n"),arqin); + debuga(_("Invalid elapsed time in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_atoll(&incache,&gwarea,'\t')<0) { - debuga(_("There is a broken in cache column in file %s\n"),arqin); + debuga(_("Invalid in-cache size in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } if (getword_atoll(&oucache,&gwarea,'\n')<0) { - debuga(_("There is a broken out of cache column in file %s (%d)\n"),arqin,__LINE__); + debuga(_("Invalid out-of-cache size in file \"%s\"\n"),arqin); exit(EXIT_FAILURE); } @@ -398,28 +398,28 @@ void htmlrel(void) while((buf=longline_read(fp_ip,line1))!=NULL) { getword_start(&gwarea,buf); if (getword(user_ip,sizeof(user_ip),&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken user IP in your %s file\n"),tmp3); + debuga(_("Invalid user IP in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_ptr(buf,&user_url,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken url in your %s file\n"),tmp3); + debuga(_("Invalid url in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (strncmp(user_url,url,strlen(url))!=0) continue; if (getword_skip(15,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken day in your %s file\n"),tmp3); + debuga(_("Invalid day in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_skip(15,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken time in your %s file\n"),tmp3); + debuga(_("Invalid time in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_atoll(&userbytes,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken size in your %s file\n"),tmp3); + debuga(_("Invalid size in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_atoll(&userelap,&gwarea,'\0')<0) { - debuga(_("Maybe you have a broken elapsed time in your %s file\n"),tmp3); + debuga(_("Invalid elapsed time in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } fprintf(fp_ip2,"%s\t%"PRIu64"\t%"PRIu64"\n",user_ip,(uint64_t)userbytes,(uint64_t)userelap); @@ -465,15 +465,15 @@ void htmlrel(void) while((buf=longline_read(fp_ip,line1))!=NULL) { getword_start(&gwarea,buf); if (getword(user_ip,sizeof(user_ip),&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken user IP in your %s file\n"),tmp3); + debuga(_("Invalid user IP in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_atoll(&userbytes,&gwarea,'\t')<0) { - debuga(_("Maybe you have a broken size in your %s file\n"),tmp3); + debuga(_("Invalid size in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_atoll(&userelap,&gwarea,'\0')<0) { - debuga(_("Maybe you have a broken elapsed time in your %s file\n"),tmp3); + debuga(_("Invalid elapsed time in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if(strcmp(user_ip,olduserip) != 0) { diff --git a/index.c b/index.c index 8b49c7a..46d1139 100644 --- a/index.c +++ b/index.c @@ -708,29 +708,29 @@ static void make_file_index(void) */ getword_start(&gwarea,data); if (getword_skip(16,&gwarea,' ')<0) { - debuga(_("Maybe you have a broken week day in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid date in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } if (getword_multisep(mon,sizeof(mon),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken month in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid date in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } if (getword_multisep(day,sizeof(day),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken day in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid date in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } if (getword_multisep(hour,sizeof(hour),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken time in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid time in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } do { if (getword_multisep(year,sizeof(year),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken year in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid date in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } } while (year[0] && !isdigit(year[0])); //skip time zone information with spaces until the year is found if (sscanf(hour,"%d:%d:%d",&ihour,&iminute,&isecond)!=3) { - debuga(_("Maybe you have a broken time in your %s%s/sarg-date file\n"),outdir,direntp->d_name); + debuga(_("Invalid time in file \"%s%s/sarg-date\"\n"),outdir,direntp->d_name); exit(EXIT_FAILURE); } buildymd(day,mon,year,ftime,sizeof(ftime)); diff --git a/readlog.c b/readlog.c index 2363fa5..41c15fe 100644 --- a/readlog.c +++ b/readlog.c @@ -374,7 +374,7 @@ static void ReadOneLogFile(struct ReadLogDataStruct *Filter,const char *arq) getword_start(&gwarea,ExcludeString); while(strchr(gwarea.current,':') != 0) { if (getword_multisep(val1,sizeof(val1),&gwarea,':')<0) { - debuga(_("Maybe you have a broken record or garbage in your exclusion string\n")); + debuga(_("Invalid record in exclusion string\n")); exit(EXIT_FAILURE); } if((str=(char *) strstr(linebuf,val1)) != (char *) NULL ) { diff --git a/redirector.c b/redirector.c index 2a2c347..f7ffbe6 100644 --- a/redirector.c +++ b/redirector.c @@ -138,7 +138,7 @@ static void parse_log(FILE *fp_ou,char *buf) } else { if (getword_atoll(&lyear,&gwarea,'-')<0 || getword_atoll(&lmon,&gwarea,'-')<0 || getword_atoll(&lday,&gwarea,' ')<0) { - debuga(_("Invalid date found in file %s\n"),wentp); + debuga(_("Invalid date in file \"%s\"\n"),wentp); RedirectorErrors++; return; } @@ -146,32 +146,32 @@ static void parse_log(FILE *fp_ou,char *buf) mon=(int)lmon; day=(int)lday; if (getword(hour,sizeof(hour),&gwarea,' ')<0) { - debuga(_("Invalid time found in file %s\n"),wentp); + debuga(_("Invalid time in file \"%s\"\n"),wentp); RedirectorErrors++; return; } if (getword_skip(MAXLEN,&gwarea,'(')<0 || getword(source,sizeof(source),&gwarea,'/')<0) { - debuga(_("Invalid redirected source in file %s\n"),wentp); + debuga(_("Invalid redirected source in file \"%s\"\n"),wentp); RedirectorErrors++; return; } if (getword(list,sizeof(list),&gwarea,'/')<0) { - debuga(_("Invalid redirected list in file %s\n"),wentp); + debuga(_("Invalid redirected list in file \"%s\"\n"),wentp); RedirectorErrors++; return; } if (getword_skip(MAXLEN,&gwarea,' ')<0 || getword_limit(full_url,sizeof(full_url),&gwarea,' ')<0) { - debuga(_("Invalid URL in file %s\n"),wentp); + debuga(_("Invalid url in file \"%s\"\n"),wentp); RedirectorErrors++; return; } if (getword(ip,sizeof(ip),&gwarea,'/')<0) { - debuga(_("Invalid source IP in file %s\n"),wentp); + debuga(_("Invalid source IP in file \"%s\"\n"),wentp); RedirectorErrors++; return; } if (getword_skip(MAXLEN,&gwarea,' ')<0 || getword(user,sizeof(user),&gwarea,' ')<0) { - debuga(_("Invalid user in file %s\n"),wentp); + debuga(_("Invalid user in file \"%s\"\n"),wentp); RedirectorErrors++; return; } @@ -492,33 +492,33 @@ void redirector_report(void) while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword(user,sizeof(user),&gwarea,'\t')<0) { - debuga(_("Invalid user in file %s\n"),redirector_sorted); + debuga(_("Invalid user in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } if (getword_atoll(&data2,&gwarea,'\t')<0) { - debuga(_("Invalid date in file %s\n"),redirector_sorted); + debuga(_("Invalid date in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } if (getword(hora,sizeof(hora),&gwarea,'\t')<0) { - debuga(_("Invalid time in file %s\n"),redirector_sorted); + debuga(_("Invalid time in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } if (getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("Invalid IP address in file %s\n"),redirector_sorted); + debuga(_("Invalid IP address in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } if (getword_ptr(buf,&url,&gwarea,'\t')<0) { - debuga(_("Invalid URL in file %s\n"),redirector_sorted); + debuga(_("Invalid url in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } if (getword(rule,sizeof(rule),&gwarea,'\n')<0) { - debuga(_("Invalid rule in file %s\n"),redirector_sorted); + debuga(_("Invalid rule in file \"%s\"\n"),redirector_sorted); exit(EXIT_FAILURE); } uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,redirector_sorted); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,redirector_sorted); exit(EXIT_FAILURE); } diff --git a/repday.c b/repday.c index 604b929..6d5ec46 100644 --- a/repday.c +++ b/repday.c @@ -80,7 +80,7 @@ void report_day(const struct userinfostruct *uinfo) fixendofline(buf); getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,'\t')<0) { - debuga(_("Invalid date in file %s\n"),wdirname); + debuga(_("Invalid date in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } if (sscanf(data,"%d/%d/%d",&day,&month,&year)!=3) continue; @@ -89,14 +89,14 @@ void report_day(const struct userinfostruct *uinfo) for (dayidx=0 ; dayidx=ndaylist) { if (dayidx>=sizeof(daylist)/sizeof(*daylist)) { - debuga(_("Too many different dates in %s\n"),wdirname); + debuga(_("Too many different dates in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } daylist[ndaylist++]=daynum; } if (getword_atoll(&hour,&gwarea,'\t')<0) { - debuga(_("Invalid time in file %s\n"),wdirname); + debuga(_("Invalid time in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } ihour=(int)hour; @@ -105,14 +105,14 @@ void report_day(const struct userinfostruct *uinfo) if ((datetimeby & DATETIME_BYTE)!=0) { colsep=((datetimeby & DATETIME_ELAP)!=0) ? '\t' : '\0'; if (getword_atoll(&bytes,&gwarea,colsep)<0) { - debuga(_("Invalid number of bytes in file %s\n"),wdirname); + debuga(_("Invalid number of bytes in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } tbytes[i]+=bytes; } if ((datetimeby & DATETIME_ELAP)!=0) { if (getword_atoll(&elap,&gwarea,'\0')<0) { - debuga(_("Invalid elapsed time in file %s\n"),wdirname); + debuga(_("Invalid elapsed time in file \"%s\"\n"),wdirname); exit(EXIT_FAILURE); } telap[i]+=elap; diff --git a/report.c b/report.c index b022815..be54924 100644 --- a/report.c +++ b/report.c @@ -173,16 +173,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\n"),tmp3); + debuga(_("Invalid record in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } 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\n"),tmp3); + debuga(_("Invalid elapsed time in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword_skip(20000,&gwarea,'"')<0 || getword(accsmart,sizeof(accsmart),&gwarea,'"')<0) { - debuga(_("There is a broken smart info in file %s\n"),tmp3); + debuga(_("Invalid smart info in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } @@ -576,7 +576,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\n"),filename); + debuga(_("Invalid total number of accesses in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -593,7 +593,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\n"),filename); + debuga(_("Invalid total size in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -610,7 +610,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\n"),filename); + debuga(_("Invalid total elapsed time in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -627,7 +627,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\n"),filename); + debuga(_("Invalid total cache hit in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -644,7 +644,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\n"),filename); + debuga(_("Invalid total cache miss in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } item->oucache=number*sign; @@ -654,7 +654,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename) item->user=buffer; for (i=0 ; i=' ' ; i++) buffer++; if (*buffer!='\t') { - debuga(_("User name too long or invalid in %s\n"),filename); + debuga(_("User name too long or invalid in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } *buffer++='\0'; @@ -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 number of accesses in %s\n"),filename); + debuga(_("Invalid number of accesses in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } 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!='\t') { - debuga(_("Invalid number of bytes in %s\n"),filename); + debuga(_("Invalid number of bytes in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -696,7 +696,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\n"),filename); + debuga(_("URL too long or invalid in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } *buffer++='\0'; @@ -704,7 +704,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename) item->ip=buffer; for (i=0 ; i=' ' ; i++) buffer++; if (*buffer!='\t') { - debuga(_("IP address too long or invalid in %s\n"),filename); + debuga(_("IP address too long or invalid in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } *buffer++='\0'; @@ -712,7 +712,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename) item->time=buffer; for (i=0 ; i=' ' ; i++) buffer++; if (*buffer!='\t') { - debuga(_("Time too long or invalid in %s\n"),filename); + debuga(_("Time too long or invalid in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } *buffer++='\0'; @@ -720,7 +720,7 @@ int ger_read(char *buffer,struct generalitemstruct *item,const char *filename) item->date=buffer; for (i=0 ; i=' ' ; i++) buffer++; if (*buffer!='\t') { - debuga(_("Date too long or invalid in %s\n"),filename); + debuga(_("Date too long or invalid in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } *buffer++='\0'; @@ -736,7 +736,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\n"),filename); + debuga(_("Invalid elapsed time in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -753,7 +753,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\n"),filename); + debuga(_("Invalid cache hit size in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } buffer++; @@ -770,7 +770,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\n"),filename); + debuga(_("Invalid cache miss size in file \"%s\"\n"),filename); exit(EXIT_FAILURE); } item->oucache=number*sign; diff --git a/siteuser.c b/siteuser.c index 926f1c2..653fe58 100644 --- a/siteuser.c +++ b/siteuser.c @@ -118,7 +118,7 @@ void siteuser(void) if(item.total) continue; uinfo=userinfo_find_from_id(item.user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),item.user,general2); + debuga(_("Unknown user ID %s in file \"%s\"\n"),item.user,general2); exit(EXIT_FAILURE); } diff --git a/smartfilter.c b/smartfilter.c index 59d38cb..359f936 100644 --- a/smartfilter.c +++ b/smartfilter.c @@ -123,13 +123,13 @@ void smartfilter_report(void) if (getword(user,sizeof(user),&gwarea,'\t')<0 || getword(data,sizeof(data),&gwarea,'\t')<0 || getword(hora,sizeof(hora),&gwarea,'\t')<0 || getword(ip,sizeof(ip),&gwarea,'\t')<0 || getword(url,sizeof(url),&gwarea,'\t')<0 || getword(smartcat,sizeof(smartcat),&gwarea,'\n')<0) { - debuga(_("There is a broken record or garbage in file %s\n"),smart_ou); + debuga(_("Invalid record in file \"%s\"\n"),smart_ou); exit(EXIT_FAILURE); } uinfo=userinfo_find_from_id(user); if (!uinfo) { - debuga(_("Unknown user ID %s in file %s\n"),user,smart_ou); + debuga(_("Unknown user ID %s in file \"%s\"\n"),user,smart_ou); exit(EXIT_FAILURE); } if(strcmp(ouser,user) != 0) { diff --git a/splitlog.c b/splitlog.c index 7548527..2273603 100644 --- a/splitlog.c +++ b/splitlog.c @@ -93,7 +93,7 @@ void splitlog(const char *arq, char df, int dfrom, int duntil, int convert, cons while((buf=longline_read(fp_in,line))!=NULL) { getword_start(&gwarea,buf); if (getword(data,sizeof(data),&gwarea,' ')<0) { - debuga(_("Invalid date found in file %s\n"),arq); + debuga(_("Invalid date in file \"%s\"\n"),arq); exit(EXIT_FAILURE); } tt=atoi(data); diff --git a/topsites.c b/topsites.c index a4234cf..e161cc0 100644 --- a/topsites.c +++ b/topsites.c @@ -276,20 +276,20 @@ void topsites(void) while(regstopuser=1; diff --git a/useragent.c b/useragent.c index 6768a8d..9ec1cfc 100644 --- a/useragent.c +++ b/useragent.c @@ -80,13 +80,13 @@ void useragent(void) getword_start(&gwarea,buf); if (getword(ip,sizeof(ip),&gwarea,' ')<0 || getword_skip(MAXLEN,&gwarea,'[')<0 || getword(data,sizeof(data),&gwarea,' ')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),UserAgentLog); + debuga(_("Invalid record in file \"%s\"\n"),UserAgentLog); exit(EXIT_FAILURE); } getword_start(&gwarea1,data); if (getword(day,sizeof(day),&gwarea1,'/')<0 || getword(month,sizeof(month),&gwarea1,'/')<0 || getword(year,sizeof(year),&gwarea1,':')<0) { - debuga(_("Maybe you have a broken date in your %s file\n"),UserAgentLog); + debuga(_("Invalid date in file \"%s\"\n"),UserAgentLog); exit(EXIT_FAILURE); } buildymd(day,month,year,wdate,sizeof(wdate)); @@ -97,13 +97,13 @@ void useragent(void) strcpy(idate,data); strcpy(fdate,data); if (getword_skip(MAXLEN,&gwarea,'"')<0 || getword(agent,sizeof(agent),&gwarea,'"')<0) { - debuga(_("Maybe you have a broken useragent entry in your %s file\n"),UserAgentLog); + debuga(_("Invalid useragent in file \"%s\"\n"),UserAgentLog); exit(EXIT_FAILURE); } if(gwarea.current[0]!='\0') { if (getword_skip(MAXLEN,&gwarea,' ')<0 || getword(user,sizeof(user),&gwarea,'\n')<0) { - debuga(_("Maybe you have a broken record or garbage in your %s file\n"),UserAgentLog); + debuga(_("Invalid record in file \"%s\"\n"),UserAgentLog); exit(EXIT_FAILURE); } if(user[0] == '-') @@ -180,7 +180,7 @@ void useragent(void) while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); if (getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("There is an invalid IP address in file %s\n"),tmp2); + debuga(_("Invalid IP address in file \"%s\"\n"),tmp2); exit(EXIT_FAILURE); } @@ -193,11 +193,11 @@ void useragent(void) } if (getword(agent,sizeof(agent),&gwarea,'\t')<0) { - debuga(_("There is an invalid useragent in file %s\n"),tmp2); + debuga(_("Invalid useragent in file \"%s\"\n"),tmp2); exit(EXIT_FAILURE); } if (getword(user,sizeof(user),&gwarea,'\t')<0) { - debuga(_("There is an invalid user ID in file %s\n"),tmp2); + debuga(_("Invalid user ID in file \"%s\"\n"),tmp2); exit(EXIT_FAILURE); } @@ -253,11 +253,11 @@ void useragent(void) while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); if (getword(ip,sizeof(ip),&gwarea,'\t')<0) { - debuga(_("There is an invalid IP address in file %s\n"),tmp3); + debuga(_("Invalid IP address in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } if (getword(agent,sizeof(agent),&gwarea,'\t')<0) { - debuga(_("There is an invalid useragent in file %s\n"),tmp3); + debuga(_("Invalid useragent in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } @@ -324,7 +324,7 @@ void useragent(void) fixendofline(buf); getword_start(&gwarea,buf); if (getword(tagent,sizeof(tagent),&gwarea,' ')<0) { - debuga(_("There is an invalid useragent in file %s\n"),tmp3); + debuga(_("Invalid useragent in file \"%s\"\n"),tmp3); exit(EXIT_FAILURE); } nagent=atoi(tagent); diff --git a/util.c b/util.c index 398401d..baceb98 100644 --- a/util.c +++ b/util.c @@ -900,7 +900,7 @@ void obttotal(const char *dirname, const char *name, int nuser, long long int *t } if ((line=longline_create())==NULL) { - debuga(_("Not enough memory to read the file %s\n"),wdir); + debuga(_("Not enough memory to read file \"%s\"\n"),wdir); exit(EXIT_FAILURE); } @@ -913,17 +913,17 @@ void obttotal(const char *dirname, const char *name, int nuser, long long int *t continue; getword_start(&gwarea,buf); if (getword(user,sizeof(user),&gwarea,sep)<0) { - debuga(_("There is a invalid user in file %s\n"),wdir); + debuga(_("Invalid user in file \"%s\"\n"),wdir); exit(EXIT_FAILURE); } if(strcmp(user,"TOTAL") != 0) continue; if (getword_skip(MAXLEN,&gwarea,sep)<0) { - debuga(_("There a broken total number of access in file %s\n"),wdir); + debuga(_("Invalid total number of accesses in file \"%s\"\n"),wdir); exit(EXIT_FAILURE); } if (getword_atoll(tbytes,&gwarea,sep)<0) { - debuga(_("There is a broken number of bytes in file %s\n"),wdir); + debuga(_("Invalid number of bytes in file \"%s\"\n"),wdir); exit(EXIT_FAILURE); } break; -- 2.39.5