From 5c13cfe080c74471dcc9d87be60078b3d12e50dd Mon Sep 17 00:00:00 2001 From: Xin LI Date: Wed, 19 Nov 2008 00:14:15 +0000 Subject: [PATCH] Use strlcpy() where appropriate. --- usr.bin/killall/killall.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c index b991b15ad93..8e845726711 100644 --- a/usr.bin/killall/killall.c +++ b/usr.bin/killall/killall.c @@ -64,8 +64,7 @@ upper(const char *str) static char buf[80]; char *s; - strncpy(buf, str, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; + strlcpy(buf, str, sizeof(buf)); for (s = buf; *s; s++) *s = toupper((unsigned char)*s); return buf; @@ -327,8 +326,7 @@ main(int ac, char **av) if ((procs[i].ki_stat & SZOMB) == SZOMB && !zflag) continue; thispid = procs[i].ki_pid; - strncpy(thiscmd, procs[i].ki_comm, MAXCOMLEN); - thiscmd[MAXCOMLEN] = '\0'; + strlcpy(thiscmd, procs[i].ki_comm, sizeof(thiscmd)); thistdev = procs[i].ki_tdev; if (eflag) thisuid = procs[i].ki_uid; /* effective uid */