From a23ed3f1ad8ccb2b1d72b9b5ffc4e7bcf362bbb6 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sun, 15 Dec 2019 08:23:38 +0000 Subject: [PATCH] MFC r355222, r355260: r355222: Use strlcat(). r355260: Simplify code with strlcpy/strlcat. --- libexec/getty/main.c | 5 ++--- libexec/getty/subr.c | 6 ++---- sbin/ipfw/dummynet.c | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 78b352d1188..743a0508c56 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -97,7 +97,6 @@ static int crmod, digit, lower, upper; char hostname[MAXHOSTNAMELEN]; static char name[MAXLOGNAME*3]; -static char dev[] = _PATH_DEV; static char ttyn[32]; #define OBUFSIZ 128 @@ -218,8 +217,8 @@ main(int argc, char *argv[]) if (argc <= 2 || strcmp(argv[2], "-") == 0) strcpy(ttyn, ttyname(STDIN_FILENO)); else { - strcpy(ttyn, dev); - strncat(ttyn, argv[2], sizeof(ttyn)-sizeof(dev)); + strcpy(ttyn, _PATH_DEV); + strlcat(ttyn, argv[2], sizeof(ttyn)); if (strcmp(argv[0], "+") != 0) { chown(ttyn, 0, 0); chmod(ttyn, 0600); diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 7f8c996969d..9958d193aa6 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -89,10 +89,8 @@ gettable(const char *name, char *buf) l = 2; else l = strlen(sp->value) + 1; - if ((p = malloc(l)) != NULL) { - strncpy(p, sp->value, l); - p[l-1] = '\0'; - } + if ((p = malloc(l)) != NULL) + strlcpy(p, sp->value, l); /* * replace, even if NULL, else we'll * have problems with free()ing static mem diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c index 6be21cfb230..6369c0a17b5 100644 --- a/sbin/ipfw/dummynet.c +++ b/sbin/ipfw/dummynet.c @@ -497,7 +497,7 @@ print_flowset_parms(struct dn_fs *fs, char *prefix) fs->max_th, 1.0 * fs->max_p / (double)(1 << SCALE_RED)); if (fs->flags & DN_IS_ECN) - strncat(red, " (ecn)", 6); + strlcat(red, " (ecn)", sizeof(red)); #ifdef NEW_AQM /* get AQM parameters */ } else if (fs->flags & DN_IS_AQM) { -- 2.45.0