diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2015-11-27 10:09:45 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2015-11-27 10:22:38 -0500 |
| commit | 90fe682d3067163aa773feecf497ef599429457a (patch) | |
| tree | 112e4c0c097305fc1d82681b15592f0f8456f6ba /locale/programs | |
| parent | 977a30801f61b7bbc27e8f185c1e7eb49675c60c (diff) | |
| download | glibc-90fe682d3067163aa773feecf497ef599429457a.tar glibc-90fe682d3067163aa773feecf497ef599429457a.tar.gz glibc-90fe682d3067163aa773feecf497ef599429457a.tar.bz2 glibc-90fe682d3067163aa773feecf497ef599429457a.zip | |
Rename localedir to complocaledir (bug 14259).
In preparation to fix the --localedir configure argument we must
move the existing conflicting definition of localedir to a more
appropriate name. Given that all current internal uses of localedir
relate to the compiled locales we rename to complocaledir.
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/locale.c | 20 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 6 | ||||
| -rw-r--r-- | locale/programs/locarchive.c | 2 |
3 files changed, 17 insertions, 11 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c index b1de17f0d2..c8995adec2 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -45,7 +45,7 @@ #include "../locarchive.h" #include <programs/xmalloc.h> -#define ARCHIVE_NAME LOCALEDIR "/locale-archive" +#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive" /* If set print the name of the category. */ static int show_category_name; @@ -325,9 +325,11 @@ select_dirs (const struct dirent *dirent) #endif { struct stat64 st; - char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1]; + char buf[sizeof (COMPLOCALEDIR) + + strlen (dirent->d_name) + 1]; - stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name); + stpcpy (stpcpy (stpcpy (buf, COMPLOCALEDIR), "/"), + dirent->d_name); if (stat64 (buf, &st) == 0) mode = st.st_mode; @@ -444,17 +446,21 @@ write_locales (void) first_locale = 0; /* Now we can look for all files in the directory. */ - ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort); + ndirents = scandir (COMPLOCALEDIR, &dirents, select_dirs, + alphasort); for (cnt = 0; cnt < ndirents; ++cnt) { /* Test whether at least the LC_CTYPE data is there. Some directories only contain translations. */ - char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name) - + sizeof "/LC_IDENTIFICATION"]; + char buf[sizeof (COMPLOCALEDIR) + + strlen (dirents[cnt]->d_name) + + sizeof "/LC_IDENTIFICATION"]; char *enddir; struct stat64 st; - stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), + stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, + COMPLOCALEDIR), + "/"), dirents[cnt]->d_name), "/LC_IDENTIFICATION"); diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index c8da20b813..fd6ca516cf 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -457,11 +457,11 @@ construct_output_path (char *path) '/'. */ ssize_t n; if (normal == NULL) - n = asprintf (&result, "%s%s/%s%c", - output_prefix ?: "", LOCALEDIR, path, '\0'); + n = asprintf (&result, "%s%s/%s%c", output_prefix ?: "", + COMPLOCALEDIR, path, '\0'); else n = asprintf (&result, "%s%s/%.*s%s%s%c", - output_prefix ?: "", LOCALEDIR, + output_prefix ?: "", COMPLOCALEDIR, (int) (startp - path), path, normal, endp, '\0'); if (n < 0) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 345f9b70e2..5f91d71f1b 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -57,7 +57,7 @@ extern const char *output_prefix; -#define ARCHIVE_NAME LOCALEDIR "/locale-archive" +#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive" static const char *locnames[] = { |