aboutsummaryrefslogtreecommitdiff
path: root/iconv
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 /iconv
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 'iconv')
-rw-r--r--iconv/Makefile3
-rw-r--r--iconv/iconv_prog.c3
-rw-r--r--iconv/iconv_prog.h6
3 files changed, 4 insertions, 8 deletions
diff --git a/iconv/Makefile b/iconv/Makefile
index fd3575178e..d3405651d6 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -31,7 +31,8 @@ routines += gconv_dl
vpath %.c ../locale/programs ../intl
iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \
- dummy-repertoire simple-hash xstrdup xmalloc
+ dummy-repertoire simple-hash xstrdup xmalloc \
+ record-status
iconvconfig-modules = strtab xmalloc hash-string
extra-objs = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o)
CFLAGS-iconv_prog.c = -I../locale/programs
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 35d6eb3646..52b9c78afe 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -97,9 +97,6 @@ static const char *to_code = "";
/* File to write output to. If NULL write to stdout. */
static const char *output_file;
-/* Nonzero if verbose ouput is wanted. */
-int verbose;
-
/* Nonzero if list of all coded character sets is wanted. */
static int list;
diff --git a/iconv/iconv_prog.h b/iconv/iconv_prog.h
index 1571fc9181..cc2a6774a9 100644
--- a/iconv/iconv_prog.h
+++ b/iconv/iconv_prog.h
@@ -20,11 +20,9 @@
#define _ICONV_PROG_H 1
#include <stdio.h>
-#include <charmap.h>
-
-/* Nonzero if verbose ouput is wanted. */
-extern int verbose;
+#include <charmap.h>
+#include <record-status.h>
/* If nonzero omit invalid character from output. */
extern int omit_invalid;