ls: give a more useful diagnostic for a bogus --time-style arg

* src/ls.c (decode_switches): Replace our use of XARGMATCH
with open-coded version so that we can give a better diagnostic.
* tests/ls/time-style-diag: New file.
* tests/Makefile.am (TESTS): Add it.
Reported by Dan Jacobson in http://bugs.gnu.org/10253
with suggestions from Eric Blake and Paul Eggert.
This commit is contained in:
Jim Meyering committed 2011-12-12 12:19:55 +01:00
1 parent da4793e949
commit a3fee8b6af
4 files changed
+89 -25

No files matched your search

+1 -1
Submodule gnulib updated: a5f6df2b1f...f5c2e2ac7d.
+48 -24
View File
@@ -2039,33 +2039,57 @@ decode_switches (int argc, char **argv)
long_time_format[1] = p1;
}
else
switch (XARGMATCH ("time style", style,
time_style_args,
time_style_types))
{
case full_iso_time_style:
long_time_format[0] = long_time_format[1] =
"%Y-%m-%d %H:%M:%S.%N %z";
break;
{
ptrdiff_t res = argmatch (style, time_style_args,
(char const *) time_style_types,
sizeof (*time_style_types));
if (res < 0)
{
/* This whole block used to be a simple use of XARGMATCH.
but that didn't print the "posix-"-prefixed variants or
the "+"-prefixed format string option upon failure. */
argmatch_invalid ("time style", style, res);
case long_iso_time_style:
long_time_format[0] = long_time_format[1] = "%Y-%m-%d %H:%M";
break;
/* The following is a manual expansion of argmatch_valid,
but with the added "+ ..." description and the [posix-]
prefixes prepended. Note that this simplification works
only because all four existing time_style_types values
are distinct. */
fputs (_("Valid arguments are:\n"), stderr);
char const *const *p = time_style_args;
while (*p)
fprintf (stderr, " - [posix-]%s\n", *p++);
fputs (_(" - +FORMAT (e.g., +%H:%M) for a `date'-style"
" format\n"), stderr);
usage (LS_FAILURE);
}
switch (res)
{
case full_iso_time_style:
long_time_format[0] = long_time_format[1] =
"%Y-%m-%d %H:%M:%S.%N %z";
break;
case iso_time_style:
long_time_format[0] = "%Y-%m-%d ";
long_time_format[1] = "%m-%d %H:%M";
break;
case long_iso_time_style:
long_time_format[0] = long_time_format[1] = "%Y-%m-%d %H:%M";
break;
case iso_time_style:
long_time_format[0] = "%Y-%m-%d ";
long_time_format[1] = "%m-%d %H:%M";
break;
case locale_time_style:
if (hard_locale (LC_TIME))
{
int i;
for (i = 0; i < 2; i++)
long_time_format[i] =
dcgettext (NULL, long_time_format[i], LC_TIME);
}
}
}
case locale_time_style:
if (hard_locale (LC_TIME))
{
int i;
for (i = 0; i < 2; i++)
long_time_format[i] =
dcgettext (NULL, long_time_format[i], LC_TIME);
}
}
/* Note we leave %5b etc. alone so user widths/flags are honored. */
if (strstr (long_time_format[0], "%b")
|| strstr (long_time_format[1], "%b"))
+1
View File
@@ -441,6 +441,7 @@ TESTS = \
ls/stat-free-symlinks \
ls/stat-vs-dirent \
ls/symlink-slash \
ls/time-style-diag \
ls/x-option \
mkdir/p-1 \
mkdir/p-2 \
+39
View File
@@ -0,0 +1,39 @@
#!/bin/sh
# Ensure that an invalid --time-style=ARG is diagnosed the way we want.
# Copyright (C) 2011 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ ls
ls -l --time-style=XX > out 2> err
test $? = 2 || fail=1
cat <<\EOF > exp || fail=1
ls: invalid argument `XX' for `time style'
Valid arguments are:
- [posix-]full-iso
- [posix-]long-iso
- [posix-]iso
- [posix-]locale
- +FORMAT (e.g., +%H:%M) for a `date'-style format
Try `ls --help' for more information.
EOF
compare exp err || fail=1
compare /dev/null out || fail=1
Exit $fail