* 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.

diff --git a/ChangeLog b/ChangeLog
index bbb010e..e777de6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-04  Jim Meyering  <jim@meyering.net>
+
+       * 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.
+
 2006-10-03  Jim Meyering  <jim@meyering.net>
 
        * tests/rm/fail-eperm: Report failure also if rm is terminated by

diff --git a/src/remove.c b/src/remove.c
index 9d681c6..13a6e27 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -930,10 +930,13 @@ static inline bool
 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;

diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index 2a1339e..ada461b 100644 (file)
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -21,7 +21,6 @@
 AUTOMAKE_OPTIONS = 1.1 gnits
 
 TESTS = \
-  ignore-name-too-long \
   ignorable \
   readdir-bug \
   empty-inacc \

diff --git a/tests/rm/ignore-name-too-long b/tests/rm/ignore-name-too-long
deleted file mode 100755 (executable)
index 78d4e55..0000000
--- a/tests/rm/ignore-name-too-long
+++ /dev/null
@@ -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