diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-26 22:47:42 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-26 22:47:42 +0000 |
| commit | cce38586aee7fe892ca1c837ee08a96bd3454ee9 (patch) | |
| tree | 2cce1db0f921fdc3e899641dd9c59f459ce4b07d /coreutils | |
| parent | f8ea0f3a66559a00c41fd7877bdc241973a60f8c (diff) | |
| download | busybox-w32-cce38586aee7fe892ca1c837ee08a96bd3454ee9.tar.gz busybox-w32-cce38586aee7fe892ca1c837ee08a96bd3454ee9.tar.bz2 busybox-w32-cce38586aee7fe892ca1c837ee08a96bd3454ee9.zip | |
start_stop_daemon: add -chuid support
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/chown.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/coreutils/chown.c b/coreutils/chown.c index dad5ce063..3380677bc 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
| @@ -56,7 +56,6 @@ static int fileAction(const char *fileName, struct stat *statbuf, | |||
| 56 | int chown_main(int argc, char **argv); | 56 | int chown_main(int argc, char **argv); |
| 57 | int chown_main(int argc, char **argv) | 57 | int chown_main(int argc, char **argv) |
| 58 | { | 58 | { |
| 59 | char *groupName; | ||
| 60 | int retval = EXIT_SUCCESS; | 59 | int retval = EXIT_SUCCESS; |
| 61 | 60 | ||
| 62 | opt_complementary = "-2"; | 61 | opt_complementary = "-2"; |
| @@ -65,24 +64,7 @@ int chown_main(int argc, char **argv) | |||
| 65 | 64 | ||
| 66 | if (OPT_NODEREF) chown_func = lchown; | 65 | if (OPT_NODEREF) chown_func = lchown; |
| 67 | 66 | ||
| 68 | /* First, check if there is a group name here */ | 67 | parse_chown_usergroup_or_die(&ugid, argv[0]); |
| 69 | groupName = strchr(*argv, '.'); /* deprecated? */ | ||
| 70 | if (!groupName) | ||
| 71 | groupName = strchr(*argv, ':'); | ||
| 72 | else | ||
| 73 | *groupName = ':'; /* replace '.' with ':' */ | ||
| 74 | |||
| 75 | /* First, try parsing "user[:[group]]" */ | ||
| 76 | if (!groupName) { /* "user" */ | ||
| 77 | ugid.uid = get_ug_id(*argv, xuname2uid); | ||
| 78 | } else if (groupName == *argv) { /* ":group" */ | ||
| 79 | ugid.gid = get_ug_id(groupName + 1, xgroup2gid); | ||
| 80 | } else { | ||
| 81 | if (!groupName[1]) /* "user:" */ | ||
| 82 | *groupName = '\0'; | ||
| 83 | if (!get_uidgid(&ugid, *argv, 1)) | ||
| 84 | bb_error_msg_and_die("unknown user/group %s", *argv); | ||
| 85 | } | ||
| 86 | 68 | ||
| 87 | /* Ok, ready to do the deed now */ | 69 | /* Ok, ready to do the deed now */ |
| 88 | argv++; | 70 | argv++; |
