diff options
author | dim <dim@FreeBSD.org> | 2011-12-17 01:29:46 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2011-12-17 01:29:46 +0000 |
commit | 7654ad989605547d72d8aa3ea016c9e6a1762bb8 (patch) | |
tree | 294029fc441a0427cb9790d2afe188980fe74b5d | |
parent | b10871ad5bc05f5e1d2d18765cd0728ef81badaa (diff) | |
download | FreeBSD-src-7654ad989605547d72d8aa3ea016c9e6a1762bb8.zip FreeBSD-src-7654ad989605547d72d8aa3ea016c9e6a1762bb8.tar.gz |
In sbin/dhclient, since we know the size of the source strings anyway,
we might as well use memcpy; strlcpy is really unnecessary here.
MFC after: 1 week
-rw-r--r-- | sbin/dhclient/clparse.c | 2 | ||||
-rw-r--r-- | sbin/dhclient/parse.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index fea935a..58de8cc 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -895,7 +895,7 @@ parse_string_list(FILE *cfile, struct string_list **lp, int multiple) tmp = new_string_list(valsize); if (tmp == NULL) error("no memory for string list entry."); - strlcpy(tmp->string, val, valsize); + memcpy(tmp->string, val, valsize); tmp->next = NULL; /* Store this medium at the end of the media list. */ diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c index 13e8373..e548bd3 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -129,7 +129,7 @@ parse_string(FILE *cfile) s = malloc(valsize); if (!s) error("no memory for string %s.", val); - strlcpy(s, val, valsize); + memcpy(s, val, valsize); if (!parse_semi(cfile)) return (NULL); @@ -295,7 +295,7 @@ parse_numeric_aggregate(FILE *cfile, unsigned char *buf, int *max, t = malloc(valsize); if (!t) error("no temp space for number."); - strlcpy(t, val, valsize); + memcpy(t, val, valsize); c = cons(t, c); } } while (++count != *max); |