Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use strlcat/strlcpy

This commit is contained in:
itojun 2003-05-17 21:03:21 +00:00
parent ef713a2fe9
commit 0e1bb4cd82
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/systat/netstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netstat.c,v 1.21 2003/02/24 10:10:00 dsl Exp $ */
/* $NetBSD: netstat.c,v 1.22 2003/05/17 21:03:21 itojun Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: netstat.c,v 1.21 2003/02/24 10:10:00 dsl Exp $");
__RCSID("$NetBSD: netstat.c,v 1.22 2003/05/17 21:03:21 itojun Exp $");
#endif /* not lint */
/*
@ -602,9 +602,9 @@ inetname(struct in_addr in)
}
}
if (in.s_addr == INADDR_ANY)
strncpy(line, "*", sizeof(line) - 1);
strlcpy(line, "*", sizeof(line));
else if (cp)
strncpy(line, cp, sizeof(line) - 1);
strlcpy(line, cp, sizeof(line));
else {
in.s_addr = ntohl(in.s_addr);
#define C(x) ((x) & 0xff)
@ -613,7 +613,6 @@ inetname(struct in_addr in)
C(in.s_addr >> 8), C(in.s_addr));
#undef C
}
line[sizeof(line) - 1] = '\0';
return (line);
}

16
usr.bin/systat/ps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ps.c,v 1.23 2003/05/15 01:00:07 itojun Exp $ */
/* $NetBSD: ps.c,v 1.24 2003/05/17 21:03:21 itojun Exp $ */
/*-
* Copyright (c) 1999
@ -45,7 +45,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ps.c,v 1.23 2003/05/15 01:00:07 itojun Exp $");
__RCSID("$NetBSD: ps.c,v 1.24 2003/05/17 21:03:21 itojun Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -273,16 +273,12 @@ comm2str(struct kinfo_proc2 *kp)
argv = kvm_getargv2(kd, kp, 40);
if ((pt = argv) != NULL) {
while (*pt) {
strcat(commstr, *pt);
strlcat(commstr, *pt, sizeof(commstr));
pt++;
strcat(commstr, " ");
}
} else {
commstr[0] = '(';
commstr[1] = '\0';
strncat(commstr, kp->p_comm, sizeof(commstr) - 1);
strcat(commstr, ")");
strlcat(commstr, " ", sizeof(commstr));
}
} else
snprintf(commstr, sizeof(commstr), "(%s)", kp->p_comm);
return commstr;
}