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

Audit du(1) and refactor recurse()

Browse Source 
While auditing du(1) I realized that there's no way the over 100 lines
of procedures in du() would pass the audit.
Instead, I decided to rewrite this section using recurse() from libutil.
However, the issue was that you'd need some kind of payload to count
the number of bytes in the subdirectories and use them in the higher
hierarchies.
The solution is to add a "void *data" data pointer to each recurse-
function-prototype, which we might also be able to use in other
recurse-applications.
recurse() itself had to be augmented with a recurse_samedev-flag, which
basically prevents recurse from leaving the current device.

Now, let's take a closer look at the audit:
1) Removing the now unnecessary util-functions push, pop, xrealpath,
   rename print() to printpath(), localize some global variables.
2) Only pass the block count to nblks instead of the entire stat-
   pointer.
3) Fix estrtonum to use the minimum of LLONG_MAX and SIZE_MAX.
4) Use idiomatic argv+argc-loop
5) Report proper exit-status.
This commit is contained in:
FRIGN
2015-03-11 23:21:52 +01:00
parent 00ca97b279
commit 01de5df8e6
11 changed files with 89 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libutil/recurse.c
View File

@@ -1,5 +1,6 @@
/* See LICENSE file for copyright and license details. */
#include <dirent.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -10,21 +11,28 @@
#include "../util.h"
int recurse_follow = 'P';
int recurse_follow = 'P';
int recurse_samedev = 0;
void
recurse(const char *path, void (*fn)(const char *, int), int depth)
recurse(const char *path, void (*fn)(const char *, int, void *), int depth, void *data)
{
struct dirent *d;
struct stat lst, st;
struct stat lst, st, dst;
DIR *dp;
size_t len;
char *buf;
if (lstat(path, &lst) < 0)
eprintf("lstat %s:", path);
if (stat(path, &st) < 0)
eprintf("stat %s:", path);
if (lstat(path, &lst) < 0) {
if (errno != ENOENT)
weprintf("lstat %s:", path);
return;
}
if (stat(path, &st) < 0) {
if (errno != ENOENT)
weprintf("stat %s:", path);
return;
}
if (!S_ISDIR(lst.st_mode) && !(S_ISLNK(lst.st_mode) && S_ISDIR(st.st_mode) &&
!(recurse_follow == 'P' || (recurse_follow == 'H' && depth > 0))))
return;
@@ -36,9 +44,13 @@ recurse(const char *path, void (*fn)(const char *, int), int depth)
while ((d = readdir(dp))) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
buf = emalloc(len + (path[len] != '/') + strlen(d->d_name) + 1);
sprintf(buf, "%s%s%s", path, (path[len] == '/') ? "" : "/", d->d_name);
fn(buf, depth + 1);
buf = emalloc(len + (path[len - 1] != '/') + strlen(d->d_name) + 1);
sprintf(buf, "%s%s%s", path, (path[len - 1] == '/') ? "" : "/", d->d_name);
if (recurse_samedev && lstat(buf, &dst) < 0) {
if (errno != ENOENT)
weprintf("stat %s:", buf);
} else if (!(recurse_samedev && dst.st_dev != lst.st_dev))
fn(buf, depth + 1, data);
free(buf);
}