diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-09-22 02:07:41 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-09-22 02:30:30 +0100 |
| commit | dee6b7601009688cfb931379b47a701f7dd771e3 (patch) | |
| tree | 17b00da6f156e1c34a8c35e88d944b39f0d170f3 /src/numfmt.c | |
| parent | d4a22dff9b4cd8b05cb01e654fa84b189d3b5721 (diff) | |
| download | coreutils-dee6b7601009688cfb931379b47a701f7dd771e3.tar.xz | |
sort,numfmt: with --debug, diagnose failure to set locale
* src/sort.c (main): With --debug, warn upon setlocale() failure,
which can happen due to incorrectly specified environment variables,
or due to memory exhaustion (simulated with ulimit -v), etc.
* tests/misc/sort-debug-warn.sh: Add a test case.
See also http://savannah.gnu.org/bugs/11004
Diffstat (limited to 'src/numfmt.c')
| -rw-r--r-- | src/numfmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/numfmt.c b/src/numfmt.c index 24bf45b37..109947e20 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -1429,10 +1429,11 @@ int main (int argc, char **argv) { int valid_numbers = 1; + bool locale_ok; initialize_main (&argc, &argv); set_program_name (argv[0]); - setlocale (LC_ALL, ""); + locale_ok = setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); @@ -1558,6 +1559,9 @@ main (int argc, char **argv) if (format_str != NULL && grouping) error (EXIT_FAILURE, 0, _("--grouping cannot be combined with --format")); + if (debug && ! locale_ok) + error (0, 0, _("failed to set locale")); + /* Warn about no-op. */ if (debug && scale_from == scale_none && scale_to == scale_none && !grouping && (padding_width == 0) && (format_str == NULL)) |