kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ctype fixes

Browse source
This commit is contained in:
Andrey A. Chernov 2000-10-14 13:47:12 +00:00
parent ff839adaab
commit 53085b307f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=33822
8 changed files with 292 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
www/webalizer-2/files/patch-aa Normal file
View file

@ -0,0 +1,17 @@
--- linklist.c.bak Fri Sep 29 07:51:02 2000
+++ linklist.c Sat Oct 14 17:22:16 2000
@@ -197,12 +197,12 @@
strncpy(temp_buf,str,79);
temp_buf[79]=0;
- while (!isspace((int)*name)&&*name!=0) name++;
+ while (!isspace((unsigned char)*name)&&*name!=0) name++;
if (*name==0) name=temp_buf;
else
{
*name++=0;
- while (isspace((int)*name)&&*name!=0) name++;
+ while (isspace((unsigned char)*name)&&*name!=0) name++;
if (*name==0) name=temp_buf;
}

65
www/webalizer-2/files/patch-ab Normal file
View file

@ -0,0 +1,65 @@
--- preserve.c.bak Fri Sep 29 07:51:32 2000
+++ preserve.c Sat Oct 14 17:34:03 2000
@@ -492,7 +492,7 @@
tmp_buf[strlen(tmp_buf)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 10; /* error exit */
- if (!isdigit((int)buffer[0])) return 10; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 10; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -523,7 +523,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 8; /* error exit */
- if (!isdigit((int)buffer[0])) return 8; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 8; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -563,7 +563,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 9; /* error exit */
- if (!isdigit((int)buffer[0])) return 9; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 9; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -602,7 +602,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 11; /* error exit */
- if (!isdigit((int)buffer[0])) return 11; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 11; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu",&t_rnode.flag,&t_rnode.count);
@@ -627,7 +627,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 12; /* error exit */
- if (!isdigit((int)buffer[0])) return 12; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 12; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu",&t_anode.flag,&t_anode.count);
@@ -652,7 +652,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 13; /* error exit */
- if (!isdigit((int)buffer[0])) return 13; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 13; /* error exit */
/* load temporary node data */
sscanf(buffer,"%lu",&t_snode.count);
@@ -677,7 +677,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 14; /* error exit */
- if (!isdigit((int)buffer[0])) return 14; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 14; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",

53
www/webalizer-2/files/patch-ac
View file

@ -1,5 +1,47 @@
--- webalizer.c.orig Fri Oct 6 11:59:08 2000
+++ webalizer.c Sun Oct 8 00:16:19 2000
+++ webalizer.c Sat Oct 14 17:17:29 2000
@@ -569,7 +569,7 @@
/* convert month name to lowercase */
for (i=4;i<7;i++)
- log_rec.datetime[i]=tolower(log_rec.datetime[i]);
+ log_rec.datetime[i]=tolower((unsigned char)log_rec.datetime[i]);
/* get year/month/day/hour/min/sec values */
for (i=0;i<12;i++)
@@ -1459,19 +1459,19 @@
while ( (fgets(buffer,BUFSIZE,fp)) != NULL)
{
/* skip comments and blank lines */
- if ( (buffer[0]=='#') || isspace((int)buffer[0]) ) continue;
+ if ( (buffer[0]=='#') || isspace((unsigned char)buffer[0]) ) continue;
/* Get keyword */
cp1=buffer;cp2=keyword;
- while ( isalnum((int)*cp1) ) *cp2++ = *cp1++;
+ while ( isalnum((unsigned char)*cp1) ) *cp2++ = *cp1++;
*cp2='\0';
/* Get value */
cp2=value;
- while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((int)*cp1)) ) cp1++;
+ while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((unsigned char)*cp1)) ) cp1++;
while ( (*cp1!='\n')&&(*cp1!='\0') ) *cp2++ = *cp1++;
*cp2--='\0';
- while ( (isspace((int)*cp2)) && (cp2 != value) ) *cp2--='\0';
+ while ( (isspace((unsigned char)*cp2)) && (cp2 != value) ) *cp2--='\0';
/* check if blank keyword/value */
if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue;
@@ -1720,7 +1720,7 @@
int isurlchar(char ch)
{
- if (isalnum((int)ch)) return 1; /* allow letters, numbers... */
+ if (isalnum((unsigned char)ch)) return 1; /* allow letters, numbers... */
return (strchr(":/\\.,' *-+_@~()[]",ch)!=NULL); /* and a few special ones */
}
@@ -1813,7 +1813,7 @@
if (*cp1=='+') *cp1=' '; /* change + to space */
if (sp_flg && *cp1==' ') { cp1++; continue; } /* compress spaces */
@ -9,3 +51,12 @@
cp1++;
}
}
@@ -1848,7 +1848,7 @@
int i=group_domains+1;
cp = str+strlen(str)-1;
- if (isdigit((int)*cp)) return NULL; /* ignore IP addresses */
+ if (isdigit((unsigned char)*cp)) return NULL; /* ignore IP addresses */
while (cp!=str)
{

15
www/webalizer-2/files/patch-ad
View file

@ -1,6 +1,6 @@
--- output.c.orig Sun Mar 19 02:37:06 2000
+++ output.c Sun Sep 24 14:28:15 2000
@@ -1447,10 +1447,17 @@
--- output.c.orig Fri Sep 29 07:51:42 2000
+++ output.c Sat Oct 14 17:18:55 2000
@@ -1450,10 +1450,17 @@
rptr=*pointer++;
if (rptr->flag == OBJ_REG)
{
@ -22,3 +22,12 @@
r_reg--;
}
}
@@ -1932,7 +1939,7 @@
{
domain = hptr->string+strlen(hptr->string)-1;
while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
- if ((domain==hptr->string)||(isdigit((int)*++domain)))
+ if ((domain==hptr->string)||(isdigit((unsigned char)*++domain)))
{
ctry[0].count+=hptr->count;
ctry[0].files+=hptr->files;

17
www/webalizer/files/patch-aa Normal file
View file

@ -0,0 +1,17 @@
--- linklist.c.bak Fri Sep 29 07:51:02 2000
+++ linklist.c Sat Oct 14 17:22:16 2000
@@ -197,12 +197,12 @@
strncpy(temp_buf,str,79);
temp_buf[79]=0;
- while (!isspace((int)*name)&&*name!=0) name++;
+ while (!isspace((unsigned char)*name)&&*name!=0) name++;
if (*name==0) name=temp_buf;
else
{
*name++=0;
- while (isspace((int)*name)&&*name!=0) name++;
+ while (isspace((unsigned char)*name)&&*name!=0) name++;
if (*name==0) name=temp_buf;
}

65
www/webalizer/files/patch-ab Normal file
View file

@ -0,0 +1,65 @@
--- preserve.c.bak Fri Sep 29 07:51:32 2000
+++ preserve.c Sat Oct 14 17:34:03 2000
@@ -492,7 +492,7 @@
tmp_buf[strlen(tmp_buf)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 10; /* error exit */
- if (!isdigit((int)buffer[0])) return 10; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 10; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -523,7 +523,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 8; /* error exit */
- if (!isdigit((int)buffer[0])) return 8; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 8; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -563,7 +563,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 9; /* error exit */
- if (!isdigit((int)buffer[0])) return 9; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 9; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",
@@ -602,7 +602,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 11; /* error exit */
- if (!isdigit((int)buffer[0])) return 11; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 11; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu",&t_rnode.flag,&t_rnode.count);
@@ -627,7 +627,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 12; /* error exit */
- if (!isdigit((int)buffer[0])) return 12; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 12; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu",&t_anode.flag,&t_anode.count);
@@ -652,7 +652,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 13; /* error exit */
- if (!isdigit((int)buffer[0])) return 13; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 13; /* error exit */
/* load temporary node data */
sscanf(buffer,"%lu",&t_snode.count);
@@ -677,7 +677,7 @@
tmp_buf[strlen(buffer)-1]=0;
if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 14; /* error exit */
- if (!isdigit((int)buffer[0])) return 14; /* error exit */
+ if (!isdigit((unsigned char)buffer[0])) return 14; /* error exit */
/* load temporary node data */
sscanf(buffer,"%d %lu %lu %lf %lu %lu",

53
www/webalizer/files/patch-ac
View file

@ -1,5 +1,47 @@
--- webalizer.c.orig Fri Oct 6 11:59:08 2000
+++ webalizer.c Sun Oct 8 00:16:19 2000
+++ webalizer.c Sat Oct 14 17:17:29 2000
@@ -569,7 +569,7 @@
/* convert month name to lowercase */
for (i=4;i<7;i++)
- log_rec.datetime[i]=tolower(log_rec.datetime[i]);
+ log_rec.datetime[i]=tolower((unsigned char)log_rec.datetime[i]);
/* get year/month/day/hour/min/sec values */
for (i=0;i<12;i++)
@@ -1459,19 +1459,19 @@
while ( (fgets(buffer,BUFSIZE,fp)) != NULL)
{
/* skip comments and blank lines */
- if ( (buffer[0]=='#') || isspace((int)buffer[0]) ) continue;
+ if ( (buffer[0]=='#') || isspace((unsigned char)buffer[0]) ) continue;
/* Get keyword */
cp1=buffer;cp2=keyword;
- while ( isalnum((int)*cp1) ) *cp2++ = *cp1++;
+ while ( isalnum((unsigned char)*cp1) ) *cp2++ = *cp1++;
*cp2='\0';
/* Get value */
cp2=value;
- while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((int)*cp1)) ) cp1++;
+ while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((unsigned char)*cp1)) ) cp1++;
while ( (*cp1!='\n')&&(*cp1!='\0') ) *cp2++ = *cp1++;
*cp2--='\0';
- while ( (isspace((int)*cp2)) && (cp2 != value) ) *cp2--='\0';
+ while ( (isspace((unsigned char)*cp2)) && (cp2 != value) ) *cp2--='\0';
/* check if blank keyword/value */
if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue;
@@ -1720,7 +1720,7 @@
int isurlchar(char ch)
{
- if (isalnum((int)ch)) return 1; /* allow letters, numbers... */
+ if (isalnum((unsigned char)ch)) return 1; /* allow letters, numbers... */
return (strchr(":/\\.,' *-+_@~()[]",ch)!=NULL); /* and a few special ones */
}
@@ -1813,7 +1813,7 @@
if (*cp1=='+') *cp1=' '; /* change + to space */
if (sp_flg && *cp1==' ') { cp1++; continue; } /* compress spaces */
@ -9,3 +51,12 @@
cp1++;
}
}
@@ -1848,7 +1848,7 @@
int i=group_domains+1;
cp = str+strlen(str)-1;
- if (isdigit((int)*cp)) return NULL; /* ignore IP addresses */
+ if (isdigit((unsigned char)*cp)) return NULL; /* ignore IP addresses */
while (cp!=str)
{

15
www/webalizer/files/patch-ad
View file

@ -1,6 +1,6 @@
--- output.c.orig Sun Mar 19 02:37:06 2000
+++ output.c Sun Sep 24 14:28:15 2000
@@ -1447,10 +1447,17 @@
--- output.c.orig Fri Sep 29 07:51:42 2000
+++ output.c Sat Oct 14 17:18:55 2000
@@ -1450,10 +1450,17 @@
rptr=*pointer++;
if (rptr->flag == OBJ_REG)
{
@ -22,3 +22,12 @@
r_reg--;
}
}
@@ -1932,7 +1939,7 @@
{
domain = hptr->string+strlen(hptr->string)-1;
while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
- if ((domain==hptr->string)||(isdigit((int)*++domain)))
+ if ((domain==hptr->string)||(isdigit((unsigned char)*++domain)))
{
ctry[0].count+=hptr->count;
ctry[0].files+=hptr->files;