1 2010-08-12 Andreas Schwab <schwab@redhat.com>
4 * locale/programs/locale.c (print_assignment): New function.
5 (show_locale_vars): Use it.
7 Index: glibc-2.12-2-gc4ccff1/locale/programs/locale.c
8 ===================================================================
9 --- glibc-2.12-2-gc4ccff1.orig/locale/programs/locale.c
10 +++ glibc-2.12-2-gc4ccff1/locale/programs/locale.c
11 @@ -762,6 +762,29 @@ write_charmaps (void)
12 twalk (all_data, print_names);
15 +/* Print a properly quoted assignment of NAME with VAL, using double
16 + quotes iff DQUOTE is true. */
18 +print_assignment (const char *name, const char *val, bool dquote)
20 + printf ("%s=", name);
23 + while (*val != '\0')
26 + = strcspn (val, dquote ? "$`\"\\" : "~|&;<>()$`\\\"' \t\n");
27 + printf ("%.*s", (int) segment, val);
39 /* We have to show the contents of the environments determining the
41 @@ -769,7 +792,7 @@ static void
42 show_locale_vars (void)
45 - const char *lcall = getenv ("LC_ALL");
46 + const char *lcall = getenv ("LC_ALL") ? : "";
47 const char *lang = getenv ("LANG") ? : "";
49 auto void get_source (const char *name);
50 @@ -778,15 +801,15 @@ show_locale_vars (void)
52 char *val = getenv (name);
54 - if ((lcall ?: "")[0] != '\0' || val == NULL)
55 - printf ("%s=\"%s\"\n", name,
56 - (lcall ?: "")[0] ? lcall : (lang ?: "")[0] ? lang : "POSIX");
57 + if (lcall[0] != '\0' || val == NULL)
58 + print_assignment (name, lcall[0] ? lcall : lang[0] ? lang : "POSIX",
61 - printf ("%s=%s\n", name, val);
62 + print_assignment (name, val, false);
65 /* LANG has to be the first value. */
66 - printf ("LANG=%s\n", lang);
67 + print_assignment ("LANG", lang, false);
69 /* Now all categories in an unspecified order. */
70 for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
71 @@ -794,7 +817,7 @@ show_locale_vars (void)
72 get_source (category[cat_no].name);
74 /* The last is the LC_ALL value. */
75 - printf ("LC_ALL=%s\n", lcall ? : "");
76 + print_assignment ("LC_ALL", lcall, false);