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

Audit chgrp(1)

Browse Source 
1) Refactor manpage so it's actually fun to read.
2) BUGFIX: Call (l)chown properly when the H-flag is specified
   (only when depth > 0).
3) BUGFIX: Call (l)chown properly when the h-flag is specified
   (only when depth = 0).
4) BUGFIX: Only recurse() in chgrp() when the initial chownf()
   succeeds.
5) Style fixes, argv-basing.
6) Rename status to ret for consistency.
7) Add blank line before return.
This commit is contained in:
FRIGN
2015-03-08 23:31:59 +01:00
parent 8ffa06b3dc
commit fba669da88
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
chgrp.c
View File

@@ -8,21 +8,31 @@
#include "util.h"
static int gid;
static int status;
static int Rflag;
static int ret = 0;
static int hflag = 0;
static int Rflag = 0;
static struct stat st;
static char *chownf_name = "chown";
static int (*chownf)(const char *, uid_t, gid_t) = chown;
static void
chgrp(const char *path, int depth)
{
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, st.st_uid, gid) < 0) {
weprintf("%s %s:", chownf_name, path);
status = 1;
}
if (Rflag)
ret = 1;
} else if (Rflag) {
recurse(path, chgrp, depth);
}
}
static void
@@ -38,8 +48,7 @@ main(int argc, char *argv[])
ARGBEGIN {
case 'h':
chownf_name = "lchown";
chownf = lchown;
hflag = 1;
break;
case 'R':
Rflag = 1;
@@ -55,14 +64,9 @@ main(int argc, char *argv[])
if (argc < 2)
usage();
if (recurse_follow == 'P') {
chownf_name = "lchown";
chownf = lchown;
}
errno = 0;
gr = getgrnam(argv[0]);
if (!gr) {
if (!(gr = getgrnam(argv[0]))) {
if (errno)
eprintf("getgrnam %s:", argv[0]);
else
@@ -70,13 +74,14 @@ main(int argc, char *argv[])
}
gid = gr->gr_gid;
while (*++argv) {
for (; *argv; argc--, argv++) {
if (stat(*argv, &st) < 0) {
weprintf("stat %s:", *argv);
status = 1;
ret = 1;
continue;
}
chgrp(*argv, 0);
}
return status;
return ret;
}