home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 35 Internet
/
35-Internet.zip
/
sarg1221.zip
/
sarg-1.2.2.1-os2-diff
< prev
next >
Wrap
Text File
|
2002-10-14
|
45KB
|
1,383 lines
diff -cbr sarg-1.2.2.1-org/authfail.c sarg-1.2.2.1/authfail.c
*** sarg-1.2.2.1-org/authfail.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/authfail.c Fri Oct 11 14:14:18 2002
***************
*** 42,48 ****
sprintf(per,"%s/periodo",dirname);
sprintf(report,"%s/authfail.html",dirname);
! sprintf(csort,"sort -b -T %s -k 3,3 -k 5,5 -o %s %s", TempDir, authfail_in, tmp4);
system(csort);
unlink(tmp4);
--- 42,48 ----
sprintf(per,"%s/periodo",dirname);
sprintf(report,"%s/authfail.html",dirname);
! sprintf(csort, SORT" -b -T %s -k 3,3 -k 5,5 -o %s %s", TempDir, authfail_in, tmp4);
system(csort);
unlink(tmp4);
***************
*** 70,83 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(url,"<font face=%s>\n",FontFace);
fputs(url,fp_ou);
- }
-
- sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(url,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
--- 70,78 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(url,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
***************
*** 156,165 ****
} else strcpy(name,user);
} else strcpy(name,user);
! sprintf(html2,"<tr><td bgcolor=%s><font size=%s>%s</font></td>
! <td bgcolor=%s><font size=%s>%s</font></td>
! <td bgcolor=%s><font size=%s>%s-%s</font></td>
! <td bgcolor=%s><font size=%s><a href=\"%s\">%s</a></font></td></th>\n",
TxBgColor,FontSize,name,
TxBgColor,FontSize,ip,
TxBgColor,FontSize,data,hora,
--- 151,161 ----
} else strcpy(name,user);
} else strcpy(name,user);
! // DAS: The string must be terminated before end of line
! sprintf(html2,"<tr><td bgcolor=%s><font size=%s>%s</font></td>"
! "<td bgcolor=%s><font size=%s>%s</font></td>"
! "<td bgcolor=%s><font size=%s>%s-%s</font></td>"
! "<td bgcolor=%s><font size=%s><a href=\"%s\">%s</a></font></td></th>\n",
TxBgColor,FontSize,name,
TxBgColor,FontSize,ip,
TxBgColor,FontSize,data,hora,
diff -cbr sarg-1.2.2.1-org/charset.c sarg-1.2.2.1/charset.c
*** sarg-1.2.2.1-org/charset.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/charset.c Tue Oct 8 20:21:04 2002
***************
*** 41,46 ****
--- 41,49 ----
if(strcmp(CharSet,"Koi8-r") == 0)
strcpy(CharSet,"KOI8-R");
+ if(strcmp(CharSet,"Cyrillic-866") == 0)
+ strcpy(CharSet,"CP866");
+
return;
}
diff -cbr sarg-1.2.2.1-org/denied.c sarg-1.2.2.1/denied.c
*** sarg-1.2.2.1-org/denied.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/denied.c Fri Oct 11 14:16:00 2002
***************
*** 63,76 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(url,"<font face=%s>\n",FontFace);
fputs(url,fp_ou);
- }
-
- sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(url,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
--- 63,71 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(url,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
***************
*** 149,158 ****
} else strcpy(name,user);
} else strcpy(name,user);
! sprintf(html2,"<tr><td bgcolor=%s><font size=%s>%s</font></td>
! <td bgcolor=%s><font size=%s>%s</font></td>
! <td bgcolor=%s><font size=%s>%s-%s</font></td>
! <td bgcolor=%s><font size=%s><a href=\"%s\">%s</a></font></td></th>\n",
TxBgColor,FontSize,name,
TxBgColor,FontSize,ip,
TxBgColor,FontSize,data,hora,
--- 144,154 ----
} else strcpy(name,user);
} else strcpy(name,user);
! // DAS: The string must be terminated before end of line
! sprintf(html2,"<tr><td bgcolor=%s><font size=%s>%s</font></td>"
! "<td bgcolor=%s><font size=%s>%s</font></td>"
! "<td bgcolor=%s><font size=%s>%s-%s</font></td>"
! "<td bgcolor=%s><font size=%s><a href=\"%s\">%s</a></font></td></tr>\n",
TxBgColor,FontSize,name,
TxBgColor,FontSize,ip,
TxBgColor,FontSize,data,hora,
diff -cbr sarg-1.2.2.1-org/email.c sarg-1.2.2.1/email.c
*** sarg-1.2.2.1-org/email.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/email.c Tue Oct 8 16:14:56 2002
***************
*** 130,136 ****
fclose(fp_in);
fclose(fp_top2);
! sprintf(csort,"sort -n -T %s -r -k 2,2 -o %s %s", TempDir, top1, top2);
system(csort);
unlink(top2);
--- 130,136 ----
fclose(fp_in);
fclose(fp_top2);
! sprintf(csort, SORT" -n -T %s -r -k 2,2 -o %s %s", TempDir, top1, top2);
system(csort);
unlink(top2);
***************
*** 297,303 ****
system(buf);
}
! sprintf(csort,"rm -r %s/sarg_tmp",TempDir);
system(csort);
return (0);
--- 297,303 ----
system(buf);
}
! sprintf(csort, RM" -r %s/sarg_tmp",TempDir);
system(csort);
return (0);
diff -cbr sarg-1.2.2.1-org/exclude.c sarg-1.2.2.1/exclude.c
*** sarg-1.2.2.1-org/exclude.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/exclude.c Fri Oct 11 14:18:06 2002
***************
*** 11,26 ****
char whost[1024];
char wip1[1024], wip2[1024];
char sn1[4], sn2[4], sn3[4];
! char str[strlen(excludefile)];
whost[0]='\0';
- strcpy(str,excludefile);
getword(whost,str,' ');
while(strcmp(whost,"*FIM*") != 0) {
if(strstr(ip,whost) !=0)
return(0);
strcpy(wip1,ip);
getword(sn1,wip1,'.');
--- 11,29 ----
char whost[1024];
char wip1[1024], wip2[1024];
char sn1[4], sn2[4], sn3[4];
! // DAS: Usage of "str[strlen(excludefile)]" is not corresponds to C standard
! char *str = strdup(excludefile);
whost[0]='\0';
getword(whost,str,' ');
while(strcmp(whost,"*FIM*") != 0) {
if(strstr(ip,whost) !=0)
+ {
+ free(str);
return(0);
+ }
strcpy(wip1,ip);
getword(sn1,wip1,'.');
***************
*** 30,44 ****
sprintf(wip1,"%s.%s.%s.0",sn1,sn2,sn3);
sprintf(wip2,"%s.%s.0.0",sn1,sn2);
! if(strstr(whost,wip1) !=0)
! return(0);
!
! if(strstr(whost,wip2) !=0)
return(0);
getword(whost,str,' ');
}
return(1);
}
--- 33,48 ----
sprintf(wip1,"%s.%s.%s.0",sn1,sn2,sn3);
sprintf(wip2,"%s.%s.0.0",sn1,sn2);
! if(strstr(whost,wip1) !=0 || strstr(whost,wip2) !=0 )
! {
! free(str);
return(0);
+ }
getword(whost,str,' ');
}
+ free(str);
return(1);
}
diff -cbr sarg-1.2.2.1-org/html.c sarg-1.2.2.1/html.c
*** sarg-1.2.2.1-org/html.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/html.c Mon Oct 14 11:00:02 2002
***************
*** 16,22 ****
long long int totelap=0, totelap2=0, nnelap=0, unelap=0, tnelap=0;
long long int incache=0, oucache=0, tnincache=0, tnoucache=0, twork=0, twork2=0;
char arqin[MAXLEN], arqou[MAXLEN], arqper[MAXLEN], arqip[MAXLEN];
! char nacc[20], nbytes[20], url[1024], purl[1024], tmsg[30], tmsg2[30], nelap[20], csort[MAXLEN];
char periodo[MAXLEN], usuario[MAXLEN], wusuario[MAXLEN], u2[MAXLEN], duser[MAXLEN];
char userbytes[20], userelap[20], userurl[1024], userip[MAXLEN], userhora[9], userdia[9];
char olduserip[MAXLEN], tmp2[MAXLEN], tmp3[MAXLEN], incac[20], oucac[20];
--- 16,22 ----
long long int totelap=0, totelap2=0, nnelap=0, unelap=0, tnelap=0;
long long int incache=0, oucache=0, tnincache=0, tnoucache=0, twork=0, twork2=0;
char arqin[MAXLEN], arqou[MAXLEN], arqper[MAXLEN], arqip[MAXLEN];
! char nacc[20], nbytes[20], url[1024], purl[1024], tmsg[31], tmsg2[30], nelap[20], csort[MAXLEN];
char periodo[MAXLEN], usuario[MAXLEN], wusuario[MAXLEN], u2[MAXLEN], duser[MAXLEN];
char userbytes[20], userelap[20], userurl[1024], userip[MAXLEN], userhora[9], userdia[9];
char olduserip[MAXLEN], tmp2[MAXLEN], tmp3[MAXLEN], incac[20], oucac[20];
***************
*** 164,182 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(html,"<font face=%s>\n",FontFace);
fputs(html,fp_ou);
- }
-
- sprintf(html,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(html,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
! sprintf(html,"<tr><th align=left><img src='%s' border=0 align=absmiddle width=%s height=%s><font color=%s
! >%s</font>\n",LogoImage,Width,Height,LogoTextColor,LogoText);
fputs(html,fp_ou);
}
--- 164,176 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(html,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(html,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
! sprintf(html,"<tr><th align=left><img src='%s' border=0 align=absmiddle width=%s height=%s><font color=%s>%s</font>\n",LogoImage,Width,Height,LogoTextColor,LogoText);
fputs(html,fp_ou);
}
***************
*** 258,263 ****
--- 252,258 ----
}else {
strcpy(purl,url);
strncpy(tmsg," ",30);
+ tmsg[30]='\0'; // DAS: strncpy don't add '\0'
}
nnbytes=my_atoll(nbytes);
***************
*** 297,324 ****
sprintf(httplink,"<font size=%s color=%s><href=http://%s>%s", \
FontSize,PrivacyStringColor,PrivacyString,PrivacyString);
else
! sprintf(httplink,"<font size=%s><a href=http://%s>%s</A>",FontSize,url,purl);
if(strstr(ReportType,"site_user_time_date") != 0) {
sprintf(ltext110,"%s",text[110]);
! if(ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
! z1=0;
! z2=0;
! strcpy(siteind,url);
! str=siteind;
! for(z1=0; z1<=strlen(str); z1++) {
! if(str[z1]=='-')
! str[z1]='_';
! if(str[z1]=='.')
! str[z1]='_';
! if(str[z1]==':')
! str[z1]='_';
! siteind[z2]=str[z1];
! z2++;
! }
sprintf(href2,"<a href='tt%s-%s.html' style='color:FF3333;'>",usuario,siteind);
} else {
bzero(href2, MAXLEN);
--- 292,306 ----
sprintf(httplink,"<font size=%s color=%s><href=http://%s>%s", \
FontSize,PrivacyStringColor,PrivacyString,PrivacyString);
else
! sprintf(httplink,"<font size=%s><a href=http://%s>%s</a>",FontSize,url,purl);
if(strstr(ReportType,"site_user_time_date") != 0) {
sprintf(ltext110,"%s",text[110]);
! if(*ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
! encode_filename( siteind, url );
sprintf(href2,"<a href='tt%s-%s.html' style='color:FF3333;'>",usuario,siteind);
} else {
bzero(href2, MAXLEN);
***************
*** 353,359 ****
fclose(fp_ip);
fclose(fp_ip2);
! sprintf(csort,"sort -n -T %s -k 1,1 -k 5,5 -o %s %s",TempDir,tmp3,tmp2);
system(csort);
--- 335,341 ----
fclose(fp_ip);
fclose(fp_ip2);
! sprintf(csort, SORT" -n -T %s -k 1,1 -k 5,5 -o %s %s",TempDir,tmp3,tmp2);
system(csort);
diff -cbr sarg-1.2.2.1-org/include/conf.h sarg-1.2.2.1/include/conf.h
*** sarg-1.2.2.1-org/include/conf.h Thu Jun 13 18:38:10 2002
--- sarg-1.2.2.1/include/conf.h Tue Oct 8 16:45:36 2002
***************
*** 1,6 ****
--- 1,45 ----
#include "info.h"
+ #if defined(__OS2__)
+
+ #include <io.h>
+ #include <memory.h>
+ #include <getopt.h>
+
+ #define bzero(p,s) memset( p, 0, s )
+ #define SYSCONFDIR "."
+
+ #define F_OK 0
+ #define X_OK 4
+ #define W_OK 2
+ #define R_OK 4
+
+ #include <sys/time.h>
+ #include <types.h>
+ #include <sys/select.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+
+ #define SORT "sasort"
+ #define MKDIR "samd"
+ #define RM "sarm"
+
+ #define HAVE_STDIO_H 1
+ #define HAVE_STDLIB_H 1
+ #define HAVE_STRING_H 1
+ #define HAVE_CTYPE_H 1
+ #define HAVE_DIRENT_H 1
+ #else
+ #define SORT "sort"
+ #define MKDIR "mkdir"
+ #define RM "rm"
+ #endif
+
#if HAVE_STDIO_H
#include <stdio.h>
#endif
diff -cbr sarg-1.2.2.1-org/index.c sarg-1.2.2.1/index.c
*** sarg-1.2.2.1-org/index.c Thu Jun 13 17:52:46 2002
--- sarg-1.2.2.1/index.c Fri Oct 11 14:10:06 2002
***************
*** 5,11 ****
#include "include/conf.h"
! #define SORTINDEX
#ifdef SORTINDEX
#include <dirent.h>
#include <sys/stat.h>
--- 5,14 ----
#include "include/conf.h"
! #if !defined(__OS2__)
! #define SORTINDEX
! #endif
!
#ifdef SORTINDEX
#include <dirent.h>
#include <sys/stat.h>
***************
*** 71,84 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(html,"<font face=%s>\n",FontFace);
! fputs(html,fp_ou);
! }
!
! sprintf(html,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
fputs(html,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
--- 74,82 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(html,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(html,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
***************
*** 115,121 ****
obtuser(dirname,direntp->d_name,tuser);
obttotal(dirname,direntp->d_name,tbytes,tuser,media);
! sprintf(html,"<tr><td bgcolor=%s><font size=%s><a href='%s/%s'>%s</font></a></td><td bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,direntp->d_name,ReplaceIndex,direntp->d_name,TxBgColor,FontSize,data,TxBgColor,FontSize,tuser,TxBgColor,FontSize,tbytes,TxBgColor,FontSize,media);
fputs(html,fp_ou);
}
--- 113,119 ----
obtuser(dirname,direntp->d_name,tuser);
obttotal(dirname,direntp->d_name,tbytes,tuser,media);
! sprintf(html,"<tr><td bgcolor=%s><font size=%s><a href='%s/%s'>%s</a></font></a></td><td bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td><td align=right bgcolor=%s><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,direntp->d_name,ReplaceIndex,direntp->d_name,TxBgColor,FontSize,data,TxBgColor,FontSize,tuser,TxBgColor,FontSize,tbytes,TxBgColor,FontSize,media);
fputs(html,fp_ou);
}
Only in sarg-1.2.2.1/languages: Russian
diff -cbr sarg-1.2.2.1-org/lastlog.c sarg-1.2.2.1/lastlog.c
*** sarg-1.2.2.1-org/lastlog.c Thu Jun 13 17:52:46 2002
--- sarg-1.2.2.1/lastlog.c Tue Oct 8 16:25:28 2002
***************
*** 46,52 ****
(void)closedir( dirp );
fclose(fp_ou);
! sprintf(buf,"sort -n -k 1,1 -o %slastlog %s",outdir,temp);
system(buf);
unlink(temp);
--- 46,52 ----
(void)closedir( dirp );
fclose(fp_ou);
! sprintf(buf, SORT" -n -k 1,1 -o %slastlog %s",outdir,temp);
system(buf);
unlink(temp);
***************
*** 75,84 ****
sprintf(msg,"%s: %s",text[81],buf);
debuga(msg);
}
! // sprintf(temp,"%s%s",outdir,buf);
! sprintf(temp,"rm -r %s%s",outdir,buf);
system(temp);
- unlink(temp);
ftot--;
}
}
--- 75,82 ----
sprintf(msg,"%s: %s",text[81],buf);
debuga(msg);
}
! sprintf(temp, RM" -r %s%s",outdir,buf);
system(temp);
ftot--;
}
}
diff -cbr sarg-1.2.2.1-org/log.c sarg-1.2.2.1/log.c
*** sarg-1.2.2.1-org/log.c Thu Jun 13 17:54:04 2002
--- sarg-1.2.2.1/log.c Fri Oct 11 10:15:48 2002
***************
*** 457,463 ****
strcpy(tmp6,tmp);
if(strlen(email) > 0) {
! sprintf(wtemp2,"mkdir -p %s/sarg_tmp",tmp2);
system(wtemp2);
strcat(tmp2,"/sarg_tmp");
strcpy(outdir,tmp2);
--- 457,463 ----
strcpy(tmp6,tmp);
if(strlen(email) > 0) {
! sprintf(wtemp2, MKDIR" -p %s/sarg_tmp",tmp2);
system(wtemp2);
strcat(tmp2,"/sarg_tmp");
strcpy(outdir,tmp2);
***************
*** 648,654 ****
while(fgets(bufz,sizeof(bufz),fp_in)!=NULL) {
recs2++;
if(debug)
! printf("SARG: Records in file=%d Reading=%d Rest=%d\r",recs1,recs2,recs1-recs2);
if(!bufz[0]) continue;
if(strstr(bufz,"HTTP/0.0") != 0) continue;
if(strstr(bufz,"logfile turned over") != 0) continue;
--- 648,654 ----
while(fgets(bufz,sizeof(bufz),fp_in)!=NULL) {
recs2++;
if(debug)
! printf("SARG: Records in file=%d Reading=%d Rest=%d \r",recs1,recs2,recs1-recs2);
if(!bufz[0]) continue;
if(strstr(bufz,"HTTP/0.0") != 0) continue;
if(strstr(bufz,"logfile turned over") != 0) continue;
***************
*** 975,983 ****
fclose(fp_denied);
if(fp_authfail)
fclose(fp_authfail);
! if(tmp4)
unlink(tmp4);
! if(tmp6)
unlink(tmp6);
unlink(tmp3);
exit(0);
--- 975,983 ----
fclose(fp_denied);
if(fp_authfail)
fclose(fp_authfail);
! if(*tmp4)
unlink(tmp4);
! if(*tmp6)
unlink(tmp6);
unlink(tmp3);
exit(0);
***************
*** 1024,1035 ****
debuga(msg);
}
! sprintf(csort,"sort -T %s -k 3,3 -k 5,5 -o %s %s", tmp, tmp2, tmp3);
system(csort);
unlink(tmp3);
if(strstr(ReportType,"denied") != 0) {
! sprintf(csort,"sort -T %s -k 3,3 -k 5,5 -o %s %s", tmp, tmp5, tmp4);
system(csort);
unlink(tmp4);
}
--- 1024,1035 ----
debuga(msg);
}
! sprintf(csort, SORT" -T %s -k 3,3 -k 5,5 -o %s %s", tmp, tmp2, tmp3);
system(csort);
unlink(tmp3);
if(strstr(ReportType,"denied") != 0) {
! sprintf(csort, SORT" -T %s -k 3,3 -k 5,5 -o %s %s", tmp, tmp5, tmp4);
system(csort);
unlink(tmp4);
}
Only in sarg-1.2.2.1: Makefile.os2
Only in sarg-1.2.2.1: os2
diff -cbr sarg-1.2.2.1-org/repday.c sarg-1.2.2.1/repday.c
*** sarg-1.2.2.1-org/repday.c Thu Jun 13 17:54:26 2002
--- sarg-1.2.2.1/repday.c Fri Oct 11 14:10:10 2002
***************
*** 57,68 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(html,"<font face=%s>\n",FontFace);
! fputs(html,fp_ou);
! }
!
! sprintf(html,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
fputs(html,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
--- 57,64 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(html,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(html,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
***************
*** 111,117 ****
fputs("<tr><td></td></tr><tr><td></td></tr>\n",fp_ou);
fputs("<tr><td></td></tr><tr><td></td></tr></table>\n",fp_ou);
! fputs("<table border=1 cellpadding=2 cellspacing=0>\n", fp_ou);
fputs( "<tr><td border=0></td>\n", fp_ou );
--- 107,113 ----
fputs("<tr><td></td></tr><tr><td></td></tr>\n",fp_ou);
fputs("<tr><td></td></tr><tr><td></td></tr></table>\n",fp_ou);
! fputs("<table cellpadding=1 cellspacing=1>\n", fp_ou);
fputs( "<tr><td border=0></td>\n", fp_ou );
diff -cbr sarg-1.2.2.1-org/report.c sarg-1.2.2.1/report.c
*** sarg-1.2.2.1-org/report.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/report.c Fri Oct 11 14:21:20 2002
***************
*** 159,180 ****
if(strstr(ReportType,"site_user_time_date") != 0) {
if(!ttopen) {
ind2++;
! strcpy(siteind,accurl);
! z1=0;
! z2=0;
! str=siteind;
! for(z1=0; z1<=strlen(str); z1++) {
! if(str[z1]=='-')
! str[z1]='_';
! if(str[z1]=='.')
! str[z1]='_';
! if(str[z1]==':')
! str[z1]='_';
! if(str[z1]=='/')
! str[z1]='_';
! siteind[z2]=str[z1];
! z2++;
! }
sprintf(arqtt,"%s/tt%s-%s.html",dirname,accuser,siteind);
if ((fp_tt = fopen(arqtt, "w")) == 0) {
fprintf(stderr, "SARG: (report) %s: %s\n",text[45],arqtt);
--- 159,165 ----
if(strstr(ReportType,"site_user_time_date") != 0) {
if(!ttopen) {
ind2++;
! encode_filename( siteind, accurl );
sprintf(arqtt,"%s/tt%s-%s.html",dirname,accuser,siteind);
if ((fp_tt = fopen(arqtt, "w")) == 0) {
fprintf(stderr, "SARG: (report) %s: %s\n",text[45],arqtt);
***************
*** 186,195 ****
sprintf(httplink,"<font size=%s color=%s><href=http://%s>%s", \
FontSize,PrivacyStringColor,PrivacyString,PrivacyString);
else
! sprintf(httplink,"<font size=%s><a href=http://%s>%s</A>",FontSize,accurl,accurl);
sprintf(ltext110,"%s",text[110]);
! if(ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
--- 171,180 ----
sprintf(httplink,"<font size=%s color=%s><href=http://%s>%s", \
FontSize,PrivacyStringColor,PrivacyString,PrivacyString);
else
! sprintf(httplink,"<font size=%s><a href=http://%s>%s</a>",FontSize,accurl,accurl);
sprintf(ltext110,"%s",text[110]);
! if(*ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
***************
*** 200,213 ****
fputs(html,fp_tt);
fputs("</head>\n",fp_tt);
! if(strlen(FontFace) > 0) {
! sprintf(html,"<font face=%s>\n",FontFace);
fputs(html,fp_tt);
- }
-
- sprintf(html,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(html,fp_tt);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_tt);
if(strlen(LogoImage) > 0) {
--- 185,193 ----
fputs(html,fp_tt);
fputs("</head>\n",fp_tt);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(html,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(html,fp_tt);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_tt);
if(strlen(LogoImage) > 0) {
***************
*** 235,242 ****
fputs("<tr><td></td><td></td></tr>",fp_tt);
bzero(tmp4, MAXLEN);
bzero(tmp5, MAXLEN);
! strncpy(tmp4,text[110],4);
! strncpy(tmp5,text[110]+5,4);
sprintf(html,"<tr><th align=left bgcolor=%s><font size=%s color=%s>%s</font></th><td></td><td></td><th bgcolor=%s><font size=%s color=%s>%s</font></th><td></td><td></td><th bgcolor=%s><font size=%s color=%s>%s</font></th></tr>\n",HeaderBgColor,FontSize,HeaderColor,text[91],HeaderBgColor,FontSize,HeaderColor,tmp4,HeaderBgColor,FontSize,HeaderColor,tmp5);
fputs(html,fp_tt);
}
--- 215,222 ----
fputs("<tr><td></td><td></td></tr>",fp_tt);
bzero(tmp4, MAXLEN);
bzero(tmp5, MAXLEN);
! strncpy(tmp4,text[110],4); // FIXME: This is not multilanguage!
! strncpy(tmp5,text[110]+5,4); // FIXME: This is not multilanguage!
sprintf(html,"<tr><th align=left bgcolor=%s><font size=%s color=%s>%s</font></th><td></td><td></td><th bgcolor=%s><font size=%s color=%s>%s</font></th><td></td><td></td><th bgcolor=%s><font size=%s color=%s>%s</font></th></tr>\n",HeaderBgColor,FontSize,HeaderColor,text[91],HeaderBgColor,FontSize,HeaderColor,tmp4,HeaderBgColor,FontSize,HeaderColor,tmp5);
fputs(html,fp_tt);
}
Only in sarg-1.2.2.1: samd.exe
diff -cbr sarg-1.2.2.1-org/sarg.conf sarg-1.2.2.1/sarg.conf
*** sarg-1.2.2.1-org/sarg.conf Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/sarg.conf Tue Oct 8 21:11:38 2002
***************
*** 16,21 ****
--- 16,22 ----
# Polish
# Portuguese
# Romanian
+ # Russian
# Russian_koi8
# Russian_windows1251
# Serbian
***************
*** 310,315 ****
--- 311,317 ----
# Latin6
# Windows-1251
# Koi8-r
+ # Cyrillic-866
#
#charset Latin1
Only in sarg-1.2.2.1: sarg.exe
Only in sarg-1.2.2.1: sarm.exe
Only in sarg-1.2.2.1: sasort.exe
diff -cbr sarg-1.2.2.1-org/siteuser.c sarg-1.2.2.1/siteuser.c
*** sarg-1.2.2.1-org/siteuser.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/siteuser.c Fri Oct 11 14:10:20 2002
***************
*** 44,50 ****
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort,"sort -k 4,4 -k 1,1 -o %s %s",geral2,geral);
system(csort);
if((fp_in=fopen(geral2,"r"))==NULL) {
--- 44,50 ----
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort, SORT" -k 4,4 -k 1,1 -o %s %s",geral2,geral);
system(csort);
if((fp_in=fopen(geral2,"r"))==NULL) {
***************
*** 63,74 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(url,"<font face=%s>\n",FontFace);
! fputs(url,fp_ou);
! }
!
! sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
--- 63,70 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(url,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
***************
*** 133,139 ****
}
if(strcmp(url,ourl) != 0) {
! sprintf(html,"<tr><td bgcolor=%s align=right><font size=%s>%d</font></td><td> </td><td align=left border=0 bgcolor=%s><font size=%s><a href=\"http://%s\">%s</font></td><td> </td><td bgcolor=%s align=left><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,regs,TxBgColor,FontSize,ourl,ourl,TxBgColor,FontSize,users);
fputs(html,fp_ou);
regs++;
ucount=0;
--- 129,135 ----
}
if(strcmp(url,ourl) != 0) {
! sprintf(html,"<tr><td bgcolor=%s align=right><font size=%s>%d</font></td><td> </td><td align=left border=0 bgcolor=%s><font size=%s><a href=\"http://%s\">%s</a></font></td><td> </td><td bgcolor=%s align=left><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,regs,TxBgColor,FontSize,ourl,ourl,TxBgColor,FontSize,users);
fputs(html,fp_ou);
regs++;
ucount=0;
diff -cbr sarg-1.2.2.1-org/smartfilter.c sarg-1.2.2.1/smartfilter.c
*** sarg-1.2.2.1-org/smartfilter.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/smartfilter.c Fri Oct 11 14:10:22 2002
***************
*** 51,57 ****
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort,"sort -n -k 1,1 -k 2,2 -k 3,3 -o %s %s",smart_ou,smart_in);
system(csort);
unlink(smart_in);
--- 51,57 ----
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort, SORT" -n -k 1,1 -k 2,2 -k 3,3 -o %s %s",smart_ou,smart_in);
system(csort);
unlink(smart_in);
***************
*** 71,84 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(url,"<font face=%s>\n",FontFace);
fputs(url,fp_ou);
- }
-
- sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(url,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
--- 71,79 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(url,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
diff -cbr sarg-1.2.2.1-org/sort.c sarg-1.2.2.1/sort.c
*** sarg-1.2.2.1-org/sort.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/sort.c Fri Oct 11 11:44:12 2002
***************
*** 13,19 ****
struct dirent *direntp;
char csort[MAXLEN];
! char wentp[20];
char arqou[MAXLEN], arqin[MAXLEN], wnome[MAXLEN], wnome2[MAXLEN];
char field1[10]="2,2";
char field2[10]="1,1";
--- 13,19 ----
struct dirent *direntp;
char csort[MAXLEN];
! char wentp[MAXLEN];
char arqou[MAXLEN], arqin[MAXLEN], wnome[MAXLEN], wnome2[MAXLEN];
char field1[10]="2,2";
char field2[10]="1,1";
***************
*** 79,86 ****
order[0]='\0';
strcat(arqou,".txt");
! sprintf(csort,"sort -n -T %s %s -k %s -k %s -k %s -o %s %s",TempDir,order,field1,field2,field3,arqou,arqin);
!
system(csort);
unlink(arqin);
--- 79,85 ----
order[0]='\0';
strcat(arqou,".txt");
! sprintf(csort, SORT" -n -T %s %s -k %s -k %s -k %s -o %s %s",TempDir,order,field1,field2,field3,arqou,arqin);
system(csort);
unlink(arqin);
diff -cbr sarg-1.2.2.1-org/topsites.c sarg-1.2.2.1/topsites.c
*** sarg-1.2.2.1-org/topsites.c Thu Jun 13 17:52:46 2002
--- sarg-1.2.2.1/topsites.c Fri Oct 11 14:10:26 2002
***************
*** 47,53 ****
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort,"sort -k 4,4 -o %s %s",geral2,geral);
system(csort);
if((fp_in=fopen(geral2,"r"))==NULL) {
--- 47,53 ----
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
! sprintf(csort, SORT" -k 4,4 -o %s %s",geral2,geral);
system(csort);
if((fp_in=fopen(geral2,"r"))==NULL) {
***************
*** 111,117 ****
if(strcmp(TopsitesSortType,"d") == 0)
strcpy(sortt,"-r");
! sprintf(csort,"sort %s -k %s -o %s %s",sortt,sortf,sites,geral3);
system(csort);
unlink(geral2);
--- 111,117 ----
if(strcmp(TopsitesSortType,"d") == 0)
strcpy(sortt,"-r");
! sprintf(csort, SORT" %s -k %s -o %s %s",sortt,sortf,sites,geral3);
system(csort);
unlink(geral2);
***************
*** 135,148 ****
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! if(strlen(FontFace) > 0) {
! sprintf(url,"<font face=%s>\n",FontFace);
fputs(url,fp_ou);
- }
-
- sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(url,fp_ou);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
--- 135,143 ----
fputs(html,fp_ou);
fputs("</head>\n",fp_ou);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(url,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(url,fp_ou);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ou);
if(strlen(LogoImage) > 0) {
***************
*** 189,195 ****
sprintf(wwork1,"%s",fixnum(twork1));
sprintf(wwork2,"%s",fixnum(twork2));
! sprintf(ourl,"<tr><td bgcolor=%s align=right><font size=%s>%d</font></td><td> </td><td align=right border=0 bgcolor=%s><font size=%s><a href=\"http://%s\">%s</font></td><td> </td><td bgcolor=%s align=right><font size=%s>%s</font></td><td> </td><td bgcolor=%s align=right><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,regs,TxBgColor,FontSize,url,url,TxBgColor,FontSize,wwork1,TxBgColor,FontSize,wwork2);
fputs(ourl,fp_ou);
regs++;
}
--- 184,190 ----
sprintf(wwork1,"%s",fixnum(twork1));
sprintf(wwork2,"%s",fixnum(twork2));
! sprintf(ourl,"<tr><td bgcolor=%s align=right><font size=%s>%d</font></td><td> </td><td align=right border=0 bgcolor=%s><font size=%s><a href=\"http://%s\">%s</a></font></td><td> </td><td bgcolor=%s align=right><font size=%s>%s</font></td><td> </td><td bgcolor=%s align=right><font size=%s>%s</font></td></tr>\n",TxBgColor,FontSize,regs,TxBgColor,FontSize,url,url,TxBgColor,FontSize,wwork1,TxBgColor,FontSize,wwork2);
fputs(ourl,fp_ou);
regs++;
}
diff -cbr sarg-1.2.2.1-org/topuser.c sarg-1.2.2.1/topuser.c
*** sarg-1.2.2.1-org/topuser.c Thu Jun 13 17:52:44 2002
--- sarg-1.2.2.1/topuser.c Fri Oct 11 14:10:32 2002
***************
*** 20,26 ****
char olduser[MAXLEN], csort[MAXLEN], periodo[MAXLEN], arqper[MAXLEN];
char wger[MAXLEN], top1[MAXLEN], top2[MAXLEN], top3[MAXLEN];
char user[MAXLEN], nacc[20], nbytes[20], url[1024], preg[8000], tusr[MAXLEN];
! char ip[MAXLEN], hora[9], data[11], elap[15], incac[15], oucac[15], html[MAXLEN];
char ipantes[MAXLEN], nameantes[MAXLEN];
char sfield[10]="2,2";
char order[3]="-r";
--- 20,26 ----
char olduser[MAXLEN], csort[MAXLEN], periodo[MAXLEN], arqper[MAXLEN];
char wger[MAXLEN], top1[MAXLEN], top2[MAXLEN], top3[MAXLEN];
char user[MAXLEN], nacc[20], nbytes[20], url[1024], preg[8000], tusr[MAXLEN];
! char ip[MAXLEN], hora[16], data[16], elap[16], incac[16], oucac[16], html[MAXLEN];
char ipantes[MAXLEN], nameantes[MAXLEN];
char sfield[10]="2,2";
char order[3]="-r";
***************
*** 143,148 ****
--- 143,149 ----
sprintf(preg,"TOTAL %s %s %s %s %s\n",val1,val2,val3,val4,val5);
fclose(fp_in);
fclose(fp_top2);
+ fclose(fp_top1);
strup(TopuserSortField);
strlow(TopuserSortOrder);
***************
*** 159,165 ****
if(strcmp(TopuserSortOrder,"normal") == 0)
order[0]='\0';
! sprintf(csort,"sort -n -T %s %s -k %s -o %s %s", TempDir, order, sfield, top1, top2);
system(csort);
unlink(top2);
--- 160,166 ----
if(strcmp(TopuserSortOrder,"normal") == 0)
order[0]='\0';
! sprintf(csort, SORT" -n -T %s %s -k %s -o %s %s", TempDir, order, sfield, top1, top2);
system(csort);
unlink(top2);
***************
*** 202,215 ****
fputs(html,fp_top3);
fputs("</head>\n",fp_top3);
! if(strlen(FontFace) > 0) {
! sprintf(preg,"<font face=%s>\n",FontFace);
fputs(preg,fp_top3);
- }
-
- sprintf(preg,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(preg,fp_top3);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_top3);
if(strlen(LogoImage) > 0) {
--- 203,211 ----
fputs(html,fp_top3);
fputs("</head>\n",fp_top3);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(preg,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(preg,fp_top3);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_top3);
if(strlen(LogoImage) > 0) {
***************
*** 351,357 ****
if(strstr(ReportType,"date_time") != 0) {
sprintf(ltext110,"%s",text[110]);
! if(ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
--- 347,353 ----
if(strstr(ReportType,"date_time") != 0) {
sprintf(ltext110,"%s",text[110]);
! if(*ltext110){
for(s=ltext110; *s; ++s)
*s=tolower(*s);
}
***************
*** 391,397 ****
sprintf(wwork3,"%s",fixnum(tnelap));
sprintf(val1,"%d",posicao);
! sprintf(val2,"%s%s",href2,ltext110);
sprintf(val3,"%3.2f%%",perc);
sprintf(val4,"%3.2f%%",inperc);
sprintf(val5,"%3.2f%%",ouperc);
--- 387,393 ----
sprintf(wwork3,"%s",fixnum(tnelap));
sprintf(val1,"%d",posicao);
! sprintf(val2,"%s%s</a>",href2,ltext110);
sprintf(val3,"%3.2f%%",perc);
sprintf(val4,"%3.2f%%",inperc);
sprintf(val5,"%3.2f%%",ouperc);
***************
*** 484,489 ****
--- 480,486 ----
final:
fclose(fp_top1);
+ if(strcmp(RemoveTempFiles,"yes") == 0)
unlink(top1);
fclose(fp_top3);
diff -cbr sarg-1.2.2.1-org/totday.c sarg-1.2.2.1/totday.c
*** sarg-1.2.2.1-org/totday.c Thu Jun 13 17:52:46 2002
--- sarg-1.2.2.1/totday.c Tue Oct 8 16:14:00 2002
***************
*** 34,40 ****
sprintf(arqout,"%s/%s.day",dirname,user);
sprintf(sortout,"%s/%s.sort",dirname,user);
! sprintf(csort,"sort -k 1,1 -k 2,2 -o %s %s",sortout,wdirname);
system(csort);
unlink(wdirname);
--- 34,40 ----
sprintf(arqout,"%s/%s.day",dirname,user);
sprintf(sortout,"%s/%s.sort",dirname,user);
! sprintf(csort, SORT" -k 1,1 -k 2,2 -o %s %s",sortout,wdirname);
system(csort);
unlink(wdirname);
diff -cbr sarg-1.2.2.1-org/useragent.c sarg-1.2.2.1/useragent.c
*** sarg-1.2.2.1-org/useragent.c Thu Jun 13 17:52:46 2002
--- sarg-1.2.2.1/useragent.c Fri Oct 11 14:10:36 2002
***************
*** 99,105 ****
debuga(msg);
}
! sprintf(csort,"sort -n -t '\\' -k 4,4 -k 3,3 -k 2,2 -k 1,1 -o %s %s",tmp2,tmp);
system(csort);
unlink(tmp);
--- 99,105 ----
debuga(msg);
}
! sprintf(csort, SORT" -n -t '\\' -k 4,4 -k 3,3 -k 2,2 -k 1,1 -o %s %s",tmp2,tmp);
system(csort);
unlink(tmp);
***************
*** 123,136 ****
fputs(html,fp_ht);
fputs("</head>\n",fp_ht);
! if(strlen(FontFace) > 0) {
! sprintf(html,"<font face=%s>\n",FontFace);
fputs(html,fp_ht);
- }
-
- sprintf(html,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
- fputs(html,fp_ht);
-
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ht);
if(strlen(LogoImage) > 0) {
--- 123,131 ----
fputs(html,fp_ht);
fputs("</head>\n",fp_ht);
! // DAS: Using style=font-family more corresponds to standards.
! sprintf(html,"<body bgcolor=%s text=%s background='%s' style='font-family:%s;'>\n",BgColor,TxColor,BgImage,FontFace);
fputs(html,fp_ht);
fputs("<center><table cellpadding=0 cellspacing=0>\n",fp_ht);
if(strlen(LogoImage) > 0) {
***************
*** 189,195 ****
fclose(fp_in);
fclose(fp_ou);
! sprintf(csort,"sort -n -t '\\' -k 3,3 -o %s %s",tmp,tmp2);
system(csort);
unlink(tmp2);
--- 184,190 ----
fclose(fp_in);
fclose(fp_ou);
! sprintf(csort, SORT" -n -t '\\' -k 3,3 -o %s %s",tmp,tmp2);
system(csort);
unlink(tmp2);
***************
*** 237,243 ****
unlink(tmp);
! sprintf(csort,"sort -n -r -k 1,1 -o %s %s",tmp,tmp2);
system(csort);
unlink(tmp2);
--- 232,238 ----
unlink(tmp);
! sprintf(csort, SORT" -n -r -k 1,1 -o %s %s",tmp,tmp2);
system(csort);
unlink(tmp2);
diff -cbr sarg-1.2.2.1-org/util.c sarg-1.2.2.1/util.c
*** sarg-1.2.2.1-org/util.c Thu Jun 13 17:54:36 2002
--- sarg-1.2.2.1/util.c Mon Oct 14 11:01:00 2002
***************
*** 3,8 ****
--- 3,26 ----
static char mtab1[12][4]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
static char mtab2[12][3]={"01","02","03","04","05","06","07","08","09","10","11","12"};
+ char* encode_filename( char* to, const char* from )
+ {
+ int i;
+
+ #if defined(__OS2__)
+ strncpy( to, from, 128 );
+ to[128] = 0;
+ #else
+ strcpy ( to, from );
+ #endif
+
+ for( i=0; i<strlen(to); i++ )
+ if( strchr( "-.:/?*|><\"\\", to[i] ))
+ to[i]='_';
+
+ return to;
+ }
+
void getword(char *word, char *line, int stop)
{
int x = 0,y;
***************
*** 130,141 ****
char warea[50];
char dia[3];
! char mes[3];
char ano[5];
int x;
warea[0]='\0';
strncpy(dia,duntil+6,2);
dia[2]='\0';
strncpy(mes,duntil+4,2);
--- 148,160 ----
char warea[50];
char dia[3];
! char mes[4]; // DAS: 3 characters + '\0'
char ano[5];
int x;
warea[0]='\0';
+ // DAS: allways YYYYMMDD after date_from()
strncpy(dia,duntil+6,2);
dia[2]='\0';
strncpy(mes,duntil+4,2);
***************
*** 407,415 ****
char wdir[MAXLEN];
char per2[MAXLEN];
if(strcmp(OverwriteReport,"no") == 0) {
while(num) {
! if(access(dirname,R_OK) == 0) {
sprintf(dirname,"%s.%d",dir,num);
sprintf(per2,"%s.%d",per1,num);
num++;
--- 426,439 ----
char wdir[MAXLEN];
char per2[MAXLEN];
+ #if defined(__OS2__)
+ FILE* fh;
+ time_t local_time;
+ #endif
+
if(strcmp(OverwriteReport,"no") == 0) {
while(num) {
! if(access(dirname,F_OK) == 0) {
sprintf(dirname,"%s.%d",dir,num);
sprintf(per2,"%s.%d",per1,num);
num++;
***************
*** 424,436 ****
rename(dir,dirname);
}
} else {
! if(access(dir,R_OK) == 0) {
! sprintf(wdir,"rm -r %s",dir);
system(wdir);
}
}
! sprintf(wdir,"mkdir -p %s",dir);
if(strlen(us) > 0) {
strcat(wdir,"-");
strcat(wdir,us);
--- 448,460 ----
rename(dir,dirname);
}
} else {
! if(access(dir,F_OK) == 0) {
! sprintf(wdir, RM" -r %s",dir);
system(wdir);
}
}
! sprintf(wdir, MKDIR" -p %s",dir);
if(strlen(us) > 0) {
strcat(wdir,"-");
strcat(wdir,us);
***************
*** 446,455 ****
system(wdir);
! sprintf(dirname,"%s",wdir+9);
sprintf(wdir,"date >%s/%s",dirname,"date");
system(wdir);
return;
--- 470,487 ----
system(wdir);
! sprintf(dirname,"%s",wdir+sizeof(MKDIR)+3);
+ #if defined(__OS2__)
+ sprintf( wdir,"%s/%s", dirname, "date" );
+ fh = fopen( wdir, "w" );
+ time( &local_time );
+ fprintf( fh, "%s\n", asctime( localtime( &local_time )));
+ fclose( fh );
+ #else
sprintf(wdir,"date >%s/%s",dirname,"date");
system(wdir);
+ #endif
return;