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

17
chown.c
View File

@@ -7,6 +7,7 @@
#include <string.h>
#include <unistd.h>
#include "fs.h"
#include "util.h"
static int hflag = 0;
@@ -16,12 +17,12 @@ static gid_t gid = -1;
static int ret = 0;
static void
chownpwgr(const char *path, int depth, void *data)
chownpwgr(const char *path, void *data, struct recursor *r)
{
char *chownf_name;
int (*chownf)(const char *, uid_t, gid_t);
if (recurse_follow == 'P' || (recurse_follow == 'H' && depth) || (hflag && !depth)) {
if (r->follow == 'P' || (r->follow == 'H' && r->depth) || (hflag && !(r->depth))) {
chownf_name = "lchown";
chownf = lchown;
} else {
@@ -33,7 +34,7 @@ chownpwgr(const char *path, int depth, void *data)
weprintf("%s %s:", chownf_name, path);
ret = 1;
} else if (Rflag) {
recurse(path, chownpwgr, depth, NULL);
recurse(path, NULL, r);
}
}
@@ -46,10 +47,12 @@ usage(void)
int
main(int argc, char *argv[])
{
struct passwd *pw;
struct group *gr;
struct passwd *pw;
struct recursor r = { .fn = chownpwgr, .hist = NULL, .depth = 0, .follow = 'P', .flags = 0};
char *owner, *group;
ARGBEGIN {
case 'h':
hflag = 1;
@@ -61,7 +64,7 @@ main(int argc, char *argv[])
case 'H':
case 'L':
case 'P':
recurse_follow = ARGC();
r.follow = ARGC();
break;
default:
usage();
@@ -97,7 +100,7 @@ main(int argc, char *argv[])
}
}
for (argc--, argv++; *argv; argc--, argv++)
chownpwgr(*argv, 0, NULL);
chownpwgr(*argv, NULL, &r);
return ret;
return ret || recurse_status;
}