d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize wrapper around setrunelocale() to mark it as deprecated

Browse Source 
in FreeBSD 6
This commit is contained in:
ache 2003-07-06 02:03:37 +00:00
parent 246ff0a3e7
commit 92006f3cfc
3 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libc/locale/setlocale.c
View File

@ -98,7 +98,6 @@ static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)];
static char *currentlocale(void);
static int wrap_setrunelocale(const char *);
static char *loadlocale(int);
char *
@ -243,18 +242,6 @@ currentlocale()
return (current_locale_string);
}
static int
wrap_setrunelocale(const char *locale)
{
int ret = setrunelocale((char *)locale);
if (ret != 0) {
errno = ret;
return (_LDP_ERROR);
}
return (_LDP_LOADED);
}
static char *
loadlocale(category)
int category;
@ -279,7 +266,7 @@ loadlocale(category)
switch (category) {
case LC_CTYPE:
func = wrap_setrunelocale;
func = __wrap_setrunelocale;
break;
case LC_COLLATE:
func = __collate_load_tables;

1
lib/libc/locale/setlocale.h
View File

@ -35,5 +35,6 @@
extern char *_PathLocale;
int __detect_path_locale(void);
int __wrap_setrunelocale(const char *);
#endif /* !_SETLOCALE_H_ */

50
lib/libc/locale/setrunelocale.c
View File

@ -34,6 +34,9 @@
* SUCH DAMAGE.
*/
/* setrunelocale() is obsolete in FreeBSD 6 -- use ANSI functions instead. */
#define OBSOLETE_IN_6
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -44,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "ldpart.h"
#include "setlocale.h"
extern int _none_init(_RuneLocale *);
@ -55,8 +59,30 @@ extern int _BIG5_init(_RuneLocale *);
extern int _MSKanji_init(_RuneLocale *);
extern _RuneLocale *_Read_RuneMagi(FILE *);
static int __setrunelocale(char *);
__warn_references(setrunelocale, "warning: setrunelocale() is deprecated. See setrunelocale(3).");
int
setrunelocale(char *encoding)
{
int ret;
if (!encoding || !*encoding || strlen(encoding) > ENCODING_LEN ||
(encoding[0] == '.' &&
(encoding[1] == '\0' ||
(encoding[1] == '.' && encoding[2] == '\0'))) ||
strchr(encoding, '/') != NULL)
return (EINVAL);
ret = __detect_path_locale();
if (ret != 0)
return (ret);
return (__setrunelocale(encoding));
}
static int
__setrunelocale(char *encoding)
{
FILE *fp;
char name[PATH_MAX];
@ -66,13 +92,6 @@ setrunelocale(char *encoding)
static _RuneLocale *CachedRuneLocale;
static int Cached__mb_cur_max;
if (!encoding || !*encoding || strlen(encoding) > ENCODING_LEN ||
(encoding[0] == '.' &&
(encoding[1] == '\0' ||
(encoding[1] == '.' && encoding[2] == '\0'))) ||
strchr(encoding, '/') != NULL)
return (EINVAL);
/*
* The "C" and "POSIX" locale are always here.
*/
@ -95,11 +114,8 @@ setrunelocale(char *encoding)
/*
* Slurp the locale file into the cache.
*/
ret = __detect_path_locale();
if (ret != 0)
return (ret);
/* Range checking not needed, encoding length already checked above */
/* Range checking not needed, encoding length already checked before */
(void) strcpy(name, _PathLocale);
(void) strcat(name, "/");
(void) strcat(name, encoding);
@ -147,3 +163,15 @@ setrunelocale(char *encoding)
return (ret);
}
int
__wrap_setrunelocale(const char *locale)
{
int ret = __setrunelocale((char *)locale);
if (ret != 0) {
errno = ret;
return (_LDP_ERROR);
}
return (_LDP_LOADED);
}