Update.

2004-02-12  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/locale.c (show_locale_vars): Don't print a value
	for LANG if it is not set.

diff --git a/ChangeLog b/ChangeLog
index ceb93bd167feae19f38801360d7d43a7f64c085e..535a8b4750e8dbef4ef3023828037570b616438a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/programs/locale.c (show_locale_vars): Don't print a value
+       for LANG if it is not set.
+
 2004-02-11  Jakub Jelinek  <jakub@redhat.com>
 
        * posix/regexec.c (check_node_accept_bytes): Return 0 if char_len is 0.

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 971fd361edc3fa976d8d90ff2ddbeccf0f5e119d..92be8e231aefdaff06f8d0fd4804b7a16db1c6af 100644 (file)
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -769,7 +769,7 @@ show_locale_vars (void)
 {
   size_t cat_no;
   const char *lcall = getenv ("LC_ALL");
-  const char *lang = getenv ("LANG") ? : "POSIX";
+  const char *lang = getenv ("LANG") ? : "";
 
   auto void get_source (const char *name);
 
@@ -778,7 +778,8 @@ show_locale_vars (void)
       char *val = getenv (name);
 
       if ((lcall ?: "")[0] != '\0' || val == NULL)
-       printf ("%s=\"%s\"\n", name, (lcall ?: "")[0] ? lcall : lang);
+       printf ("%s=\"%s\"\n", name,
+               (lcall ?: "")[0] ? lcall : (lang ?: "")[0] ? lang : "POSIX");
       else
        printf ("%s=%s\n", name, val);
     }