* src/remove.c (remove_dir): Don't use errno in diagnostic.

Root-only test failure reported by Alex van Hout and Jon Grosshart in
<http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/9415/focus=9415>.

diff --git a/ChangeLog b/ChangeLog
index 933ea6a5710ce5b3cc9378c6973876896ba1b74f..3e23374de7767cafcc9129c59d744f1239353613 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-15  Jim Meyering  <jim@meyering.net>
 
+       * src/remove.c (remove_dir): Don't use errno in diagnostic.
+       Root-only test failure reported by Alex van Hout and Jon Grosshart in
+       <http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/9415/focus=9415>.
+
        * bootstrap.conf (avoided_gnulib_modules): Fix my typo:
        s/--avoid=canonicalize-lgpl/--avoid=canonicalize-gpl/
 

diff --git a/src/remove.c b/src/remove.c
index 7e86451370089b2cd35c53f71eb0eff70591840c..fbe7204565eccde89769f5ba7e4513305a7627f3 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -1,5 +1,5 @@
 /* remove.c -- core functions for removing files and directories
-   Copyright (C) 88, 90, 91, 1994-2006 Free Software Foundation, Inc.
+   Copyright (C) 88, 90, 91, 1994-2007 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
@@ -1371,7 +1371,7 @@ remove_dir (int fd_cwd, Dirstack_state *ds, char const *dir,
             traversal into the current directory, (known as SUBDIR, from ..),
             DIRP's device number is different from CURRENT_DEV.  Arrange not
             to do anything more with this hierarchy.  */
-         error (0, errno, _("skipping %s, since it's on a different device"),
+         error (0, 0, _("skipping %s, since it's on a different device"),
                 quote (full_filename (subdir)));
          free (subdir);
          AD_mark_current_as_unremovable (ds);