diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/Makefile | 11 | ||||
| -rw-r--r-- | locale/findlocale.c | 30 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 32 | ||||
| -rw-r--r-- | locale/setlocale.c | 3 |
4 files changed, 39 insertions, 37 deletions
diff --git a/locale/Makefile b/locale/Makefile index cedcd7043c..dd29c35019 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -12,9 +12,9 @@ # Library General Public License for more details. # You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Makefile for locales. @@ -64,7 +64,10 @@ $(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o) $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o) $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o) -CPPFLAGS := -DLOCALE_PATH='"$(localedir)"' \ +localepath = "$(localeddir)" + +CPPFLAGS := -DLOCALE_PATH='$(localepath)' \ + -DLOCALEDIR='"$(localedir)"' \ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \ -Iprograms $(CPPFLAGS) diff --git a/locale/findlocale.c b/locale/findlocale.c index 2bcc11193f..d73ba4a395 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -1,21 +1,21 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <locale.h> #include <stdlib.h> @@ -99,7 +99,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, and six parts for the CEN syntax: - language[_territory][+audience][+special][,sponsor][_revision] + language[_territory][+audience][+special][,[sponsor][_revision]] Beside the first all of them are allowed to be missing. If the full specified locale is not found, the less specific one are diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 1db26e5427..997126b625 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -1,21 +1,21 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -463,9 +463,9 @@ construct_output_path (char *path) the end of the function we need another byte for the trailing '/'. */ if (normal == NULL) - asprintf (&result, "%s/%s%c", LOCALE_PATH, path, '\0'); + asprintf (&result, "%s/%s%c", LOCALEDIR, path, '\0'); else - asprintf (&result, "%s/%.*s%s%s%c", LOCALE_PATH, startp - path, path, + asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR, startp - path, path, normal, endp, '\0'); } else diff --git a/locale/setlocale.c b/locale/setlocale.c index ceec1a69a6..094664216e 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -255,8 +255,7 @@ setlocale (int category, const char *locale) &locale_path, &locale_path_len) != 0) return NULL; - if (__argz_append (&locale_path, &locale_path_len, - LOCALE_PATH, sizeof (LOCALE_PATH)) != 0) + if (__argz_add_sep (&locale_path, &locale_path_len, LOCALE_PATH, ':') != 0) return NULL; if (category == LC_ALL) |