Re: [bug #17900] rm -f should ignore ENOTDIR

[Jim Meyering]

Paul Eggert <address@hidden> wrote:
> Actually, isn't ENAMETOOLONG in the same category as ELOOP?  That is,
> ENAMETOOLONG sometimes indicates the file isn't there, but sometimes
> not.  For example,

FYI, I've committed this:

2006-10-04  Jim Meyering  <address@hidden>

        * src/remove.c (nonexistent_file_errno): Remove ENAMETOOLONG.
        Paul Eggert pointed out that the specified file may exist,
        in spite of such an errno value.
        * tests/rm/Makefile.am (TESTS): Remove ignore-name-too-long.
        * tests/rm/ignore-name-too-long: Remove file.
        * NEWS: Update here, too.

Index: src/remove.c
===================================================================
RCS file: /fetish/cu/src/remove.c,v
retrieving revision 1.164
diff -u -r1.164 remove.c
--- src/remove.c        3 Oct 2006 13:32:56 -0000       1.164
+++ src/remove.c        3 Oct 2006 21:57:32 -0000
@@ -930,10 +930,13 @@
 nonexistent_file_errno (int errnum)
 {
   /* Do not include ELOOP here, since the specified file may indeed
-     exist, but be (in)accessible only via too long a symlink chain.  */
+     exist, but be (in)accessible only via too long a symlink chain.
+     Likewise for ENAMETOOLONG, since rm -f ./././.../foo may fail
+     if the "..." part expands to a long enough sequence of "./"s,
+     even though ./foo does indeed exist.  */
+
   switch (errnum)
     {
-    case ENAMETOOLONG:
     case ENOENT:
     case ENOTDIR:
       return true;
Index: tests/rm/Makefile.am
===================================================================
RCS file: /fetish/cu/tests/rm/Makefile.am,v
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- tests/rm/Makefile.am        3 Oct 2006 13:13:09 -0000       1.39
+++ tests/rm/Makefile.am        3 Oct 2006 22:05:26 -0000
@@ -21,7 +21,6 @@
 AUTOMAKE_OPTIONS = 1.1 gnits

 TESTS = \
-  ignore-name-too-long \
   ignorable \
   readdir-bug \
   empty-inacc \
Index: tests/rm/ignore-name-too-long
===================================================================
RCS file: tests/rm/ignore-name-too-long
diff -N tests/rm/ignore-name-too-long
--- tests/rm/ignore-name-too-long       3 Oct 2006 13:13:09 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Ensure that rm -f name_longer_than_FILENAME_MAX exits successfully
-
-# Copyright (C) 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-if test "$VERBOSE" = yes; then
-  set -x
-  rm --version
-fi
-
-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
-
-if test $framework_failure = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
-
-fail=0
-
-# With coreutils-6.3, this would exit nonzero.  It should not.
-long_name=$(printf %0513d 0)
-rm -f $long_name > out 2>&1 || fail=1
-
-(exit $fail); exit $fail
* NEWS: Update here, too.
Index: NEWS
===================================================================
RCS file: /fetish/cu/NEWS,v
retrieving revision 1.437
diff -u -r1.437 NEWS
--- NEWS        3 Oct 2006 13:13:09 -0000       1.437
+++ NEWS        3 Oct 2006 22:07:09 -0000
@@ -4,7 +4,7 @@

 ** Bug fixes

-  With --force (-f), rm no longer fails for ENOTDIR or ENAMETOOLONG.
+  With --force (-f), rm no longer fails for ENOTDIR.
   For example, "rm -f existing-non-directory/anything" now exits
   successfully, ignoring the error about a nonexistent file.

/fetish/cu/ChangeLog,v  <--  ChangeLog
new revision: 1.2004; previous revision: 1.2003
/fetish/cu/NEWS,v  <--  NEWS
new revision: 1.438; previous revision: 1.437