diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-03-17 03:48:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-17 03:48:46 +0000 |
| commit | 4c2d948abe169b8b26e52dea2de0d495efc2469c (patch) | |
| tree | ac56dabcc0427da85a968fdc7182f1fcb864b782 | |
| parent | c5cb336b8785fc2d0790247aadb5e894958c3645 (diff) | |
Don't use LOCALE_PATH to find binary locale files. Use LOCALEDIR
only.
| -rw-r--r-- | locale/programs/localedef.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index ab14140bb0..d64af771fe 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -261,21 +261,22 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ if (! avail) { - const char *locale_names[] = { "LC_COLLATE", "LC_CTYPE", - "LC_MONETARY", "LC_NUMERIC", - "LC_TIME", "LC_MESSAGES" }; + static const char *locale_names[] = + { "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES" + }; char *fname; int fd; struct stat st; - asprintf (&fname, LOCALE_PATH "/%s/%s", act_add_locdef->name, + asprintf (&fname, LOCALEDIR "/%s/%s", act_add_locdef->name, locale_names[cat]); fd = open (fname, O_RDONLY); if (fd == -1) { free (fname); - asprintf (&fname, LOCALE_PATH "/%s/%s/SYS_%s", + asprintf (&fname, LOCALEDIR "/%s/%s/SYS_%s", act_add_locdef->name, locale_names[cat], locale_names[cat]); |