diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/libnetworking/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/libnetworking/pppd/utils.c | 39 | ||||
-rw-r--r-- | cpukit/pppd/utils.c | 39 |
3 files changed, 4 insertions, 78 deletions
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 <corsepiu@faw.uni-ulm.de> + + * pppd/utils.c: Remove strlcpy, strlcat. + 2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * 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 @@ -62,45 +62,6 @@ struct buffer_info { }; /* - * 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 * %r (recursive format), %m (error message), %v (visible string), diff --git a/cpukit/pppd/utils.c b/cpukit/pppd/utils.c index b4f0e39ab2..0ac24a4a1f 100644 --- a/cpukit/pppd/utils.c +++ b/cpukit/pppd/utils.c @@ -62,45 +62,6 @@ struct buffer_info { }; /* - * 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 * %r (recursive format), %m (error message), %v (visible string), |