diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-27 18:45:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-27 18:45:00 +0000 |
| commit | 4944d5d63f26970c9a65965f907e49d30bf53ca6 (patch) | |
| tree | feed0f263659675bf76f40d3fd1a9dbdfc19a3cd | |
| parent | b4f48b41b478c9344ab81bfb82785b5736e6aafc (diff) | |
| download | glibc-4944d5d63f26970c9a65965f907e49d30bf53ca6.tar.gz glibc-4944d5d63f26970c9a65965f907e49d30bf53ca6.tar.xz glibc-4944d5d63f26970c9a65965f907e49d30bf53ca6.zip | |
Update.
* intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code to determine invalid locale name. * locale/findlocale.c (_nl_find_locale): Likewise.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | intl/dcigettext.c | 4 | ||||
| -rw-r--r-- | locale/findlocale.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 459e97f0a7..6d1e156fba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-08-27 Ulrich Drepper <drepper@redhat.com> + * intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code + to determine invalid locale name. + * locale/findlocale.c (_nl_find_locale): Likewise. + * posix/annexc.c: Correct test for unavailable feature. * sysdeps/unix/sysv/linux/i386/sys/io.h (outw): Fix __INLINE -> diff --git a/intl/dcigettext.c b/intl/dcigettext.c index c69bb19bc8..864b787cea 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -525,9 +525,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) /* When this is a SUID binary we must not allow accessing files outside the dedicated directories. */ if (ENABLE_SECURE - && (memchr (single_locale, '/', - _nl_find_language (single_locale) - single_locale) - != NULL)) + && memchr (single_locale, '/', single_locale) != NULL) /* Ingore this entry. */ continue; } diff --git a/locale/findlocale.c b/locale/findlocale.c index 275f7fc72e..c6adba84fa 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -67,7 +67,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, if (*name == NULL || (*name)[0] == '\0' || (__builtin_expect (__libc_enable_secure, 0) - && memchr (*name, '/', _nl_find_language (*name) - *name) != NULL)) + && memchr (*name, '/', *name) != NULL)) *name = (char *) _nl_C_name; if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0 |