01de5df8e6
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.
76 lines
2.1 KiB
C
76 lines
2.1 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <sys/types.h>
|
|
|
|
#include <regex.h>
|
|
#include <stddef.h>
|
|
|
|
#include "arg.h"
|
|
#include "compat.h"
|
|
|
|
#define UTF8_POINT(c) (((c) & 0xc0) != 0x80)
|
|
|
|
#undef MIN
|
|
#define MIN(x,y) ((x) < (y) ? (x) : (y))
|
|
#undef MAX
|
|
#define MAX(x,y) ((x) > (y) ? (x) : (y))
|
|
#undef LIMIT
|
|
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
|
|
|
#define LEN(x) (sizeof (x) / sizeof *(x))
|
|
|
|
extern char *argv0;
|
|
|
|
char *agetcwd(void);
|
|
void apathmax(char **, size_t *);
|
|
|
|
void *ecalloc(size_t, size_t);
|
|
void *emalloc(size_t);
|
|
void *erealloc(void *, size_t);
|
|
#undef reallocarray
|
|
void *reallocarray(void *, size_t, size_t);
|
|
void *ereallocarray(void *, size_t, size_t);
|
|
char *estrdup(const char *);
|
|
char *estrndup(const char *, size_t);
|
|
void *encalloc(int, size_t, size_t);
|
|
void *enmalloc(int, size_t);
|
|
void *enrealloc(int, void *, size_t);
|
|
char *enstrdup(int, const char *);
|
|
char *enstrndup(int, const char *, size_t);
|
|
|
|
void enprintf(int, const char *, ...);
|
|
void eprintf(const char *, ...);
|
|
void weprintf(const char *, ...);
|
|
|
|
double estrtod(const char *);
|
|
|
|
#undef strcasestr
|
|
char *strcasestr(const char *, const char *);
|
|
|
|
#undef strlcat
|
|
size_t strlcat(char *, const char *, size_t);
|
|
#undef strlcpy
|
|
size_t strlcpy(char *, const char *, size_t);
|
|
|
|
#undef strsep
|
|
char *strsep(char **, const char *);
|
|
|
|
/* regex */
|
|
int enregcomp(int, regex_t *, const char *, int);
|
|
int eregcomp(regex_t *, const char *, int);
|
|
|
|
/* misc */
|
|
void enmasse(int, char **, int (*)(const char *, const char *, int));
|
|
void fnck(const char *, const char *, int (*)(const char *, const char *, int), int);
|
|
mode_t getumask(void);
|
|
char *humansize(double);
|
|
mode_t parsemode(const char *, mode_t, mode_t);
|
|
void putword(const char *);
|
|
extern int recurse_follow;
|
|
extern int recurse_samedev;
|
|
void recurse(const char *, void (*)(const char *, int, void *), int, void *);
|
|
#undef strtonum
|
|
long long strtonum(const char *, long long, long long, const char **);
|
|
long long enstrtonum(int, const char *, long long, long long);
|
|
long long estrtonum(const char *, long long, long long);
|
|
size_t unescape(char *);
|