Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use _citrus_lookup_alias() instead of __unalias().

This commit is contained in:
tshiozak 2004-07-21 14:17:22 +00:00
parent 23affd3c41
commit 8ad8061809
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libc/nls/catopen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: catopen.c,v 1.19 2002/02/13 07:48:49 yamt Exp $ */
/* $NetBSD: catopen.c,v 1.20 2004/07/21 14:17:22 tshiozak Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -52,7 +52,10 @@
#include <string.h>
#include <unistd.h>
#include "../locale/aliasname_local.h"
#include "../citrus/citrus_namespace.h"
#include "../citrus/citrus_region.h"
#include "../citrus/citrus_lookup.h"
#define NLS_ALIAS_DB "/usr/share/nls/nls.alias"
#define NLS_DEFAULT_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L"
@ -76,7 +79,7 @@ _catopen(name, oflag)
const char *u;
nl_catd catd;
char langbuf[PATH_MAX];
if (name == NULL || *name == '\0')
return (nl_catd)-1;
@ -95,10 +98,11 @@ _catopen(name, oflag)
if (lang == NULL || strchr(lang, '/'))
lang = NLS_DEFAULT_LANG;
lang = __unaliasname(NLS_ALIAS_DB, lang, langbuf, sizeof(langbuf));
lang = _lookup_alias(NLS_ALIAS_DB, lang, langbuf, sizeof(langbuf),
_LOOKUP_CASE_SENSITIVE);
s = nlspath;
t = tmppath;
t = tmppath;
do {
while (*s && *s != ':') {
if (*s == '%') {