036585a911
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>
133 lines
4.3 KiB
C
133 lines
4.3 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* env implementation for busybox
|
|
*
|
|
* Copyright (c) 1988, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*
|
|
* Original copyright notice is retained at the end of this file.
|
|
*
|
|
* Modified for BusyBox by Erik Andersen <andersen@codepoet.org>
|
|
*/
|
|
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
|
|
*
|
|
* Fixed bug involving exit return codes if execvp fails. Also added
|
|
* output error checking.
|
|
*/
|
|
/*
|
|
* Modified by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
|
|
* - correct "-" option usage
|
|
* - multiple "-u unsetenv" support
|
|
* - GNU long option support
|
|
* - use xfunc_error_retval
|
|
*/
|
|
//config:config ENV
|
|
//config: bool "env (3.8 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: env is used to set an environment variable and run
|
|
//config: a command; without options it displays the current
|
|
//config: environment.
|
|
|
|
//applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
|
|
|
|
//kbuild:lib-$(CONFIG_ENV) += env.o
|
|
|
|
/* BB_AUDIT SUSv3 compliant */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
|
|
|
|
//usage:#define env_trivial_usage
|
|
//usage: "[-iu] [-] [name=value]... [PROG ARGS]"
|
|
//usage:#define env_full_usage "\n\n"
|
|
//usage: "Print the current environment or run PROG after setting up\n"
|
|
//usage: "the specified environment\n"
|
|
//usage: "\n -, -i Start with an empty environment"
|
|
//usage: "\n -u Remove variable from the environment"
|
|
|
|
#include "libbb.h"
|
|
|
|
int env_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int env_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
unsigned opts;
|
|
llist_t *unset_env = NULL;
|
|
|
|
opts = getopt32long(argv, "+iu:+",
|
|
"ignore-environment\0" No_argument "i"
|
|
"unset\0" Required_argument "u"
|
|
, &unset_env
|
|
);
|
|
argv += optind;
|
|
if (argv[0] && LONE_DASH(argv[0])) {
|
|
opts |= 1;
|
|
++argv;
|
|
}
|
|
if (opts & 1) {
|
|
clearenv();
|
|
}
|
|
while (unset_env) {
|
|
char *var = llist_pop(&unset_env);
|
|
/* This does not handle -uVAR=VAL
|
|
* (coreutils _sets_ the variable in that case): */
|
|
/*unsetenv(var);*/
|
|
/* This does, but uses somewhan undocumented feature that
|
|
* putenv("name_without_equal_sign") unsets the variable: */
|
|
putenv(var);
|
|
}
|
|
|
|
while (*argv && (strchr(*argv, '=') != NULL)) {
|
|
if (putenv(*argv) < 0) {
|
|
bb_perror_msg_and_die("putenv");
|
|
}
|
|
++argv;
|
|
}
|
|
|
|
if (argv[0]) {
|
|
BB_EXECVP_or_die(argv);
|
|
}
|
|
|
|
if (environ) { /* clearenv() may set environ == NULL! */
|
|
char **ep;
|
|
for (ep = environ; *ep; ep++) {
|
|
puts(*ep);
|
|
}
|
|
}
|
|
|
|
fflush_stdout_and_exit(EXIT_SUCCESS);
|
|
}
|
|
|
|
/*
|
|
* Copyright (c) 1988, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
|
|
* ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
|
|
*
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|