mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
seq: output decimal points consistently with invalid locales
* src/seq.c (print_numbers): Only reset the locale if it was successfully set originally. * tests/misc/seq-locale.sh: Add a new test. * tests/local.mk: Reference the new test. * NEWS: Mention the fix.
This commit is contained in:
1 parent
027eeec7b0
commit
03fbb5ecec
4 files changed
+41
-3
No files matched your search
@@ -42,6 +42,9 @@
|
||||
|
||||
#define AUTHORS proper_name ("Ulrich Drepper")
|
||||
|
||||
/* True if the locale settings were honored. */
|
||||
static bool locale_ok;
|
||||
|
||||
/* If true print all number with equal width. */
|
||||
static bool equal_width;
|
||||
|
||||
@@ -324,9 +327,11 @@ print_numbers (char const *fmt, struct layout layout,
|
||||
long double x_val;
|
||||
char *x_str;
|
||||
int x_strlen;
|
||||
setlocale (LC_NUMERIC, "C");
|
||||
if (locale_ok)
|
||||
setlocale (LC_NUMERIC, "C");
|
||||
x_strlen = asprintf (&x_str, fmt, x);
|
||||
setlocale (LC_NUMERIC, "");
|
||||
if (locale_ok)
|
||||
setlocale (LC_NUMERIC, "");
|
||||
if (x_strlen < 0)
|
||||
xalloc_die ();
|
||||
x_str[x_strlen - layout.suffix_len] = '\0';
|
||||
@@ -559,7 +564,7 @@ main (int argc, char **argv)
|
||||
|
||||
initialize_main (&argc, &argv);
|
||||
set_program_name (argv[0]);
|
||||
setlocale (LC_ALL, "");
|
||||
locale_ok = !!setlocale (LC_ALL, "");
|
||||
bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
textdomain (PACKAGE);
|
||||
|
||||
|
||||
Reference in new issue
Block a user