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.
104 lines
1.8 KiB
C
104 lines
1.8 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <errno.h>
|
|
#include <grp.h>
|
|
#include <limits.h>
|
|
#include <pwd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "util.h"
|
|
|
|
static int hflag = 0;
|
|
static int Rflag = 0;
|
|
static uid_t uid = -1;
|
|
static gid_t gid = -1;
|
|
static int ret = 0;
|
|
|
|
static void
|
|
chownpwgr(const char *path, int depth, void *data)
|
|
{
|
|
char *chownf_name;
|
|
int (*chownf)(const char *, uid_t, gid_t);
|
|
|
|
if (recurse_follow == 'P' || (recurse_follow == 'H' && depth) || (hflag && !depth)) {
|
|
chownf_name = "lchown";
|
|
chownf = lchown;
|
|
} else {
|
|
chownf_name = "chown";
|
|
chownf = chown;
|
|
}
|
|
|
|
if (chownf(path, uid, gid) < 0) {
|
|
weprintf("%s %s:", chownf_name, path);
|
|
ret = 1;
|
|
} else if (Rflag) {
|
|
recurse(path, chownpwgr, depth, NULL);
|
|
}
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-h] [-R [-H | -L | -P]] [owner][:[group]] file ...\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
struct passwd *pw;
|
|
struct group *gr;
|
|
char *owner, *group;
|
|
|
|
ARGBEGIN {
|
|
case 'h':
|
|
hflag = 1;
|
|
break;
|
|
case 'r':
|
|
case 'R':
|
|
Rflag = 1;
|
|
break;
|
|
case 'H':
|
|
case 'L':
|
|
case 'P':
|
|
recurse_follow = ARGC();
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
if (argc < 2)
|
|
usage();
|
|
|
|
owner = argv[0];
|
|
if ((group = strchr(owner, ':')))
|
|
*group++ = '\0';
|
|
|
|
if (owner && *owner) {
|
|
errno = 0;
|
|
pw = getpwnam(owner);
|
|
if (pw) {
|
|
uid = pw->pw_uid;
|
|
} else {
|
|
if (errno)
|
|
eprintf("getpwnam %s:", owner);
|
|
uid = estrtonum(owner, 0, UINT_MAX);
|
|
}
|
|
}
|
|
if (group && *group) {
|
|
errno = 0;
|
|
gr = getgrnam(group);
|
|
if (gr) {
|
|
gid = gr->gr_gid;
|
|
} else {
|
|
if (errno)
|
|
eprintf("getgrnam %s:", group);
|
|
gid = estrtonum(group, 0, UINT_MAX);
|
|
}
|
|
}
|
|
for (argc--, argv++; *argv; argc--, argv++)
|
|
chownpwgr(*argv, 0, NULL);
|
|
|
|
return ret;
|
|
}
|