diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 16:38:18 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 17:09:40 +0200 |
commit | 036585a911a5fe6c2cd77b808dd9150500f37272 (patch) | |
tree | aa7c65b4d09c74642f622a1ef5da982d6ed4940a /loginutils | |
parent | 00677b5e35dd97f415f0b0bef25b55865f55ab33 (diff) | |
download | busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.tar.gz busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.tar.bz2 busybox-w32-036585a911a5fe6c2cd77b808dd9150500f37272.zip |
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 <vda.linux@googlemail.com>
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 @@ | |||
12 | //config:config ADDGROUP | 12 | //config:config ADDGROUP |
13 | //config: bool "addgroup (8.2 kb)" | 13 | //config: bool "addgroup (8.2 kb)" |
14 | //config: default y | 14 | //config: default y |
15 | //config: select LONG_OPTS | ||
15 | //config: help | 16 | //config: help |
16 | //config: Utility for creating a new group account. | 17 | //config: Utility for creating a new group account. |
17 | //config: | 18 | //config: |
18 | //config:config FEATURE_ADDGROUP_LONG_OPTIONS | ||
19 | //config: bool "Enable long options" | ||
20 | //config: default y | ||
21 | //config: depends on ADDGROUP && LONG_OPTS | ||
22 | //config: | ||
23 | //config:config FEATURE_ADDUSER_TO_GROUP | 19 | //config:config FEATURE_ADDUSER_TO_GROUP |
24 | //config: bool "Support adding users to groups" | 20 | //config: bool "Support adding users to groups" |
25 | //config: default y | 21 | //config: default y |
@@ -131,12 +127,11 @@ static void new_group(char *group, gid_t gid) | |||
131 | #endif | 127 | #endif |
132 | } | 128 | } |
133 | 129 | ||
134 | #if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS | 130 | //FIXME: upstream addgroup has no short options! NOT COMPATIBLE! |
135 | static const char addgroup_longopts[] ALIGN1 = | 131 | static const char addgroup_longopts[] ALIGN1 = |
136 | "gid\0" Required_argument "g" | 132 | "gid\0" Required_argument "g" |
137 | "system\0" No_argument "S" | 133 | "system\0" No_argument "S" |
138 | ; | 134 | ; |
139 | #endif | ||
140 | 135 | ||
141 | /* | 136 | /* |
142 | * addgroup will take a login_name as its first parameter. | 137 | * addgroup will take a login_name as its first parameter. |
@@ -155,16 +150,13 @@ int addgroup_main(int argc UNUSED_PARAM, char **argv) | |||
155 | if (geteuid()) { | 150 | if (geteuid()) { |
156 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 151 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); |
157 | } | 152 | } |
158 | #if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS | ||
159 | applet_long_options = addgroup_longopts; | ||
160 | #endif | ||
161 | /* Syntax: | 153 | /* Syntax: |
162 | * addgroup group | 154 | * addgroup group |
163 | * addgroup -g num group | 155 | * addgroup -g num group |
164 | * addgroup user group | 156 | * addgroup user group |
165 | * Check for min, max and missing args */ | 157 | * Check for min, max and missing args */ |
166 | opt_complementary = "-1:?2"; | 158 | opt_complementary = "-1:?2"; |
167 | opts = getopt32(argv, "g:S", &gid); | 159 | opts = getopt32long(argv, "g:S", addgroup_longopts, &gid); |
168 | /* move past the commandline options */ | 160 | /* move past the commandline options */ |
169 | argv += optind; | 161 | argv += optind; |
170 | //argc -= optind; | 162 | //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 @@ | |||
10 | //config:config ADDUSER | 10 | //config:config ADDUSER |
11 | //config: bool "adduser (15 kb)" | 11 | //config: bool "adduser (15 kb)" |
12 | //config: default y | 12 | //config: default y |
13 | //config: select LONG_OPTS | ||
13 | //config: help | 14 | //config: help |
14 | //config: Utility for creating a new user account. | 15 | //config: Utility for creating a new user account. |
15 | //config: | 16 | //config: |
16 | //config:config FEATURE_ADDUSER_LONG_OPTIONS | ||
17 | //config: bool "Enable long options" | ||
18 | //config: default y | ||
19 | //config: depends on ADDUSER && LONG_OPTS | ||
20 | //config: | ||
21 | //config:config FEATURE_CHECK_NAMES | 17 | //config:config FEATURE_CHECK_NAMES |
22 | //config: bool "Enable sanity check on user/group names in adduser and addgroup" | 18 | //config: bool "Enable sanity check on user/group names in adduser and addgroup" |
23 | //config: default n | 19 | //config: default n |
@@ -148,15 +144,7 @@ static int addgroup_wrapper(struct passwd *p, const char *group_name) | |||
148 | /* Add user to his own group with the first free gid | 144 | /* Add user to his own group with the first free gid |
149 | * found in passwd_study. | 145 | * found in passwd_study. |
150 | */ | 146 | */ |
151 | #if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS || !ENABLE_ADDGROUP | ||
152 | /* We try to use --gid, not -g, because "standard" addgroup | ||
153 | * has no short option -g, it has only long --gid. | ||
154 | */ | ||
155 | argv[1] = (char*)"--gid"; | 147 | argv[1] = (char*)"--gid"; |
156 | #else | ||
157 | /* Breaks if system in fact does NOT use busybox addgroup */ | ||
158 | argv[1] = (char*)"-g"; | ||
159 | #endif | ||
160 | argv[2] = utoa(p->pw_gid); | 148 | argv[2] = utoa(p->pw_gid); |
161 | argv[3] = (char*)"--"; | 149 | argv[3] = (char*)"--"; |
162 | argv[4] = p->pw_name; | 150 | argv[4] = p->pw_name; |
@@ -174,7 +162,7 @@ static void passwd_wrapper(const char *login_name) | |||
174 | bb_error_msg_and_die("can't execute passwd, you must set password manually"); | 162 | bb_error_msg_and_die("can't execute passwd, you must set password manually"); |
175 | } | 163 | } |
176 | 164 | ||
177 | #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS | 165 | //FIXME: upstream adduser has no short options! NOT COMPATIBLE! |
178 | static const char adduser_longopts[] ALIGN1 = | 166 | static const char adduser_longopts[] ALIGN1 = |
179 | "home\0" Required_argument "h" | 167 | "home\0" Required_argument "h" |
180 | "gecos\0" Required_argument "g" | 168 | "gecos\0" Required_argument "g" |
@@ -187,7 +175,6 @@ static const char adduser_longopts[] ALIGN1 = | |||
187 | "uid\0" Required_argument "u" | 175 | "uid\0" Required_argument "u" |
188 | "skel\0" Required_argument "k" | 176 | "skel\0" Required_argument "k" |
189 | ; | 177 | ; |
190 | #endif | ||
191 | 178 | ||
192 | /* | 179 | /* |
193 | * adduser will take a login_name as its first parameter. | 180 | * adduser will take a login_name as its first parameter. |
@@ -204,10 +191,6 @@ int adduser_main(int argc UNUSED_PARAM, char **argv) | |||
204 | char *uid; | 191 | char *uid; |
205 | const char *skel = "/etc/skel"; | 192 | const char *skel = "/etc/skel"; |
206 | 193 | ||
207 | #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS | ||
208 | applet_long_options = adduser_longopts; | ||
209 | #endif | ||
210 | |||
211 | /* got root? */ | 194 | /* got root? */ |
212 | if (geteuid()) { | 195 | if (geteuid()) { |
213 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 196 | 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) | |||
221 | /* at least one and at most two non-option args */ | 204 | /* at least one and at most two non-option args */ |
222 | /* disable interactive passwd for system accounts */ | 205 | /* disable interactive passwd for system accounts */ |
223 | opt_complementary = "-1:?2:SD"; | 206 | opt_complementary = "-1:?2:SD"; |
224 | opts = getopt32(argv, "h:g:s:G:DSHu:k:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid, &skel); | 207 | opts = getopt32long(argv, "h:g:s:G:DSHu:k:", adduser_longopts, |
208 | &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, | ||
209 | &usegroup, &uid, &skel); | ||
225 | if (opts & OPT_UID) | 210 | if (opts & OPT_UID) |
226 | pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID); | 211 | pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID); |
227 | 212 | ||
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) | |||
62 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 62 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); |
63 | 63 | ||
64 | opt_complementary = "m--ec:e--mc:c--em"; | 64 | opt_complementary = "m--ec:e--mc:c--em"; |
65 | IF_LONG_OPTS(applet_long_options = chpasswd_longopts;) | 65 | opt = getopt32long(argv, "emc:", chpasswd_longopts, &algo); |
66 | opt = getopt32(argv, "emc:", &algo); | ||
67 | 66 | ||
68 | while ((name = xmalloc_fgetline(stdin)) != NULL) { | 67 | while ((name = xmalloc_fgetline(stdin)) != NULL) { |
69 | char *free_me; | 68 | 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) | |||
106 | "salt\0" Required_argument "S" | 106 | "salt\0" Required_argument "S" |
107 | "method\0" Required_argument "m" | 107 | "method\0" Required_argument "m" |
108 | ; | 108 | ; |
109 | applet_long_options = mkpasswd_longopts; | ||
110 | #endif | 109 | #endif |
111 | fd = STDIN_FILENO; | 110 | fd = STDIN_FILENO; |
112 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; | 111 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; |
113 | opt_S = NULL; | 112 | opt_S = NULL; |
114 | /* at most two non-option arguments; -P NUM */ | 113 | /* at most two non-option arguments; -P NUM */ |
115 | opt_complementary = "?2"; | 114 | opt_complementary = "?2"; |
116 | getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m); | 115 | getopt32long(argv, "sP:+S:m:a:", mkpasswd_longopts, |
116 | &fd, &opt_S, &opt_m, &opt_m); | ||
117 | argv += optind; | 117 | argv += optind; |
118 | 118 | ||
119 | /* have no idea how to handle -s... */ | 119 | /* 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) | |||
68 | #else | 68 | #else |
69 | int opt_delhome = 0; | 69 | int opt_delhome = 0; |
70 | if (do_deluser) { | 70 | if (do_deluser) { |
71 | applet_long_options = | 71 | opt_delhome = getopt32long(argv, "", |
72 | "remove-home\0" No_argument "\xff"; | 72 | "remove-home\0" No_argument "\xff"); |
73 | opt_delhome = getopt32(argv, ""); | ||
74 | argv += opt_delhome; | 73 | argv += opt_delhome; |
75 | argc -= opt_delhome; | 74 | argc -= opt_delhome; |
76 | } | 75 | } |