diff options
| author |   Robert Drehmel <robert@FreeBSD.org> | 2004-06-17 14:07:16 +0000 |
|---|---|---|
| committer | Robert Drehmel <robert@FreeBSD.org> | 2004-06-17 14:07:16 +0000 |
| commit | df82b24d7d5b134d337a91ab51f1685fbfec9dff (patch) | |
| tree | 935d48efa9caf1769f96fe9e7f4f9e34f2d04646 /pw/pw_vpw.c | |
| parent | a46da33ae2cb86b8485b859a9ca1e80b436194c0 (diff) | |
| download | pw-darwin-df82b24d7d5b134d337a91ab51f1685fbfec9dff.tar.gz pw-darwin-df82b24d7d5b134d337a91ab51f1685fbfec9dff.tar.zst pw-darwin-df82b24d7d5b134d337a91ab51f1685fbfec9dff.zip | |
Use strlcpy(3) to replace the idiomatic
strncpy(d, s, l);
d[l - 1] = '\0';
statements.
Diffstat (limited to 'pw/pw_vpw.c')
| -rw-r--r-- | pw/pw_vpw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c index bc5713e..473cbb6 100644 --- a/pw/pw_vpw.c +++ b/pw/pw_vpw.c @@ -60,8 +60,7 @@ vnextpwent(char const * nam, uid_t uid, int doclose) struct passwd * pw = NULL; static char pwtmp[1024]; - strncpy(pwtmp, getpwpath(_MASTERPASSWD), sizeof pwtmp); - pwtmp[sizeof pwtmp - 1] = '\0'; + strlcpy(pwtmp, getpwpath(_MASTERPASSWD), sizeof(pwtmp)); if (pwd_fp != NULL || (pwd_fp = fopen(pwtmp, "r")) != NULL) { int done = 0; @@ -210,8 +209,7 @@ vnextgrent(char const * nam, gid_t gid, int doclose) static int memlen = 0; extendline(&grtmp, &grlen, MAXPATHLEN); - strncpy(grtmp, getgrpath(_GROUP), MAXPATHLEN); - grtmp[MAXPATHLEN - 1] = '\0'; + strlcpy(grtmp, getgrpath(_GROUP), MAXPATHLEN); if (grp_fp != NULL || (grp_fp = fopen(grtmp, "r")) != NULL) { int done = 0; |