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

chown: Support numeric uids/gids

This commit is contained in:
Michael Forney 2014-11-02 22:24:53 +00:00 committed by sin
parent 6164445cce
commit 62850af594
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
chown.c
View File

@ -11,8 +11,8 @@
static void chownpwgr(const char *); static void chownpwgr(const char *);
static bool rflag = false; static bool rflag = false;
static struct passwd *pw = NULL; static uid_t uid = -1;
static struct group *gr = NULL; static gid_t gid = -1;
static int ret = 0; static int ret = 0;
static void static void
@ -24,7 +24,9 @@ usage(void)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
char *owner, *group; char *owner, *group, *end;
struct passwd *pw;
struct group *gr;
ARGBEGIN { ARGBEGIN {
case 'R': case 'R':
@ -47,20 +49,26 @@ main(int argc, char *argv[])
if(owner && *owner) { if(owner && *owner) {
errno = 0; errno = 0;
pw = getpwnam(owner); pw = getpwnam(owner);
if (!pw) { if(pw) {
uid = pw->pw_uid;
} else {
if(errno != 0) if(errno != 0)
eprintf("getpwnam %s:", owner); eprintf("getpwnam %s:", owner);
else uid = strtoul(owner, &end, 10);
if(*end != '\0')
eprintf("getpwnam %s: no such user\n", owner); eprintf("getpwnam %s: no such user\n", owner);
} }
} }
if(group && *group) { if(group && *group) {
errno = 0; errno = 0;
gr = getgrnam(group); gr = getgrnam(group);
if (!gr) { if(gr) {
gid = gr->gr_gid;
} else {
if(errno != 0) if(errno != 0)
eprintf("getgrnam %s:", group); eprintf("getgrnam %s:", group);
else gid = strtoul(group, &end, 10);
if(*end != '\0')
eprintf("getgrnam %s: no such group\n", group); eprintf("getgrnam %s: no such group\n", group);
} }
} }
@ -73,8 +81,7 @@ main(int argc, char *argv[])
void void
chownpwgr(const char *path) chownpwgr(const char *path)
{ {
if(chown(path, pw ? pw->pw_uid : (uid_t)-1, if(chown(path, uid, gid) == -1) {
gr ? gr->gr_gid : (gid_t)-1) == -1) {
weprintf("chown %s:", path); weprintf("chown %s:", path);
ret = 1; ret = 1;
} }