diff options
| author | J William Piggott | 2017-04-19 02:57:27 +0200 |
|---|---|---|
| committer | J William Piggott | 2017-04-19 04:39:05 +0200 |
| commit | 9bf13750cb55d747314a472c306e66b02a2abda9 (patch) | |
| tree | 297c859889461e159d84b7de41796aabda542502 /include/optutils.h | |
| parent | hwclock: improve audit control (diff) | |
| download | kernel-qcow2-util-linux-9bf13750cb55d747314a472c306e66b02a2abda9.tar.gz kernel-qcow2-util-linux-9bf13750cb55d747314a472c306e66b02a2abda9.tar.xz kernel-qcow2-util-linux-9bf13750cb55d747314a472c306e66b02a2abda9.zip | |
optutils.h: don't print non-graph characters
There is no eloquent way to exclude/include arch dependent arguments
from the ul_excl_t array. So when an arch dependent argument is left
undefined err_exclusive_options() was printing out-of-bounds values.
This commit cause them to be skipped instead.
err_exclusive_options() shouldn't be printing out-of-bounds values
in any case.
Also change the error massage from 'options' to 'arguments' as some
programs, like hwclock, distinguish between options and functions.
Signed-off-by: J William Piggott <elseifthen@gmx.com>
Diffstat (limited to 'include/optutils.h')
| -rw-r--r-- | include/optutils.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/optutils.h b/include/optutils.h index 325cb8812..0dc127bbc 100644 --- a/include/optutils.h +++ b/include/optutils.h @@ -5,6 +5,7 @@ #include "c.h" #include "nls.h" +#include "cctype.h" static inline const char *option_to_longopt(int c, const struct option *opts) { @@ -81,8 +82,8 @@ static inline void err_exclusive_options( else if (status[e] != c) { size_t ct = 0; - fprintf(stderr, _("%s: these options are " - "mutually exclusive:"), + fprintf(stderr, _("%s: mutually exclusive " + "arguments:"), program_invocation_short_name); for (op = excl[e]; @@ -91,7 +92,7 @@ static inline void err_exclusive_options( const char *n = option_to_longopt(*op, opts); if (n) fprintf(stderr, " --%s", n); - else + else if (c_isgraph(*op)) fprintf(stderr, " -%c", *op); } fputc('\n', stderr); |