From dc135ad13676943ab8a08acbf92a838caa298702 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 24 Mar 2003 10:11:20 +0000 Subject: Merger from rtems-4-6-branch. --- c/src/libnetworking/ChangeLog | 4 ++++ c/src/libnetworking/pppd/utils.c | 39 --------------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) (limited to 'c/src') diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index 1dbdd0bdfa..dbb17fcbd9 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,7 @@ +2003-03-18 Ralf Corsepius + + * pppd/utils.c: Remove strlcpy, strlcat. + 2003-03-06 Ralf Corsepius * configure.ac: Remove AC_CONFIG_AUX_DIR. diff --git a/c/src/libnetworking/pppd/utils.c b/c/src/libnetworking/pppd/utils.c index b4f0e39ab2..0ac24a4a1f 100644 --- a/c/src/libnetworking/pppd/utils.c +++ b/c/src/libnetworking/pppd/utils.c @@ -61,45 +61,6 @@ struct buffer_info { int len; }; -/* - * strlcpy - like strcpy/strncpy, doesn't overflow destination buffer, - * always leaves destination null-terminated (for len > 0). - */ -size_t -strlcpy(dest, src, len) - char *dest; - const char *src; - size_t len; -{ - size_t ret = strlen(src); - - if (len != 0) { - if (ret < len) - strcpy(dest, src); - else { - strncpy(dest, src, len - 1); - dest[len-1] = 0; - } - } - return ret; -} - -/* - * strlcat - like strcat/strncat, doesn't overflow destination buffer, - * always leaves destination null-terminated (for len > 0). - */ -size_t -strlcat(dest, src, len) - char *dest; - const char *src; - size_t len; -{ - size_t dlen = strlen(dest); - - return dlen + strlcpy(dest + dlen, src, (len > dlen? len - dlen: 0)); -} - - /* * slprintf - format a message into a buffer. Like sprintf except we * also specify the length of the output buffer, and we handle -- cgit v1.2.3