6ba8133cdd
detailed http 404 error reports. Webalizer author hinted me at this, he does not intend to update. danh@ is ok with the maintainer change. ok stehn, okan.
42 lines
1.4 KiB
Plaintext
42 lines
1.4 KiB
Plaintext
$OpenBSD: patch-linklist_c,v 1.2 2008/01/30 20:06:48 mbalmer Exp $
|
|
--- linklist.c.orig Tue Jan 2 14:20:19 2007
|
|
+++ linklist.c Wed Jan 30 13:41:00 2008
|
|
@@ -38,6 +38,7 @@
|
|
#include <ctype.h>
|
|
#include <sys/utsname.h>
|
|
#include <sys/times.h>
|
|
+#include <sys/socket.h>
|
|
|
|
/* ensure getopt */
|
|
#ifdef HAVE_GETOPT_H
|
|
@@ -118,7 +119,7 @@ NLISTPTR new_nlist(char *str)
|
|
fprintf(stderr,"[new_nlist] %s\n",msg_big_one);
|
|
}
|
|
if (( newptr = malloc(sizeof(struct nlist))) != NULL)
|
|
- {strncpy(newptr->string, str, sizeof(newptr->string));newptr->next=NULL;}
|
|
+ {strlcpy(newptr->string, str, sizeof(newptr->string));newptr->next=NULL;}
|
|
return newptr;
|
|
}
|
|
|
|
@@ -176,8 +177,8 @@ GLISTPTR new_glist(char *str, char *name)
|
|
}
|
|
if (( newptr = malloc(sizeof(struct glist))) != NULL)
|
|
{
|
|
- strncpy(newptr->string, str, sizeof(newptr->string));
|
|
- strncpy(newptr->name, name, sizeof(newptr->name));
|
|
+ strlcpy(newptr->string, str, sizeof(newptr->string));
|
|
+ strlcpy(newptr->name, name, sizeof(newptr->name));
|
|
newptr->next=NULL;
|
|
}
|
|
return newptr;
|
|
@@ -194,8 +195,7 @@ int add_glist(char *str, GLISTPTR *list)
|
|
char *name=temp_buf;
|
|
|
|
/* make local copy of string */
|
|
- strncpy(temp_buf,str,255);
|
|
- temp_buf[255]=0;
|
|
+ strlcpy(temp_buf,str,sizeof temp_buf);
|
|
|
|
while (!isspace((int)*name)&&*name!=0) name++;
|
|
if (*name==0) name=temp_buf;
|