Merge head from 7/28

2 files changed, 1 insertions, 2 deletions

diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 824b627..840b560 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -121,7 +121,6 @@ each directory's contents are processed (as well as before the attempt
 is made to remove the directory).
 If the user does not respond affirmatively, the file hierarchy rooted in
 that directory is skipped.
-.Pp
 .It Fl r
 Equivalent to
 .Fl R .
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 976b4ee..46807b9 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -335,7 +335,7 @@ err:
 		warn("%s", p->fts_path);
 		eval = 1;
 	}
-	if (errno)
+	if (!fflag && errno)
 		err(1, "fts_read");
 	fts_close(fts);
 }