From 036585a911a5fe6c2cd77b808dd9150500f37272 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Aug 2017 16:38:18 +0200 Subject: getopt32: remove applet_long_options FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !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 xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko --- loginutils/addgroup.c | 14 +++----------- loginutils/adduser.c | 25 +++++-------------------- loginutils/chpasswd.c | 3 +-- loginutils/cryptpw.c | 4 ++-- loginutils/deluser.c | 5 ++--- 5 files changed, 13 insertions(+), 38 deletions(-) (limited to 'loginutils') 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; } -- cgit v1.2.3