aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/locale.c
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2017-10-17 01:33:42 -0700
committerCarlos O'Donell <carlos@systemhalted.org>2017-10-25 13:36:54 -0700
commit02eec681676c5aabf2eb13b92b1124245d19112f (patch)
treeaf9a0a8e118957855af45b207c1441db3fa9cce9 /locale/programs/locale.c
parent56fa555a834c1536bf8d58c1ac6097f18f0d92b6 (diff)
downloadglibc-02eec681676c5aabf2eb13b92b1124245d19112f.tar
glibc-02eec681676c5aabf2eb13b92b1124245d19112f.tar.gz
glibc-02eec681676c5aabf2eb13b92b1124245d19112f.tar.bz2
glibc-02eec681676c5aabf2eb13b92b1124245d19112f.zip
localedef: Add --no-warnings/--warnings option
From localedef --help: Output control: ... --no-warnings=<warnings> Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym ... --warnings=<warnings> Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym Locales using SHIFT_JIS and SHIFT_JISX0213 character maps are not ASCII compatible. In order to build locales using these character maps, and have localedef exit with a status of 0, we add new option to localedef to disable or enable specific warnings. The options are --no-warnings and --warnings, to disable and enable specific warnings respectively. The options take a comma-separated list of warning names. The warning names are taken directly from the generated warning. When a warning that can be disabled is issued it will print something like this: foo is not defined [--no-warnings=foo] For the initial implementation we add two controllable warnings; first 'ascii' which is used by the localedata installation makefile target to install SHIFT_JIS and SHIFT_JISX0213-using locales without error; second 'intcurrsym' which allows a program to use a non-standard international currency symbol without triggering a warning. The 'intcurrsym' is useful in the future if country codes are added that are not in our current ISO 4217 list, and the user wants to avoid the warning. Having at least two warnings to control gives an example for how the changes can be extended to more warnings if required in the future. These changes allow ja_JP.SHIFT_JIS and ja_JP.SHIFT_JISX0213 to be compiled without warnings using --no-warnings=ascii. The localedata/Makefile $(INSTALL-SUPPORTED-LOCALES) target is adjusted to automatically add `--no-warnings=ascii` for such charmaps, and likewise localedata/gen-locale.sh is adjusted with similar logic. v2: Bring verbose, be_quiet, and all warning control booleans into record-status.c, and compile this object file to be used by locale, iconv, and localedef. Any users include record-status.h. v3: Fix an instance of boolean coercion in set_warning(). Signed-off-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'locale/programs/locale.c')
-rw-r--r--locale/programs/locale.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index a29a32bc1a..939214dbd0 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -40,6 +40,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
+#include "record-status.h"
#include "localeinfo.h"
#include "charmap-dir.h"
#include "../locarchive.h"
@@ -59,13 +60,6 @@ static int do_all;
/* Print names of all available character maps. */
static int do_charmaps = 0;
-/* Nonzero if verbose output is wanted. Note that this definition is
- file-local in scope, and does not extended to uses of verbose in
- record-status.h functions like record_verbose. This means that this
- verbose will not enable record_verbose messages for uses from locale,
- but it does for uses from localdef (where verbose is global). */
-static int verbose;
-
/* Name and version of program. */
static void print_version (FILE *stream, struct argp_state *state);
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;