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

24
du.c
View File

@@ -8,6 +8,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "fs.h"
#include "util.h"
static size_t maxdepth = SIZE_MAX;
@@ -34,24 +35,24 @@ nblks(blkcnt_t blocks)
}
void
du(const char *path, int depth, void *total)
du(const char *path, void *total, struct recursor *r)
{
struct stat st;
size_t subtotal = 0;
if (lstat(path, &st) < 0) {
if (!depth || errno != ENOENT)
if (!(r->depth) || errno != ENOENT)
weprintf("stat %s:", path);
if (!depth)
if (!(r->depth))
ret = 1;
return;
}
if (S_ISDIR(st.st_mode))
recurse(path, du, depth, &subtotal);
recurse(path, &subtotal, r);
*((size_t *)total) += subtotal + nblks(st.st_blocks);
if (!sflag && depth <= maxdepth && (S_ISDIR(st.st_mode) || aflag))
if (!sflag && r->depth <= maxdepth && (S_ISDIR(st.st_mode) || aflag))
printpath(subtotal + nblks(st.st_blocks), path);
}
@@ -64,8 +65,9 @@ usage(void)
int
main(int argc, char *argv[])
{
int kflag = 0, dflag = 0;
struct recursor r = { .fn = du, .hist = NULL, .depth = 0, .follow = 'P', .flags = 0};
size_t n = 0;
int kflag = 0, dflag = 0;
char *bsize;
ARGBEGIN {
@@ -86,12 +88,12 @@ main(int argc, char *argv[])
sflag = 1;
break;
case 'x':
recurse_samedev = 1;
r.flags |= SAMEDEV;
break;
case 'H':
case 'L':
case 'P':
recurse_follow = ARGC();
r.follow = ARGC();
break;
default:
usage();
@@ -107,16 +109,16 @@ main(int argc, char *argv[])
blksize = 1024;
if (!argc) {
du(".", 0, &n);
du(".", &n, &r);
if (sflag && !ret)
printpath(nblks(n), ".");
} else {
for (; *argv; argc--, argv++) {
du(argv[0], 0, &n);
du(argv[0], &n, &r);
if (sflag && !ret)
printpath(n, argv[0]);
}
}
return ret;
return ret || recurse_status;
}