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

Properly handle recursion in recurse()

Browse Source 
The restructuring of recurse() in the last few weeks actually broke
the recursion-flags in different tools.
As a long-term goal, the recursor should have a field "maxdepth"
which should be "1" for the non-Rflag-case. "0" stands for unlimited.
This commit is contained in:
FRIGN
2015-04-18 21:24:17 +02:00
committed by sin
parent e2edbdcb87
commit e14d9412f8
8 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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)) {
if (!S_ISDIR(st.st_mode) || (S_ISDIR(st.st_mode) && (r->flags & NODIRS))) {
(r->fn)(path, &st, data, r);
return;
}

15
libutil/rm.c
View File

@@ -3,22 +3,29 @@
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
#include "../fs.h"
#include "../util.h"
int rm_fflag = 0;
int rm_rflag = 0;
int rm_status = 0;
void
rm(const char *path, struct stat *st, void *data, struct recursor *r)
{
if (rm_rflag && st && S_ISDIR(st->st_mode))
if (!(r->flags & NODIRS) && st && S_ISDIR(st->st_mode)) {
recurse(path, NULL, r);
if (remove(path) < 0) {
if (rmdir(path) < 0) {
if (!rm_fflag)
weprintf("rmdir %s:", path);
if (!(rm_fflag && errno == ENOENT))
rm_status = 1;
}
} else if (unlink(path) < 0) {
if (!rm_fflag)
weprintf("remove %s:", path);
weprintf("unlink %s:", path);
if (!(rm_fflag && errno == ENOENT))
rm_status = 1;
}