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

Add history and config-struct to recurse

Browse Source 
For loop detection, a history is mandatory. In the process of also
adding a flexible struct to recurse, the recurse-definition was moved
to fs.h.
The motivation behind the struct is to allow easy extensions to the
recurse-function without having to change the prototypes of all
functions in the process.
Adding flags is really simple as well now.

Using the recursor-struct, it's also easier to see which defaults
apply to a program (for instance, which type of follow, ...).

Another change was to add proper stat-lstat-usage in recurse. It
was wrong before.
This commit is contained in:
FRIGN
2015-03-13 00:25:32 +01:00
parent 3b187f4826
commit 9fd4a745f8
11 changed files with 131 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mv.c
View File

@@ -12,6 +12,8 @@ static int mv_status = 0;
static int
mv(const char *s1, const char *s2, int depth)
{
struct recursor r = { .fn = rm, .hist = NULL, .depth = 0, .follow = 'P', .flags = 0};
if (!rename(s1, s2))
return (mv_status = 0);
if (errno == EXDEV) {
@@ -19,7 +21,7 @@ mv(const char *s1, const char *s2, int depth)
cp_HLPflag = 'P';
rm_rflag = 1;
cp(s1, s2, depth);
rm(s1, 0, NULL);
rm(s1, NULL, &r);
return (mv_status = cp_status || rm_status);
}
mv_status = 1;