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

18
libutil/recurse.c
View File

@@ -33,8 +33,10 @@ recurse(const char *path, void *data, struct recursor *r)
}
if (statf(path, &st) < 0) {
weprintf("%s %s:", statf_name, path);
recurse_status = 1;
if (!(r->flags & SILENT)) {
weprintf("%s %s:", statf_name, path);
recurse_status = 1;
}
return;
}
if (!S_ISDIR(st.st_mode)) {
@@ -53,8 +55,10 @@ recurse(const char *path, void *data, struct recursor *r)
return;
if (!(dp = opendir(path))) {
weprintf("opendir %s:", path);
recurse_status = 1;
if (!(r->flags & SILENT)) {
weprintf("opendir %s:", path);
recurse_status = 1;
}
return;
}
@@ -74,8 +78,10 @@ recurse(const char *path, void *data, struct recursor *r)
estrlcat(subpath, "/", sizeof(subpath));
estrlcat(subpath, d->d_name, sizeof(subpath));
if (statf(subpath, &dst) < 0) {
weprintf("%s %s:", statf_name, subpath);
recurse_status = 1;
if (!(r->flags & SILENT)) {
weprintf("%s %s:", statf_name, subpath);
recurse_status = 1;
}
} else if ((r->flags & SAMEDEV) && dst.st_dev != st.st_dev) {
continue;
} else {