2001-03-17 04:17:14 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
2006-10-04 02:30:06 +05:30
|
|
|
* universal getopt32 implementation for busybox
|
2001-03-17 04:17:14 +05:30
|
|
|
*
|
2005-09-05 20:16:07 +05:30
|
|
|
* Copyright (C) 2003-2005 Vladimir Oleynik <dzo@simtreas.ru>
|
2001-03-17 04:17:14 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2001-03-17 04:17:14 +05:30
|
|
|
*/
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#if ENABLE_LONG_OPTS
|
2011-05-29 07:54:13 +05:30
|
|
|
# include <getopt.h>
|
|
|
|
#endif
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2001-03-17 04:17:14 +05:30
|
|
|
|
2017-08-04 19:53:42 +05:30
|
|
|
//kbuild:lib-y += getopt32.o
|
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
/* Documentation
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-10-04 02:30:06 +05:30
|
|
|
uint32_t
|
2007-08-18 21:02:12 +05:30
|
|
|
getopt32(char **argv, const char *applet_opts, ...)
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
The command line options are passed as the applet_opts string.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
If one of the given options is found, a flag value is added to
|
2016-07-07 01:28:02 +05:30
|
|
|
the return value.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
The flag value is determined by the position of the char in
|
2016-07-07 01:28:02 +05:30
|
|
|
applet_opts string. For example:
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2007-08-18 21:02:12 +05:30
|
|
|
flags = getopt32(argv, "rnug");
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"r" will set 1 (bit 0)
|
|
|
|
"n" will set 2 (bit 1)
|
|
|
|
"u" will set 4 (bit 2)
|
|
|
|
"g" will set 8 (bit 3)
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
and so on. You can also look at the return value as a bit
|
|
|
|
field and each option sets one bit.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
On exit, global variable optind is set so that if you
|
|
|
|
will do argc -= optind; argv += optind; then
|
|
|
|
argc will be equal to number of remaining non-option
|
|
|
|
arguments, first one would be in argv[0], next in argv[1] and so on
|
|
|
|
(options and their parameters will be moved into argv[]
|
|
|
|
positions prior to argv[optind]).
|
2006-09-03 17:57:25 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o:" If one of the options requires an argument, then add a ":"
|
2006-09-29 19:26:58 +05:30
|
|
|
after the char in applet_opts and provide a pointer to store
|
|
|
|
the argument. For example:
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
char *pointer_to_arg_for_a;
|
|
|
|
char *pointer_to_arg_for_b;
|
|
|
|
char *pointer_to_arg_for_c;
|
|
|
|
char *pointer_to_arg_for_d;
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2007-08-18 21:02:12 +05:30
|
|
|
flags = getopt32(argv, "a:b:c:d:",
|
2007-08-16 16:05:17 +05:30
|
|
|
&pointer_to_arg_for_a, &pointer_to_arg_for_b,
|
|
|
|
&pointer_to_arg_for_c, &pointer_to_arg_for_d);
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
The type of the pointer may be controlled by "o::" or "o+" in
|
|
|
|
the external string opt_complementary (see below for more info).
|
2006-09-29 19:26:58 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o::" If option can have an *optional* argument, then add a "::"
|
2006-09-29 19:26:58 +05:30
|
|
|
after its char in applet_opts and provide a pointer to store
|
|
|
|
the argument. Note that optional arguments _must_
|
|
|
|
immediately follow the option: -oparam, not -o param.
|
2005-05-11 05:18:35 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o:+" This means that the parameter for this option is a nonnegative integer.
|
|
|
|
It will be processed with xatoi_positive() - allowed range
|
|
|
|
is 0..INT_MAX.
|
|
|
|
|
|
|
|
int param; // "unsigned param;" will also work
|
|
|
|
getopt32(argv, "p:+", ¶m);
|
|
|
|
|
|
|
|
"o:*" This means that the option can occur multiple times. Each occurrence
|
|
|
|
will be saved as a llist_t element instead of char*.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
The grep applet can have one or more "-e pattern" arguments.
|
|
|
|
In this case you should use getopt32() as follows:
|
|
|
|
|
|
|
|
llist_t *patterns = NULL;
|
|
|
|
|
|
|
|
(this pointer must be initializated to NULL if the list is empty
|
|
|
|
as required by llist_add_to_end(llist_t **old_head, char *new_item).)
|
|
|
|
|
|
|
|
getopt32(argv, "e:*", &patterns);
|
|
|
|
|
|
|
|
$ grep -e user -e root /etc/passwd
|
|
|
|
root:x:0:0:root:/root:/bin/bash
|
|
|
|
user:x:500:500::/home/user:/bin/bash
|
|
|
|
|
2006-02-23 04:26:30 +05:30
|
|
|
"+" If the first character in the applet_opts string is a plus,
|
2006-09-29 19:26:58 +05:30
|
|
|
then option processing will stop as soon as a non-option is
|
|
|
|
encountered in the argv array. Useful for applets like env
|
|
|
|
which should not process arguments to subprograms:
|
|
|
|
env -i ls -d /
|
|
|
|
Here we want env to process just the '-i', not the '-d'.
|
2006-02-23 04:26:30 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
"!" Report bad options, missing required options,
|
2009-04-27 04:52:40 +05:30
|
|
|
inconsistent options with all-ones return value (instead of abort).
|
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
"^" options string is "^optchars""\0""opt_complementary".
|
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
uint32_t
|
|
|
|
getopt32long(char **argv, const char *applet_opts, const char *logopts...)
|
2005-05-11 05:18:35 +05:30
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
This allows you to define long options:
|
2005-05-11 05:18:35 +05:30
|
|
|
|
2007-08-13 02:28:27 +05:30
|
|
|
static const char applet_longopts[] ALIGN1 =
|
2016-07-07 01:28:02 +05:30
|
|
|
//"name\0" has_arg val
|
2011-02-03 04:35:48 +05:30
|
|
|
"verbose\0" No_argument "v"
|
|
|
|
;
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
opt = getopt32long(argv, applet_opts, applet_longopts, ...);
|
2005-05-11 05:18:35 +05:30
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
The last element (val) typically is set to
|
2006-09-29 19:26:58 +05:30
|
|
|
matching short option from applet_opts. If there is no matching
|
|
|
|
char in applet_opts, then:
|
2016-07-07 01:28:02 +05:30
|
|
|
- return bit has next position after short options
|
2007-07-23 22:44:14 +05:30
|
|
|
- if has_arg is not "No_argument", use ptr for arg also
|
2006-10-04 02:30:06 +05:30
|
|
|
- opt_complementary affects it too
|
2005-05-11 05:32:39 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
Note: a good applet will make long options configurable via the
|
|
|
|
config process and not a required feature. The current standard
|
|
|
|
is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
|
2005-05-11 05:32:39 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
opt_complementary - option modifiers.
|
2005-05-11 05:32:39 +05:30
|
|
|
|
2005-09-05 20:16:07 +05:30
|
|
|
":" The colon (":") is used to separate groups of two or more chars
|
2006-09-29 19:26:58 +05:30
|
|
|
and/or groups of chars and special characters (stating some
|
|
|
|
conditions to be checked).
|
2005-05-11 05:18:35 +05:30
|
|
|
|
2005-09-05 20:16:07 +05:30
|
|
|
"abc" If groups of two or more chars are specified, the first char
|
2006-09-29 19:26:58 +05:30
|
|
|
is the main option and the other chars are secondary options.
|
|
|
|
Their flags will be turned on if the main option is found even
|
2017-04-17 19:43:32 +05:30
|
|
|
if they are not specified on the command line. For example:
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
flags = getopt32(argv, "^abcd""\0""abc")
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
If getopt() finds "-a" on the command line, then
|
2006-10-04 02:30:06 +05:30
|
|
|
getopt32's return value will be as if "-a -b -c" were
|
2006-09-29 19:26:58 +05:30
|
|
|
found.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2005-10-05 17:53:13 +05:30
|
|
|
"ww" Adjacent double options have a counter associated which indicates
|
2010-11-22 22:43:15 +05:30
|
|
|
the number of occurrences of the option.
|
2006-09-29 19:26:58 +05:30
|
|
|
For example the ps applet needs:
|
|
|
|
if w is given once, GNU ps sets the width to 132,
|
|
|
|
if w is given more than once, it is "unlimited"
|
|
|
|
|
2008-03-17 14:39:09 +05:30
|
|
|
int w_counter = 0; // must be initialized!
|
2017-08-09 01:25:02 +05:30
|
|
|
getopt32(argv, "^w""\0""ww", &w_counter);
|
2006-09-29 19:26:58 +05:30
|
|
|
if (w_counter)
|
2007-08-16 16:05:17 +05:30
|
|
|
width = (w_counter == 1) ? 132 : INT_MAX;
|
2006-09-29 19:26:58 +05:30
|
|
|
else
|
2007-08-16 16:05:17 +05:30
|
|
|
get_terminal_width(...&width...);
|
2006-09-29 19:26:58 +05:30
|
|
|
|
|
|
|
w_counter is a pointer to an integer. It has to be passed to
|
2006-10-04 02:30:06 +05:30
|
|
|
getopt32() after all other option argument sinks.
|
2006-09-29 19:26:58 +05:30
|
|
|
|
|
|
|
For example: accept multiple -v to indicate the level of verbosity
|
|
|
|
and for each -b optarg, add optarg to my_b. Finally, if b is given,
|
|
|
|
turn off c and vice versa:
|
|
|
|
|
|
|
|
llist_t *my_b = NULL;
|
|
|
|
int verbose_level = 0;
|
2017-08-09 01:25:02 +05:30
|
|
|
f = getopt32(argv, "^vb:*c"
|
|
|
|
"\0""vv:b-c:c-b"
|
|
|
|
, &my_b, &verbose_level);
|
2006-09-29 19:26:58 +05:30
|
|
|
if (f & 2) // -c after -b unsets -b flag
|
2008-06-15 11:10:56 +05:30
|
|
|
while (my_b) dosomething_with(llist_pop(&my_b));
|
2006-09-29 19:26:58 +05:30
|
|
|
if (my_b) // but llist is stored if -b is specified
|
2007-08-16 16:05:17 +05:30
|
|
|
free_llist(my_b);
|
2006-10-27 04:51:47 +05:30
|
|
|
if (verbose_level) printf("verbose level is %d\n", verbose_level);
|
2005-10-04 22:18:26 +05:30
|
|
|
|
2005-04-19 04:12:58 +05:30
|
|
|
Special characters:
|
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
"-N" A dash as the first char in a opt_complementary group followed
|
|
|
|
by a single digit (0-9) means that at least N non-option
|
|
|
|
arguments must be present on the command line
|
|
|
|
|
|
|
|
"=N" An equal sign as the first char in a opt_complementary group followed
|
|
|
|
by a single digit (0-9) means that exactly N non-option
|
|
|
|
arguments must be present on the command line
|
|
|
|
|
|
|
|
"?N" A "?" as the first char in a opt_complementary group followed
|
|
|
|
by a single digit (0-9) means that at most N arguments must be present
|
|
|
|
on the command line.
|
|
|
|
|
|
|
|
"V-" An option with dash before colon or end-of-line results in
|
2008-08-20 05:42:22 +05:30
|
|
|
bb_show_usage() being called if this option is encountered.
|
2006-11-25 03:24:44 +05:30
|
|
|
This is typically used to implement "print verbose usage message
|
|
|
|
and exit" option.
|
|
|
|
|
2007-08-25 03:16:24 +05:30
|
|
|
"a-b" A dash between two options causes the second of the two
|
2006-09-29 19:26:58 +05:30
|
|
|
to be unset (and ignored) if it is given on the command line.
|
2006-05-04 02:53:15 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
[FIXME: what if they are the same? like "x-x"? Is it ever useful?]
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
For example:
|
|
|
|
The du applet has the options "-s" and "-d depth". If
|
2006-10-04 02:30:06 +05:30
|
|
|
getopt32 finds -s, then -d is unset or if it finds -d
|
2006-09-29 19:26:58 +05:30
|
|
|
then -s is unset. (Note: busybox implements the GNU
|
|
|
|
"--max-depth" option as "-d".) To obtain this behavior, you
|
2017-08-09 01:25:02 +05:30
|
|
|
set opt_complementary to "s-d:d-s". Only one flag value is
|
2006-10-04 02:30:06 +05:30
|
|
|
added to getopt32's return value depending on the
|
2006-09-29 19:26:58 +05:30
|
|
|
position of the options on the command line. If one of the
|
|
|
|
two options requires an argument pointer (":" in applet_opts
|
|
|
|
as in "d:") optarg is set accordingly.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
char *smax_print_depth;
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32(argv, "^sd:x""\0""s-d:d-s:x-x", &smax_print_depth);
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
if (opt & 2)
|
2007-08-16 16:05:17 +05:30
|
|
|
max_print_depth = atoi(smax_print_depth);
|
2006-09-29 19:26:58 +05:30
|
|
|
if (opt & 4)
|
2007-08-16 16:05:17 +05:30
|
|
|
printf("Detected odd -x usage\n");
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2007-08-25 03:16:24 +05:30
|
|
|
"a--b" A double dash between two options, or between an option and a group
|
2006-09-29 19:26:58 +05:30
|
|
|
of options, means that they are mutually exclusive. Unlike
|
|
|
|
the "-" case above, an error will be forced if the options
|
|
|
|
are used together.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
The cut applet must have only one type of list specified, so
|
2007-08-16 16:07:49 +05:30
|
|
|
-b, -c and -f are mutually exclusive and should raise an error
|
2006-09-29 19:26:58 +05:30
|
|
|
if specified together. In this case you must set
|
2017-08-09 01:25:02 +05:30
|
|
|
opt_complementary to "b--cf:c--bf:f--bc". If two of the
|
2007-07-21 18:57:44 +05:30
|
|
|
mutually exclusive options are found, getopt32 will call
|
2011-02-03 04:35:48 +05:30
|
|
|
bb_show_usage() and die.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 13:53:42 +05:30
|
|
|
"x--x" Variation of the above, it means that -x option should occur
|
2006-09-29 19:26:58 +05:30
|
|
|
at most once.
|
2006-09-29 13:53:42 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o+" A plus after a char in opt_complementary means that the parameter
|
2008-02-11 01:14:20 +05:30
|
|
|
for this option is a nonnegative integer. It will be processed
|
2010-08-12 17:44:45 +05:30
|
|
|
with xatoi_positive() - allowed range is 0..INT_MAX.
|
2008-02-11 01:14:20 +05:30
|
|
|
|
|
|
|
int param; // "unsigned param;" will also work
|
2017-08-09 01:25:02 +05:30
|
|
|
getopt32(argv, "^p:""\0""p+", ¶m);
|
2008-02-11 01:14:20 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o::" A double colon after a char in opt_complementary means that the
|
2006-09-29 19:26:58 +05:30
|
|
|
option can occur multiple times. Each occurrence will be saved as
|
|
|
|
a llist_t element instead of char*.
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
For example:
|
|
|
|
The grep applet can have one or more "-e pattern" arguments.
|
2006-10-04 02:30:06 +05:30
|
|
|
In this case you should use getopt32() as follows:
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
llist_t *patterns = NULL;
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
(this pointer must be initializated to NULL if the list is empty
|
2007-04-08 20:38:42 +05:30
|
|
|
as required by llist_add_to_end(llist_t **old_head, char *new_item).)
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
getopt32(argv, "^e:""\0""e::", &patterns);
|
2016-07-07 01:28:02 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
$ grep -e user -e root /etc/passwd
|
|
|
|
root:x:0:0:root:/root:/bin/bash
|
|
|
|
user:x:500:500::/home/user:/bin/bash
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
"o+" and "o::" can be handled by "o:+" and "o:*" specifiers
|
|
|
|
in option string (and it is preferred), but this does not work
|
|
|
|
for "long options only" cases, such as tar --exclude=PATTERN,
|
|
|
|
wget --header=HDR cases.
|
|
|
|
|
2007-08-25 03:16:24 +05:30
|
|
|
"a?b" A "?" between an option and a group of options means that
|
2006-09-29 19:26:58 +05:30
|
|
|
at least one of them is required to occur if the first option
|
|
|
|
occurs in preceding command line arguments.
|
2006-05-04 02:53:15 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
For example from "id" applet:
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
// Don't allow -n -r -rn -ug -rug -nug -rnug
|
2017-08-09 01:25:02 +05:30
|
|
|
flags = getopt32(argv, "^rnug""\0""r?ug:n?ug:u--g:g--u");
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
This example allowed only:
|
|
|
|
$ id; id -u; id -g; id -ru; id -nu; id -rg; id -ng; id -rnu; id -rng
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2006-10-04 02:30:06 +05:30
|
|
|
"X" A opt_complementary group with just a single letter means
|
2006-09-29 19:26:58 +05:30
|
|
|
that this option is required. If more than one such group exists,
|
|
|
|
at least one option is required to occur (not all of them).
|
|
|
|
For example from "start-stop-daemon" applet:
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
// Don't allow -KS -SK, but -S or -K is required
|
2017-08-09 01:25:02 +05:30
|
|
|
flags = getopt32(argv, "^KS...""\0""K:S:K--S:S--K");
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2005-10-14 15:26:52 +05:30
|
|
|
|
2006-09-29 19:26:58 +05:30
|
|
|
Don't forget to use ':'. For example, "?322-22-23X-x-a"
|
|
|
|
is interpreted as "?3:22:-2:2-2:2-3Xa:2--x" -
|
|
|
|
max 3 args; count uses of '-2'; min 2 args; if there is
|
|
|
|
a '-2' option then unset '-3', '-X' and '-a'; if there is
|
|
|
|
a '-2' and after it a '-x' then error out.
|
2007-08-25 23:55:24 +05:30
|
|
|
But it's far too obfuscated. Use ':' to separate groups.
|
2003-06-20 14:31:58 +05:30
|
|
|
*/
|
|
|
|
|
2006-10-04 02:30:06 +05:30
|
|
|
/* Code here assumes that 'unsigned' is at least 32 bits wide */
|
|
|
|
|
2008-03-17 14:37:36 +05:30
|
|
|
const char *const bb_argv_dash[] = { "-", NULL };
|
|
|
|
|
2008-02-11 01:14:20 +05:30
|
|
|
enum {
|
|
|
|
PARAM_STRING,
|
|
|
|
PARAM_LIST,
|
|
|
|
PARAM_INT,
|
|
|
|
};
|
|
|
|
|
2005-04-19 04:12:58 +05:30
|
|
|
typedef struct {
|
2008-02-11 01:14:20 +05:30
|
|
|
unsigned char opt_char;
|
|
|
|
smallint param_type;
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned switch_on;
|
|
|
|
unsigned switch_off;
|
|
|
|
unsigned incongruously;
|
|
|
|
unsigned requires;
|
2008-02-11 01:14:20 +05:30
|
|
|
void **optarg; /* char**, llist_t** or int *. */
|
2005-10-04 22:18:26 +05:30
|
|
|
int *counter;
|
2006-10-04 02:30:06 +05:30
|
|
|
} t_complementary;
|
2003-06-20 14:31:58 +05:30
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
uint32_t option_mask32;
|
|
|
|
|
|
|
|
#if ENABLE_LONG_OPTS
|
2007-07-23 22:44:14 +05:30
|
|
|
static const struct option bb_null_long_options[1] = {
|
2003-06-20 14:31:58 +05:30
|
|
|
{ 0, 0, 0, 0 }
|
|
|
|
};
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#else
|
|
|
|
#define vgetopt32(argv,applet_opts,applet_long_options,p) \
|
|
|
|
vgetopt32(argv,applet_opts,p)
|
2006-05-31 19:42:51 +05:30
|
|
|
#endif
|
2003-06-20 14:31:58 +05:30
|
|
|
|
2017-08-04 20:16:17 +05:30
|
|
|
/* Please keep getopt32 free from xmalloc */
|
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
static uint32_t
|
|
|
|
vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options, va_list p)
|
2001-03-17 04:17:14 +05:30
|
|
|
{
|
2007-08-18 21:02:12 +05:30
|
|
|
int argc;
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned flags = 0;
|
|
|
|
unsigned requires = 0;
|
2017-08-09 01:25:02 +05:30
|
|
|
unsigned len;
|
2008-08-20 05:42:22 +05:30
|
|
|
t_complementary complementary[33]; /* last stays zero-filled */
|
2017-08-09 01:25:02 +05:30
|
|
|
char dont_die_flag;
|
2005-04-19 04:12:58 +05:30
|
|
|
int c;
|
|
|
|
const unsigned char *s;
|
2017-08-09 01:25:02 +05:30
|
|
|
const char *opt_complementary;
|
2006-10-04 02:30:06 +05:30
|
|
|
t_complementary *on_off;
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#if ENABLE_LONG_OPTS
|
2005-09-05 20:16:07 +05:30
|
|
|
const struct option *l_o;
|
2007-07-23 23:10:35 +05:30
|
|
|
struct option *long_options = (struct option *) &bb_null_long_options;
|
2006-05-31 19:42:51 +05:30
|
|
|
#endif
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned trigger;
|
2005-10-14 15:26:52 +05:30
|
|
|
int min_arg = 0;
|
|
|
|
int max_arg = -1;
|
2005-10-11 20:08:01 +05:30
|
|
|
int spec_flgs = 0;
|
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
#define SHOW_USAGE_IF_ERROR 1
|
2007-08-18 21:02:12 +05:30
|
|
|
|
2006-10-04 02:30:06 +05:30
|
|
|
on_off = complementary;
|
|
|
|
memset(on_off, 0, sizeof(complementary));
|
2005-10-11 20:08:01 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
len = strlen(applet_opts);
|
2016-07-07 01:28:02 +05:30
|
|
|
|
2009-04-27 04:52:40 +05:30
|
|
|
/* skip bbox extension */
|
2017-08-09 01:25:02 +05:30
|
|
|
opt_complementary = NULL;
|
|
|
|
if (applet_opts[0] == '^') {
|
2009-04-27 04:52:40 +05:30
|
|
|
applet_opts++;
|
2017-08-09 01:25:02 +05:30
|
|
|
/* point it past terminating NUL */
|
|
|
|
opt_complementary = applet_opts + len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* skip another bbox extension */
|
|
|
|
dont_die_flag = applet_opts[0];
|
|
|
|
if (dont_die_flag == '!')
|
|
|
|
applet_opts++;
|
|
|
|
|
|
|
|
applet_opts = strcpy(alloca(len + 1), applet_opts);
|
2009-04-27 04:52:40 +05:30
|
|
|
|
2005-10-14 15:26:52 +05:30
|
|
|
/* skip GNU extension */
|
2005-12-02 15:40:28 +05:30
|
|
|
s = (const unsigned char *)applet_opts;
|
2006-09-29 13:53:42 +05:30
|
|
|
if (*s == '+' || *s == '-')
|
2005-10-14 15:26:52 +05:30
|
|
|
s++;
|
2016-07-07 01:28:02 +05:30
|
|
|
c = 0;
|
2006-10-25 06:03:44 +05:30
|
|
|
while (*s) {
|
2008-02-11 01:14:20 +05:30
|
|
|
if (c >= 32)
|
|
|
|
break;
|
|
|
|
on_off->opt_char = *s;
|
2017-02-02 00:05:13 +05:30
|
|
|
on_off->switch_on = (1U << c);
|
2006-10-25 06:03:44 +05:30
|
|
|
if (*++s == ':') {
|
2006-09-29 13:53:42 +05:30
|
|
|
on_off->optarg = va_arg(p, void **);
|
2016-07-07 01:28:02 +05:30
|
|
|
if (s[1] == '+' || s[1] == '*') {
|
|
|
|
/* 'o:+' or 'o:*' */
|
|
|
|
on_off->param_type = (s[1] == '+') ?
|
|
|
|
PARAM_INT : PARAM_LIST;
|
|
|
|
overlapping_strcpy((char*)s + 1, (char*)s + 2);
|
|
|
|
}
|
|
|
|
/* skip possible 'o::' (or 'o:+:' !) */
|
2008-02-11 01:14:20 +05:30
|
|
|
while (*++s == ':')
|
|
|
|
continue;
|
2005-04-19 04:12:58 +05:30
|
|
|
}
|
|
|
|
on_off++;
|
|
|
|
c++;
|
2001-03-17 04:17:14 +05:30
|
|
|
}
|
2005-09-05 20:16:07 +05:30
|
|
|
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#if ENABLE_LONG_OPTS
|
2007-07-23 22:44:14 +05:30
|
|
|
if (applet_long_options) {
|
|
|
|
const char *optstr;
|
|
|
|
unsigned i, count;
|
|
|
|
|
|
|
|
count = 1;
|
|
|
|
optstr = applet_long_options;
|
|
|
|
while (optstr[0]) {
|
2007-07-23 23:10:35 +05:30
|
|
|
optstr += strlen(optstr) + 3; /* skip NUL, has_arg, val */
|
2007-07-23 22:44:14 +05:30
|
|
|
count++;
|
|
|
|
}
|
|
|
|
/* count == no. of longopts + 1 */
|
2007-07-23 23:10:35 +05:30
|
|
|
long_options = alloca(count * sizeof(*long_options));
|
2007-07-25 22:48:06 +05:30
|
|
|
memset(long_options, 0, count * sizeof(*long_options));
|
2007-07-23 22:44:14 +05:30
|
|
|
i = 0;
|
|
|
|
optstr = applet_long_options;
|
|
|
|
while (--count) {
|
|
|
|
long_options[i].name = optstr;
|
|
|
|
optstr += strlen(optstr) + 1;
|
|
|
|
long_options[i].has_arg = (unsigned char)(*optstr++);
|
|
|
|
/* long_options[i].flag = NULL; */
|
|
|
|
long_options[i].val = (unsigned char)(*optstr++);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
for (l_o = long_options; l_o->name; l_o++) {
|
|
|
|
if (l_o->flag)
|
|
|
|
continue;
|
2008-02-11 01:14:20 +05:30
|
|
|
for (on_off = complementary; on_off->opt_char; on_off++)
|
|
|
|
if (on_off->opt_char == l_o->val)
|
2007-07-23 22:44:14 +05:30
|
|
|
goto next_long;
|
2008-02-11 01:14:20 +05:30
|
|
|
if (c >= 32)
|
|
|
|
break;
|
|
|
|
on_off->opt_char = l_o->val;
|
2017-02-02 00:05:13 +05:30
|
|
|
on_off->switch_on = (1U << c);
|
2007-07-23 22:44:14 +05:30
|
|
|
if (l_o->has_arg != no_argument)
|
|
|
|
on_off->optarg = va_arg(p, void **);
|
|
|
|
c++;
|
2006-10-25 06:03:44 +05:30
|
|
|
next_long: ;
|
2007-07-23 22:44:14 +05:30
|
|
|
}
|
2005-09-05 20:16:07 +05:30
|
|
|
}
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#endif /* ENABLE_LONG_OPTS */
|
2016-07-07 01:28:02 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
s = (const unsigned char *)opt_complementary;
|
|
|
|
if (s) for (; *s; s++) {
|
2006-10-04 02:30:06 +05:30
|
|
|
t_complementary *pair;
|
|
|
|
unsigned *pair_switch;
|
2005-04-19 04:12:58 +05:30
|
|
|
|
2005-10-14 15:26:52 +05:30
|
|
|
if (*s == ':')
|
2005-04-19 04:12:58 +05:30
|
|
|
continue;
|
2005-10-14 15:26:52 +05:30
|
|
|
c = s[1];
|
2006-09-29 13:53:42 +05:30
|
|
|
if (*s == '?') {
|
|
|
|
if (c < '0' || c > '9') {
|
2005-10-14 15:26:52 +05:30
|
|
|
spec_flgs |= SHOW_USAGE_IF_ERROR;
|
|
|
|
} else {
|
|
|
|
max_arg = c - '0';
|
|
|
|
s++;
|
|
|
|
}
|
2005-09-05 20:16:07 +05:30
|
|
|
continue;
|
|
|
|
}
|
2006-09-29 13:53:42 +05:30
|
|
|
if (*s == '-') {
|
2017-08-04 20:16:17 +05:30
|
|
|
if (c >= '0' && c <= '9') {
|
2005-10-14 15:26:52 +05:30
|
|
|
min_arg = c - '0';
|
|
|
|
s++;
|
|
|
|
}
|
2005-10-05 16:22:47 +05:30
|
|
|
continue;
|
|
|
|
}
|
2006-10-21 00:06:55 +05:30
|
|
|
if (*s == '=') {
|
|
|
|
min_arg = max_arg = c - '0';
|
|
|
|
s++;
|
|
|
|
continue;
|
|
|
|
}
|
2008-02-11 01:14:20 +05:30
|
|
|
for (on_off = complementary; on_off->opt_char; on_off++)
|
|
|
|
if (on_off->opt_char == *s)
|
2011-08-10 04:21:29 +05:30
|
|
|
goto found_opt;
|
|
|
|
/* Without this, diagnostic of such bugs is not easy */
|
|
|
|
bb_error_msg_and_die("NO OPT %c!", *s);
|
|
|
|
found_opt:
|
2006-09-29 13:53:42 +05:30
|
|
|
if (c == ':' && s[2] == ':') {
|
2008-02-11 01:14:20 +05:30
|
|
|
on_off->param_type = PARAM_LIST;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (c == '+' && (s[2] == ':' || s[2] == '\0')) {
|
|
|
|
on_off->param_type = PARAM_INT;
|
2011-08-10 04:21:29 +05:30
|
|
|
s++;
|
2005-10-14 15:26:52 +05:30
|
|
|
continue;
|
|
|
|
}
|
2006-09-29 13:53:42 +05:30
|
|
|
if (c == ':' || c == '\0') {
|
2005-10-14 15:26:52 +05:30
|
|
|
requires |= on_off->switch_on;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-29 13:53:42 +05:30
|
|
|
if (c == '-' && (s[2] == ':' || s[2] == '\0')) {
|
2006-02-02 20:18:54 +05:30
|
|
|
flags |= on_off->switch_on;
|
|
|
|
on_off->incongruously |= on_off->switch_on;
|
|
|
|
s++;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-29 13:53:42 +05:30
|
|
|
if (c == *s) {
|
|
|
|
on_off->counter = va_arg(p, int *);
|
2005-10-14 15:26:52 +05:30
|
|
|
s++;
|
|
|
|
}
|
2005-04-19 04:12:58 +05:30
|
|
|
pair = on_off;
|
2010-03-16 22:27:53 +05:30
|
|
|
pair_switch = &pair->switch_on;
|
2006-09-29 13:53:42 +05:30
|
|
|
for (s++; *s && *s != ':'; s++) {
|
|
|
|
if (*s == '?') {
|
2010-03-16 22:27:53 +05:30
|
|
|
pair_switch = &pair->requires;
|
2005-10-14 15:26:52 +05:30
|
|
|
} else if (*s == '-') {
|
2010-03-16 22:27:53 +05:30
|
|
|
if (pair_switch == &pair->switch_off)
|
|
|
|
pair_switch = &pair->incongruously;
|
2005-10-14 15:26:52 +05:30
|
|
|
else
|
2010-03-16 22:27:53 +05:30
|
|
|
pair_switch = &pair->switch_off;
|
2005-10-14 15:26:52 +05:30
|
|
|
} else {
|
2008-02-11 01:14:20 +05:30
|
|
|
for (on_off = complementary; on_off->opt_char; on_off++)
|
|
|
|
if (on_off->opt_char == *s) {
|
2006-09-29 13:53:42 +05:30
|
|
|
*pair_switch |= on_off->switch_on;
|
|
|
|
break;
|
|
|
|
}
|
2005-04-19 04:12:58 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
s--;
|
2003-06-20 14:31:58 +05:30
|
|
|
}
|
2005-10-14 15:26:52 +05:30
|
|
|
|
2008-11-13 03:36:46 +05:30
|
|
|
/* In case getopt32 was already called:
|
2017-08-29 18:02:17 +05:30
|
|
|
* reset libc getopt() internal state.
|
2011-02-02 23:35:25 +05:30
|
|
|
* run_nofork_applet() does this, but we might end up here
|
2008-11-13 03:36:46 +05:30
|
|
|
* also via gunzip_main() -> gzip_main(). Play safe.
|
|
|
|
*/
|
2017-04-12 03:28:46 +05:30
|
|
|
GETOPT_RESET();
|
2008-11-13 03:36:46 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
/* skip 0: some applets cheat: they do not actually HAVE argv[0] */
|
|
|
|
argc = 1 + string_array_len(argv + 1);
|
|
|
|
|
2008-01-29 04:27:10 +05:30
|
|
|
/* Note: just "getopt() <= 0" will not work well for
|
2006-10-25 06:03:44 +05:30
|
|
|
* "fake" short options, like this one:
|
|
|
|
* wget $'-\203' "Test: test" http://kernel.org/
|
|
|
|
* (supposed to act as --header, but doesn't) */
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
#if ENABLE_LONG_OPTS
|
2006-09-29 13:53:42 +05:30
|
|
|
while ((c = getopt_long(argc, argv, applet_opts,
|
2007-07-23 23:10:35 +05:30
|
|
|
long_options, NULL)) != -1) {
|
2006-05-31 19:42:51 +05:30
|
|
|
#else
|
2006-10-25 06:03:44 +05:30
|
|
|
while ((c = getopt(argc, argv, applet_opts)) != -1) {
|
2007-03-15 18:58:46 +05:30
|
|
|
#endif
|
2008-08-20 05:42:22 +05:30
|
|
|
/* getopt prints "option requires an argument -- X"
|
|
|
|
* and returns '?' if an option has no arg, but one is reqd */
|
2008-01-29 04:27:10 +05:30
|
|
|
c &= 0xff; /* fight libc's sign extension */
|
2008-02-11 01:14:20 +05:30
|
|
|
for (on_off = complementary; on_off->opt_char != c; on_off++) {
|
2008-08-20 05:42:22 +05:30
|
|
|
/* c can be NUL if long opt has non-NULL ->flag,
|
|
|
|
* but we construct long opts so that flag
|
|
|
|
* is always NULL (see above) */
|
|
|
|
if (on_off->opt_char == '\0' /* && c != '\0' */) {
|
|
|
|
/* c is probably '?' - "bad option" */
|
2009-04-27 04:52:40 +05:30
|
|
|
goto error;
|
2008-08-20 05:42:22 +05:30
|
|
|
}
|
2005-04-19 04:12:58 +05:30
|
|
|
}
|
2007-07-21 18:57:44 +05:30
|
|
|
if (flags & on_off->incongruously)
|
2009-04-27 04:52:40 +05:30
|
|
|
goto error;
|
2005-09-06 21:38:33 +05:30
|
|
|
trigger = on_off->switch_on & on_off->switch_off;
|
|
|
|
flags &= ~(on_off->switch_off ^ trigger);
|
|
|
|
flags |= on_off->switch_on ^ trigger;
|
|
|
|
flags ^= trigger;
|
2006-09-29 13:53:42 +05:30
|
|
|
if (on_off->counter)
|
2005-10-04 22:18:26 +05:30
|
|
|
(*(on_off->counter))++;
|
2011-03-01 23:55:49 +05:30
|
|
|
if (optarg) {
|
|
|
|
if (on_off->param_type == PARAM_LIST) {
|
2008-03-17 14:39:09 +05:30
|
|
|
llist_add_to_end((llist_t **)(on_off->optarg), optarg);
|
2011-03-01 23:55:49 +05:30
|
|
|
} else if (on_off->param_type == PARAM_INT) {
|
2010-08-12 17:44:45 +05:30
|
|
|
//TODO: xatoi_positive indirectly pulls in printf machinery
|
|
|
|
*(unsigned*)(on_off->optarg) = xatoi_positive(optarg);
|
2011-03-01 23:55:49 +05:30
|
|
|
} else if (on_off->optarg) {
|
2008-03-17 14:39:09 +05:30
|
|
|
*(char **)(on_off->optarg) = optarg;
|
2011-03-01 23:55:49 +05:30
|
|
|
}
|
2005-04-19 04:12:58 +05:30
|
|
|
}
|
2005-10-05 16:22:47 +05:30
|
|
|
}
|
2005-10-14 15:26:52 +05:30
|
|
|
|
2005-10-11 20:08:01 +05:30
|
|
|
/* check depending requires for given options */
|
2008-02-11 01:14:20 +05:30
|
|
|
for (on_off = complementary; on_off->opt_char; on_off++) {
|
2009-04-27 04:52:40 +05:30
|
|
|
if (on_off->requires
|
|
|
|
&& (flags & on_off->switch_on)
|
|
|
|
&& (flags & on_off->requires) == 0
|
|
|
|
) {
|
|
|
|
goto error;
|
|
|
|
}
|
2005-10-11 20:08:01 +05:30
|
|
|
}
|
2006-09-29 13:53:42 +05:30
|
|
|
if (requires && (flags & requires) == 0)
|
2009-04-27 04:52:40 +05:30
|
|
|
goto error;
|
2005-10-14 15:26:52 +05:30
|
|
|
argc -= optind;
|
2006-09-29 13:53:42 +05:30
|
|
|
if (argc < min_arg || (max_arg >= 0 && argc > max_arg))
|
2009-04-27 04:52:40 +05:30
|
|
|
goto error;
|
2006-10-06 15:19:47 +05:30
|
|
|
|
|
|
|
option_mask32 = flags;
|
2005-04-19 04:12:58 +05:30
|
|
|
return flags;
|
2009-04-27 04:52:40 +05:30
|
|
|
|
|
|
|
error:
|
2017-08-09 01:25:02 +05:30
|
|
|
if (dont_die_flag != '!')
|
2009-04-27 04:52:40 +05:30
|
|
|
bb_show_usage();
|
|
|
|
return (int32_t)-1;
|
2001-03-17 04:17:14 +05:30
|
|
|
}
|
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>
2017-08-08 20:08:18 +05:30
|
|
|
|
|
|
|
uint32_t FAST_FUNC
|
|
|
|
getopt32(char **argv, const char *applet_opts, ...)
|
|
|
|
{
|
|
|
|
uint32_t opt;
|
|
|
|
va_list p;
|
|
|
|
|
|
|
|
va_start(p, applet_opts);
|
|
|
|
opt = vgetopt32(argv, applet_opts, NULL, p);
|
|
|
|
va_end(p);
|
|
|
|
return opt;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ENABLE_LONG_OPTS
|
|
|
|
uint32_t FAST_FUNC
|
|
|
|
getopt32long(char **argv, const char *applet_opts, const char *longopts, ...)
|
|
|
|
{
|
|
|
|
uint32_t opt;
|
|
|
|
va_list p;
|
|
|
|
|
|
|
|
va_start(p, longopts);
|
|
|
|
opt = vgetopt32(argv, applet_opts, longopts, p);
|
|
|
|
va_end(p);
|
|
|
|
return opt;
|
|
|
|
}
|
|
|
|
#endif
|