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

Add maxdepth to recurse()

Browse Source 
This also makes more sense.
This commit is contained in:
FRIGN
2015-04-18 22:04:49 +02:00
committed by sin
parent e14d9412f8
commit 7b2465c101
10 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libutil/recurse.c
View File

@@ -37,7 +37,7 @@ recurse(const char *path, void *data, struct recursor *r)
recurse_status = 1;
return;
}
if (!S_ISDIR(st.st_mode) || (S_ISDIR(st.st_mode) && (r->flags & NODIRS))) {
if (!S_ISDIR(st.st_mode)) {
(r->fn)(path, &st, data, r);
return;
}
@@ -61,26 +61,28 @@ recurse(const char *path, void *data, struct recursor *r)
if (!r->depth && (r->flags & DIRFIRST))
(r->fn)(path, &st, data, r);
while ((d = readdir(dp))) {
if (r->follow == 'H') {
statf_name = "lstat";
statf = lstat;
}
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
estrlcpy(subpath, path, sizeof(subpath));
if (path[strlen(path) - 1] != '/')
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;
} else if ((r->flags & SAMEDEV) && dst.st_dev != st.st_dev) {
continue;
} else {
r->depth++;
(r->fn)(subpath, &dst, data, r);
r->depth--;
if (!r->maxdepth || r->depth + 1 < r->maxdepth) {
while ((d = readdir(dp))) {
if (r->follow == 'H') {
statf_name = "lstat";
statf = lstat;
}
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
estrlcpy(subpath, path, sizeof(subpath));
if (path[strlen(path) - 1] != '/')
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;
} else if ((r->flags & SAMEDEV) && dst.st_dev != st.st_dev) {
continue;
} else {
r->depth++;
(r->fn)(subpath, &dst, data, r);
r->depth--;
}
}
}

2
libutil/rm.c
View File

@@ -14,7 +14,7 @@ int rm_status = 0;
void
rm(const char *path, struct stat *st, void *data, struct recursor *r)
{
if (!(r->flags & NODIRS) && st && S_ISDIR(st->st_mode)) {
if (!r->maxdepth && st && S_ISDIR(st->st_mode)) {
recurse(path, NULL, r);
if (rmdir(path) < 0) {