diff options
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/addgroup.c | 14 | ||||
| -rw-r--r-- | loginutils/adduser.c | 25 | ||||
| -rw-r--r-- | loginutils/chpasswd.c | 3 | ||||
| -rw-r--r-- | loginutils/cryptpw.c | 4 | ||||
| -rw-r--r-- | loginutils/deluser.c | 5 |
5 files changed, 13 insertions, 38 deletions
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index 30f7e72dc..5a2b04352 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c @@ -12,14 +12,10 @@ //config:config ADDGROUP //config: bool "addgroup (8.2 kb)" //config: default y +//config: select LONG_OPTS //config: help //config: Utility for creating a new group account. //config: -//config:config FEATURE_ADDGROUP_LONG_OPTIONS -//config: bool "Enable long options" -//config: default y -//config: depends on ADDGROUP && LONG_OPTS -//config: //config:config FEATURE_ADDUSER_TO_GROUP //config: bool "Support adding users to groups" //config: default y @@ -131,12 +127,11 @@ static void new_group(char *group, gid_t gid) #endif } -#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS +//FIXME: upstream addgroup has no short options! NOT COMPATIBLE! static const char addgroup_longopts[] ALIGN1 = "gid\0" Required_argument "g" "system\0" No_argument "S" ; -#endif /* * addgroup will take a login_name as its first parameter. @@ -155,16 +150,13 @@ int addgroup_main(int argc UNUSED_PARAM, char **argv) if (geteuid()) { bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); } -#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS - applet_long_options = addgroup_longopts; -#endif /* Syntax: * addgroup group * addgroup -g num group * addgroup user group * Check for min, max and missing args */ opt_complementary = "-1:?2"; - opts = getopt32(argv, "g:S", &gid); + opts = getopt32long(argv, "g:S", addgroup_longopts, &gid); /* move past the commandline options */ argv += optind; //argc -= optind; diff --git a/loginutils/adduser.c b/loginutils/adduser.c index 913dbaf83..8b92df923 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -10,14 +10,10 @@ //config:config ADDUSER //config: bool "adduser (15 kb)" //config: default y +//config: select LONG_OPTS //config: help //config: Utility for creating a new user account. //config: -//config:config FEATURE_ADDUSER_LONG_OPTIONS -//config: bool "Enable long options" -//config: default y -//config: depends on ADDUSER && LONG_OPTS -//config: //config:config FEATURE_CHECK_NAMES //config: bool "Enable sanity check on user/group names in adduser and addgroup" //config: default n @@ -148,15 +144,7 @@ static int addgroup_wrapper(struct passwd *p, const char *group_name) /* Add user to his own group with the first free gid * found in passwd_study. */ -#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS || !ENABLE_ADDGROUP - /* We try to use --gid, not -g, because "standard" addgroup - * has no short option -g, it has only long --gid. - */ argv[1] = (char*)"--gid"; -#else - /* Breaks if system in fact does NOT use busybox addgroup */ - argv[1] = (char*)"-g"; -#endif argv[2] = utoa(p->pw_gid); argv[3] = (char*)"--"; argv[4] = p->pw_name; @@ -174,7 +162,7 @@ static void passwd_wrapper(const char *login_name) bb_error_msg_and_die("can't execute passwd, you must set password manually"); } -#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS +//FIXME: upstream adduser has no short options! NOT COMPATIBLE! static const char adduser_longopts[] ALIGN1 = "home\0" Required_argument "h" "gecos\0" Required_argument "g" @@ -187,7 +175,6 @@ static const char adduser_longopts[] ALIGN1 = "uid\0" Required_argument "u" "skel\0" Required_argument "k" ; -#endif /* * adduser will take a login_name as its first parameter. @@ -204,10 +191,6 @@ int adduser_main(int argc UNUSED_PARAM, char **argv) char *uid; const char *skel = "/etc/skel"; -#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS - applet_long_options = adduser_longopts; -#endif - /* got root? */ if (geteuid()) { bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); @@ -221,7 +204,9 @@ int adduser_main(int argc UNUSED_PARAM, char **argv) /* at least one and at most two non-option args */ /* disable interactive passwd for system accounts */ opt_complementary = "-1:?2:SD"; - opts = getopt32(argv, "h:g:s:G:DSHu:k:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid, &skel); + opts = getopt32long(argv, "h:g:s:G:DSHu:k:", adduser_longopts, + &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, + &usegroup, &uid, &skel); if (opts & OPT_UID) pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID); diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index e390da647..3c9ed68b9 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c @@ -62,8 +62,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv) bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); opt_complementary = "m--ec:e--mc:c--em"; - IF_LONG_OPTS(applet_long_options = chpasswd_longopts;) - opt = getopt32(argv, "emc:", &algo); + opt = getopt32long(argv, "emc:", chpasswd_longopts, &algo); while ((name = xmalloc_fgetline(stdin)) != NULL) { char *free_me; diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 136c619bb..c10a0c8bd 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -106,14 +106,14 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) "salt\0" Required_argument "S" "method\0" Required_argument "m" ; - applet_long_options = mkpasswd_longopts; #endif fd = STDIN_FILENO; opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; opt_S = NULL; /* at most two non-option arguments; -P NUM */ opt_complementary = "?2"; - getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m); + getopt32long(argv, "sP:+S:m:a:", mkpasswd_longopts, + &fd, &opt_S, &opt_m, &opt_m); argv += optind; /* have no idea how to handle -s... */ diff --git a/loginutils/deluser.c b/loginutils/deluser.c index f5bc3c28a..5ee22d4f1 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -68,9 +68,8 @@ int deluser_main(int argc, char **argv) #else int opt_delhome = 0; if (do_deluser) { - applet_long_options = - "remove-home\0" No_argument "\xff"; - opt_delhome = getopt32(argv, ""); + opt_delhome = getopt32long(argv, "", + "remove-home\0" No_argument "\xff"); argv += opt_delhome; argc -= opt_delhome; } |