diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-06-28 18:01:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-06-28 18:01:00 +0000 |
| commit | e56fa3cdfeb1f5fd674f6f830b0bd9564e4cb2e7 (patch) | |
| tree | fa5f210657895c23518b3c0e3471487f15054a31 /bin/rm | |
| parent | 16c7f1387a46334a635dba64883391354a3aad75 (diff) | |
revert previous. better fix applied to fts_open.
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 70476c87276..b97d1767170 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rm.c,v 1.38 2016/06/28 15:20:13 tedu Exp $ */ +/* $OpenBSD: rm.c,v 1.39 2016/06/28 18:00:59 tedu Exp $ */ /* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */ /*- @@ -150,11 +150,8 @@ rm_tree(char **argv) flags = FTS_PHYSICAL; if (!needstat) flags |= FTS_NOSTAT; - if (!(fts = fts_open(argv, flags, NULL))) { - if (!fflag || errno != ENOENT) - err(1, NULL); - return; - } + if (!(fts = fts_open(argv, flags, NULL))) + err(1, NULL); while ((p = fts_read(fts)) != NULL) { switch (p->fts_info) { case FTS_DNR: |