fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add SILENT flag to recurse()

Browse Source 
recurse() is getting smarter every day. I expect it to pass the Turing
test in a few months.
Along the way, it was reported that "rm -f" on nonexistant files reports
their missing as an internal recurse()-error.
So recurse() knows when to shut up, I added the SILENT flag to fix all
these things.
This commit is contained in:
FRIGN
2015-04-19 14:00:47 +02:00
committed by sin
parent 7b2465c101
commit f83d7bc647
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libutil/rm.c
View File

@@ -8,7 +8,6 @@
#include "../fs.h"
#include "../util.h"
int rm_fflag = 0;
int rm_status = 0;
void
@@ -18,15 +17,15 @@ rm(const char *path, struct stat *st, void *data, struct recursor *r)
recurse(path, NULL, r);
if (rmdir(path) < 0) {
if (!rm_fflag)
if (!(r->flags & SILENT))
weprintf("rmdir %s:", path);
if (!(rm_fflag && errno == ENOENT))
if (!((r->flags & SILENT) && errno == ENOENT))
rm_status = 1;
}
} else if (unlink(path) < 0) {
if (!rm_fflag)
if (!(r->flags & SILENT))
weprintf("unlink %s:", path);
if (!(rm_fflag && errno == ENOENT))
if (!((r->flags & SILENT) && errno == ENOENT))
rm_status = 1;
}
}