diff options
| author | groo <groo@NetBSD.org> | 2002-04-16 19:08:43 +0000 |
|---|---|---|
| committer | groo <groo@NetBSD.org> | 2002-04-16 19:08:43 +0000 |
| commit | 50d2b6a96fa35c629befded52c8008c830ad021a (patch) | |
| tree | 6375244fa972355413dc9256e1e94ce7d382c0e2 | |
| parent | f74c26e49bff194c9959ba88541b431156ba7842 (diff) | |
botched strncpy -> strlcpy
from xs@kittenz.org
| -rw-r--r-- | lib/libc/gen/getcwd.c | 6 | ||||
| -rw-r--r-- | lib/libc/gen/getpwent.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c index 857013ec410..7e430d598a5 100644 --- a/lib/libc/gen/getcwd.c +++ b/lib/libc/gen/getcwd.c @@ -1,4 +1,4 @@ -/* $NetBSD: getcwd.c,v 1.24 2000/01/22 22:19:10 mycroft Exp $ */ +/* $NetBSD: getcwd.c,v 1.25 2002/04/16 19:08:43 groo Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1995 @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #else -__RCSID("$NetBSD: getcwd.c,v 1.24 2000/01/22 22:19:10 mycroft Exp $"); +__RCSID("$NetBSD: getcwd.c,v 1.25 2002/04/16 19:08:43 groo Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -151,7 +151,7 @@ loop: * Save the last component name and get the full pathname of * the current directory. */ - (void)strncpy(wbuf, p, (sizeof(wbuf) - 1)); + (void)strlcpy(wbuf, p, sizeof(wbuf)); /* * Call the inernal internal version of getcwd which diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 8e7a9b1127b..5cf1e4cf816 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -1,4 +1,4 @@ -/* $NetBSD: getpwent.c,v 1.49 2002/02/12 18:58:04 mycroft Exp $ */ +/* $NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $ */ /* * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95"; #else -__RCSID("$NetBSD: getpwent.c,v 1.49 2002/02/12 18:58:04 mycroft Exp $"); +__RCSID("$NetBSD: getpwent.c,v 1.50 2002/04/16 19:10:07 groo Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -376,9 +376,8 @@ __pwparse(pw, s) if (yp_match(__ypdomain, "passwd.adjunct.byname", pw->pw_name, (int)strlen(pw->pw_name), &data, &datalen) == 0) { - if (datalen > sizeof(adjunctpw) - 1) - datalen = sizeof(adjunctpw) - 1; - strncpy(adjunctpw, data, (size_t)datalen); + strlcpy(adjunctpw, data, MIN((size_t)datalen, + sizeof(adjunctpw))); /* skip name to get password */ if ((bp = strsep(&data, ":")) != NULL && |
