aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--locale/locale.h2
-rw-r--r--locale/programs/locale.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35af1c9549..66a3510c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-11-18 Ulrich Drepper <drepper@cygnus.com>
+
+ * locale/programs/locale.c: Don't handle LC_ALL together with the
+ other categories when printing the value.
+ Patch by Akira YOSHIYAMA <yosshy@tkf.att.ne.jp>.
+
+ * locale/locale.h: Correct comment about LC_ALL.
+
1999-11-17 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-ctype.c (ctype_output): Correct computation of
diff --git a/locale/locale.h b/locale/locale.h
index 628a9c6dd5..8942d28cad 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -31,7 +31,7 @@
__BEGIN_DECLS
/* These are the possibilities for the first argument to setlocale.
- The code assumes that LC_ALL is the highest value, and zero the lowest. */
+ The code assumes that the lowest LC_* symbol has the value zero. */
#define LC_CTYPE 0
#define LC_NUMERIC 1
#define LC_TIME 2
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 775500e44f..36f253aebc 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -547,7 +547,8 @@ show_locale_vars (void)
/* Now all categories in an unspecified order. */
for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
- get_source (category[cat_no].name);
+ if (cat_no != LC_ALL)
+ get_source (category[cat_no].name);
/* The last is the LC_ALL value. */
printf ("LC_ALL=%s\n", lcall ? : "");