(prompt) [! recursive]: Don't prompt about unwritable

directories, as required by POSIX.   Reported by Karl Berry.

diff --git a/src/remove.c b/src/remove.c
index ed9938429977fbddd421daa972988e5c8d19db8a..7c79d10bfe6625783cd27f044fe117a4e4fdc439 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -576,6 +576,13 @@ prompt (Dirstack_state const *ds, char const *filename,
          return RM_ERROR;
        }
 
+      if (S_ISDIR (sbuf.st_mode) && !x->recursive)
+       {
+         error (0, EISDIR, _("cannot remove directory %s"),
+                quote (full_filename (filename)));
+         return RM_ERROR;
+       }
+
       /* Using permissions doesn't make sense for symlinks.  */
       if (S_ISLNK (sbuf.st_mode))
        {