2003-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* pppd/utils.c: Remove strlcpy, strlcat.
This commit is contained in:
Ralf Corsepius
2003-03-19 00:51:54 +00:00
parent 8114f30144
commit ccb739c6b3
2 changed files with 4 additions and 39 deletions

View File

@@ -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> 2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR. * configure.ac: Remove AC_CONFIG_AUX_DIR.

View File

@@ -61,45 +61,6 @@ struct buffer_info {
int len; 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 * slprintf - format a message into a buffer. Like sprintf except we
* also specify the length of the output buffer, and we handle * also specify the length of the output buffer, and we handle