diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /bin/rm | |
| parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
| parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
| download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip | |
Notes
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.1 | 1 | ||||
| -rw-r--r-- | bin/rm/rm.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 824b627dec40..840b560a7d4f 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 976b4eeb57c2..46807b9e4e58 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); } |