X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=chmod_chown_chgrp.c;h=9714e1ca57ed84a017dfe1294dc23e137f4c93bf;hb=a283157c3832f151fa9f5abf5f18c56d05e5815d;hp=a458cf77a170d324048387f1dd33b2115b9d62d7;hpb=cbe31dace5fb24304694d399b9eb267fbe752516;p=oweals%2Fbusybox.git diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c index a458cf77a..9714e1ca5 100644 --- a/chmod_chown_chgrp.c +++ b/chmod_chown_chgrp.c @@ -49,6 +49,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk) switch (whichApp) { case CHGRP_APP: case CHOWN_APP: + /* Don't use lchown for libc5 or glibc older then 2.1.x */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) if (lchown (fileName, (whichApp == CHOWN_APP) ? uid : statbuf->st_uid, @@ -122,8 +123,6 @@ int chmod_chown_chgrp_main(int argc, char **argv) gid = strtoul(groupName, &p, 10); /* maybe it's already numeric */ if (groupName == p) gid = my_getgrnam(groupName); - if (gid == -1) - goto bad_group; } else { groupName = strchr(*argv, '.'); if (groupName == NULL) @@ -133,8 +132,6 @@ int chmod_chown_chgrp_main(int argc, char **argv) gid = strtoul(groupName, &p, 10); if (groupName == p) gid = my_getgrnam(groupName); - if (gid == -1) - goto bad_group; } else gid = -1; } @@ -145,9 +142,6 @@ int chmod_chown_chgrp_main(int argc, char **argv) uid = strtoul(*argv, &p, 10); /* if numeric ... */ if (*argv == p) uid = my_getpwnam(*argv); - if (uid == -1) { - error_msg_and_die( "unknown user name: %s", *argv); - } } } @@ -162,8 +156,6 @@ int chmod_chown_chgrp_main(int argc, char **argv) } return EXIT_SUCCESS; - bad_group: - error_msg_and_die( "unknown group name: %s", groupName); } /*