diff options
| author | nectar <nectar@FreeBSD.org> | 2003-05-01 19:03:14 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-05-01 19:03:14 +0000 |
| commit | 0b64e1476ba01c6ba095af7d0623e93362281a12 (patch) | |
| tree | 736595316c161b3d1ae559f331feaa6ba12b500e /lib/libc/locale/setlocale.c | |
| parent | 5ce8f7673e9083fdec888025823478cd3faf1ed7 (diff) | |
| download | FreeBSD-src-0b64e1476ba01c6ba095af7d0623e93362281a12.zip FreeBSD-src-0b64e1476ba01c6ba095af7d0623e93362281a12.tar.gz | |
Back out the `hiding' of strlcpy and strlcat. Several people
vocally objected to this safety belt.
Diffstat (limited to 'lib/libc/locale/setlocale.c')
| -rw-r--r-- | lib/libc/locale/setlocale.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index ca550ae..525ca8f 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -41,7 +41,6 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "namespace.h" #include <sys/types.h> #include <sys/stat.h> #include <errno.h> @@ -51,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "un-namespace.h" #include "collate.h" #include "lmonetary.h" /* for __monetary_load_locale() */ #include "lnumeric.h" /* for __numeric_load_locale() */ @@ -182,7 +180,7 @@ setlocale(category, locale) errno = EINVAL; return (NULL); } - (void)_strlcpy(new_categories[i], locale, + (void)strlcpy(new_categories[i], locale, len + 1); i++; locale = r; |
