diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/ls.c | 13 | ||||
| -rw-r--r-- | tests/ls/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/ls/stat-failed | 36 |
4 files changed, 49 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2006-07-25 Jim Meyering <jim@meyering.net> + * src/ls.c (gobble_file): Make it so failure to stat a + non-command-line file provokes an exit status of 1, not 0. + Say "cannot access" rather than "cannot stat". + * tests/ls/stat-failed: New file/test, for the above. + * tests/ls/Makefile.am (TESTS): Add stat-failed. + * src/ls.c: Declare stat_failed to be "bool", not "int" everywhere. * src/ls.c [enum filetype] (command_line): Remove member. Not needed. @@ -2611,14 +2611,13 @@ gobble_file (char const *name, enum filetype type, ino_t inode, f->stat_failed = (err < 0); if (f->stat_failed) { - /* We treat stat failures for files the user named special. - There is no guarantee that these files really exist so - we do not print any information. */ + /* Failure to stat a command line argument leads to + an exit status of 2. For other files, stat failure + provokes an exit status of 1. */ + file_failure (command_line_arg, + _("cannot access %s"), absolute_name); if (command_line_arg) - { - file_failure (1, "%s", absolute_name); - return 0; - } + return 0; f->filetype = type; memset (&f->stat, '\0', sizeof (f->stat)); diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am index 7c6ae5ab0..fc8af7c55 100644 --- a/tests/ls/Makefile.am +++ b/tests/ls/Makefile.am @@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits TESTS = \ + stat-failed \ stat-dtype \ inode dangle file-type recursive dired infloop \ rt-1 time-1 symlink-slash follow-slink no-arg m-option \ diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed new file mode 100755 index 000000000..a7c006609 --- /dev/null +++ b/tests/ls/stat-failed @@ -0,0 +1,36 @@ +#!/bin/sh +# Verify that ls works properly when it fails to stat a file that is +# not mentioned on the command line. + +if test "$VERBOSE" = yes; then + set -x + ls --version +fi + +. $srcdir/../envvar-check +. $srcdir/../lang-default +PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check + +pwd=`pwd` +t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ +trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +framework_failure=0 +mkdir -p $tmp || framework_failure=1 +cd $tmp || framework_failure=1 +mkdir d || framework_failure=1 +ln -s / d/s || framework_failure=1 +chmod 600 d || framework_failure=1 + +if test $framework_failure = 1; then + echo "$0: failure in testing framework" 1>&2 + (exit 1); exit 1 +fi + +fail=0 + +ls -Log d > out 2> err +test $? = 1 || fail=1 + +(exit $fail); exit $fail |