oweals/busybox.git
6 years agoClarify OPOST bit meaning
Denys Vlasenko [Fri, 15 Sep 2017 15:19:55 +0000 (17:19 +0200)]
Clarify OPOST bit meaning

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoless,microcom,lineedit: use common routine to set raw termios
Denys Vlasenko [Fri, 15 Sep 2017 15:14:01 +0000 (17:14 +0200)]
less,microcom,lineedit: use common routine to set raw termios

function                                             old     new   delta
get_termios_and_make_raw                               -     139    +139
xget1                                                 39       8     -31
read_line_input                                     3912    3867     -45
less_main                                           2525    2471     -54
set_termios_to_raw                                   116      36     -80
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/4 up/down: 139/-210)          Total: -71 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: code shrink
Denys Vlasenko [Fri, 15 Sep 2017 13:23:47 +0000 (15:23 +0200)]
hexedit: code shrink

function                                             old     new   delta
hexedit_main                                        1171    1170      -1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: fixes to "goto address" code
Denys Vlasenko [Fri, 15 Sep 2017 12:00:41 +0000 (14:00 +0200)]
hexedit: fixes to "goto address" code

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: position in correct column on "goto" command
Denys Vlasenko [Thu, 14 Sep 2017 11:57:07 +0000 (13:57 +0200)]
hexedit: position in correct column on "goto" command

function                                             old     new   delta
hexedit_main                                        1169    1202     +33

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: code shrink
Denys Vlasenko [Thu, 14 Sep 2017 09:20:36 +0000 (11:20 +0200)]
hexedit: code shrink

function                                             old     new   delta
hexedit_main                                        1176    1169      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexdump: code shrink
Denys Vlasenko [Thu, 14 Sep 2017 09:01:37 +0000 (11:01 +0200)]
hexdump: code shrink

function                                             old     new   delta
remap                                                173     178      +5
move_mapping_lower                                   107     109      +2
move_mapping_further                                 141     143      +2
hexedit_main                                        1191    1176     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 9/-15)              Total: -6 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: implement "[enter] goto offset" key
Denys Vlasenko [Thu, 14 Sep 2017 08:51:12 +0000 (10:51 +0200)]
hexedit: implement "[enter] goto offset" key

This is a must if you need to edit sector 123456789999 on your /dev/disk.

   text    data     bss     dec     hex filename
 922745     481    6832  930058   e310a busybox_old
 923023     481    6832  930336   e3220 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: restore screen on exit
Denys Vlasenko [Thu, 14 Sep 2017 07:42:40 +0000 (09:42 +0200)]
hexedit: restore screen on exit

function                                             old     new   delta
hexedit_main                                         998    1082     +84
restore_term                                           -      29     +29
remap                                                168     173      +5
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 118/0)             Total: 118 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: optimize output buffering
Denys Vlasenko [Wed, 13 Sep 2017 22:04:16 +0000 (00:04 +0200)]
hexedit: optimize output buffering

function                                             old     new   delta
hexedit_main                                         970     998     +28

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: implement page up/down
Denys Vlasenko [Wed, 13 Sep 2017 21:02:51 +0000 (23:02 +0200)]
hexedit: implement page up/down

function                                             old     new   delta
hexedit_main                                         924     970     +46

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years ago*: use ESC define instead of "\033"; use ESC[m instead of ESC[0m
Denys Vlasenko [Wed, 13 Sep 2017 20:48:30 +0000 (22:48 +0200)]
*: use ESC define instead of "\033"; use ESC[m instead of ESC[0m

   text    data     bss     dec     hex filename
 922535     481    6832  929848   e3038 busybox_old
 922534     481    6832  929847   e3037 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: smarter redraw
Denys Vlasenko [Wed, 13 Sep 2017 19:38:55 +0000 (21:38 +0200)]
hexedit: smarter redraw

function                                             old     new   delta
format_line                                          197     209     +12
hexedit_main                                         930     924      -6
redraw_cur_line                                      104      94     -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 12/-16)             Total: -4 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohexedit: new applet
Denys Vlasenko [Wed, 13 Sep 2017 17:20:27 +0000 (19:20 +0200)]
hexedit: new applet

function                                             old     new   delta
hexedit_main                                           -     930    +930
format_line                                            -     197    +197
remap                                                  -     168    +168
move_mapping_further                                   -     141    +141
move_mapping_lower                                     -     107    +107
redraw_cur_line                                        -     104    +104
packed_usage                                       31802   31812     +10
applet_names                                        2688    2696      +8
applet_main                                         1552    1556      +4
applet_suid                                           97      98      +1
applet_install_loc                                   194     195      +1
------------------------------------------------------------------------------
(add/remove: 7/0 grow/shrink: 5/0 up/down: 1671/0)           Total: 1671 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agonetworking/interface.c: remove superfluous "& 0377"
Denys Vlasenko [Tue, 12 Sep 2017 15:54:28 +0000 (17:54 +0200)]
networking/interface.c: remove superfluous "& 0377"

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosetfattr: new applet
Denys Vlasenko [Fri, 8 Sep 2017 18:55:59 +0000 (20:55 +0200)]
setfattr: new applet

function                                             old     new   delta
setfattr_main                                          -     189    +189
packed_usage                                       31516   31588     +72
setxattr                                               -      53     +53
lsetxattr                                              -      53     +53
removexattr                                            -      37     +37
lremovexattr                                           -      37     +37
applet_names                                        2649    2658      +9
find_applet_by_name                                  124     128      +4
applet_main                                         1532    1536      +4
------------------------------------------------------------------------------
(add/remove: 7/0 grow/shrink: 4/0 up/down: 458/0)             Total: 458 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobuild system: fix a compiler warning
Denys Vlasenko [Thu, 7 Sep 2017 12:50:00 +0000 (14:50 +0200)]
build system: fix a compiler warning

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobuild system: fix "allnoconfig" to clear all options. Closes 10296
Denys Vlasenko [Thu, 7 Sep 2017 12:40:28 +0000 (14:40 +0200)]
build system: fix "allnoconfig" to clear all options. Closes 10296

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochat: do not die when HANGUP param is missing. Closes 10016
Denys Vlasenko [Tue, 5 Sep 2017 17:16:40 +0000 (19:16 +0200)]
chat: do not die when HANGUP param is missing. Closes 10016

function                                             old     new   delta
chat_main                                           1356    1379     +23

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohttpd: skip "Status: " from CGI, including space. Closes 10291
Denys Vlasenko [Fri, 1 Sep 2017 15:06:12 +0000 (17:06 +0200)]
httpd: skip "Status: " from CGI, including space. Closes 10291

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoklibc-utils: add ipconfig.c work-in-progress
Denys Vlasenko [Fri, 1 Sep 2017 10:48:15 +0000 (12:48 +0200)]
klibc-utils: add ipconfig.c work-in-progress

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoxargs: fix a thinko in last commit
Denys Vlasenko [Wed, 30 Aug 2017 11:44:27 +0000 (13:44 +0200)]
xargs: fix a thinko in last commit

IF_FEATURE_XARGS_SUPPORT_PARALLEL(char *opt_a = NULL;)
is replaced with
IF_FEATURE_XARGS_SUPPORT_ARGS_FILE

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoxargs: support -a FILE
Johannes Schindelin [Fri, 25 Aug 2017 20:42:05 +0000 (22:42 +0200)]
xargs: support -a FILE

The GNU-specific option -a lets xargs read the arguments from a file
rather than from stdin.

This is particularly convenient when debugging in gdb interactively,
and it might be of more general use.

function                                             old     new   delta
xargs_main                                           788     823     +35
packed_usage                                       31683   31671     -12

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoklibc-utils: remove accidental "or later" licensing wording.
Denys Vlasenko [Tue, 29 Aug 2017 17:44:45 +0000 (19:44 +0200)]
klibc-utils: remove accidental "or later" licensing wording.

I (slightly) prefer my code to be under "GPLv2 only" license.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc: show only short opts in --help text
Denys Vlasenko [Tue, 29 Aug 2017 14:51:17 +0000 (16:51 +0200)]
udhcpc: show only short opts in --help text

function                                             old     new   delta
packed_usage                                       31615   31501    -114

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoi2c_tools: tweak --help text
Denys Vlasenko [Tue, 29 Aug 2017 13:44:01 +0000 (15:44 +0200)]
i2c_tools: tweak --help text

function                                             old     new   delta
packed_usage                                       31624   31615      -9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosetpriv: placete "declaration of 'index' shadows a global declaration" warning
Denys Vlasenko [Tue, 29 Aug 2017 13:34:38 +0000 (15:34 +0200)]
setpriv: placete "declaration of 'index' shadows a global declaration" warning

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix false positive in unset.tests
Denys Vlasenko [Tue, 29 Aug 2017 12:35:58 +0000 (14:35 +0200)]
hush: fix false positive in unset.tests

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: GETOPT_RESET() _after_ getopts too.
Denys Vlasenko [Tue, 29 Aug 2017 12:32:17 +0000 (14:32 +0200)]
hush: GETOPT_RESET() _after_ getopts too.

NOEXEC'ed applets which use getopt() need this.

function                                             old     new   delta
builtin_getopts                                      403     413     +10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: reuse "OPTIND=..." string
Denys Vlasenko [Tue, 29 Aug 2017 11:48:49 +0000 (13:48 +0200)]
hush: reuse "OPTIND=..." string

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix "getopts" builtin to not be upset by other builtins calling getopt()
Denys Vlasenko [Tue, 29 Aug 2017 11:38:30 +0000 (13:38 +0200)]
hush: fix "getopts" builtin to not be upset by other builtins calling getopt()

function                                             old     new   delta
builtin_getopts                                      363     403     +40
unset_local_var_len                                  185     215     +30
set_local_var                                        440     466     +26
reset_traps_to_defaults                              151     157      +6
pseudo_exec_argv                                     320     326      +6
install_special_sighandlers                           52      58      +6
pick_sighandler                                       62      65      +3
execvp_or_die                                         85      88      +3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/0 up/down: 120/0)             Total: 120 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoi2c-tools: don't include linux/i2c-dev.h
Bartosz Golaszewski [Tue, 29 Aug 2017 10:31:22 +0000 (12:31 +0200)]
i2c-tools: don't include linux/i2c-dev.h

Installing headers from upstream i2c-tools makes it impossible to
build the busybox version due to redefined symbols. This is caused by
the fact that linux/i2c-dev.h from i2c-tools overwrites the one from
linux uapi and defines symbols already defined by linux' linux/i2c.h.

Drop this include and simply re-implement the relevant defines from
linux/i2c-dev.h in miscutils/i2c-tools.c.

Tested by building on systems with and without i2c-tools headers.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoi2c-tools: remove unneeded include
Bartosz Golaszewski [Mon, 28 Aug 2017 09:49:24 +0000 (11:49 +0200)]
i2c-tools: remove unneeded include

We no longer use common_bufsiz1 in i2c-tools.

Don't include common_bufsiz.h.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agokill: add '--' option to separate options from arguments
Ron Yorston [Sun, 27 Aug 2017 07:25:18 +0000 (08:25 +0100)]
kill: add '--' option to separate options from arguments

Using a negative pid to send TERM to a process group results in an
obscure error:

   $ ./busybox kill -12345
   kill: bad signal name '12345'

This is intended. Manpage says:
ARGUMENTS
       pid    Each pid can be one of four things:
...
              -n     where n is larger than 1.  All processes in process group
                     n are signaled.  When an argument of  the  form  '-n'  is
                     given,  and it is meant to denote a process group, either
                     a signal must be specified first, or the argument must be
                     preceded  by a '--' option, otherwise it will be taken as
                     the signal to send.

However, we did not support "--". Add this capability to BusyBox.

function                                             old     new   delta
kill_main                                            993     999      +6

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoxargs: optional support for -P NUM. Closes 9511
Denys Vlasenko [Thu, 24 Aug 2017 11:23:54 +0000 (13:23 +0200)]
xargs: optional support for -P NUM. Closes 9511

Based on patch by Johannes Schindelin <johannes.schindelin@gmx.de>

function                                             old     new   delta
xargs_exec                                             -     294    +294
packed_usage                                       31757   31772     +15
xargs_main                                           787     719     -68
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/1 up/down: 309/-68)           Total: 241 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoxargs: code shrink
Denys Vlasenko [Thu, 24 Aug 2017 09:21:27 +0000 (11:21 +0200)]
xargs: code shrink

function                                             old     new   delta
xargs_main                                           827     787     -40

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosed: in '/regexp/cmd1;//cmd2', cmd2 should use the same regexp as cmd1
Denys Vlasenko [Wed, 23 Aug 2017 15:56:03 +0000 (17:56 +0200)]
sed: in '/regexp/cmd1;//cmd2', cmd2 should use the same regexp as cmd1

function                                             old     new   delta
get_address                                          165     211     +46

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years ago*: fix fallout from opt_complementary conversion
Denys Vlasenko [Wed, 23 Aug 2017 13:08:25 +0000 (15:08 +0200)]
*: fix fallout from opt_complementary conversion

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: more s/error/perror/ for better error reporting
Denys Vlasenko [Wed, 23 Aug 2017 12:52:56 +0000 (14:52 +0200)]
ash: more s/error/perror/ for better error reporting

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: when cd fails, say why
Johannes Schindelin [Tue, 22 Aug 2017 20:03:22 +0000 (22:03 +0200)]
ash: when cd fails, say why

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: report reason when a script file could not be opened
Johannes Schindelin [Tue, 22 Aug 2017 20:03:17 +0000 (22:03 +0200)]
ash: report reason when a script file could not be opened

It is always nicer to give the user some sort of indication why an
operation failed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotar: fix handling of first argument without '-'
Ron Yorston [Tue, 22 Aug 2017 15:33:06 +0000 (16:33 +0100)]
tar: fix handling of first argument without '-'

The following no longer works as expected:

   $ ./busybox tar xfz test.tgz
   tar: can't open 'z': No such file or directory

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosendmail: fix segfault if "To: email1,email2" is used
Denys Vlasenko [Tue, 22 Aug 2017 13:53:16 +0000 (15:53 +0200)]
sendmail: fix segfault if "To: email1,email2" is used

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibarchive: fix build failure on NOMMU systems
Ron Yorston [Tue, 22 Aug 2017 10:34:03 +0000 (11:34 +0100)]
libarchive: fix build failure on NOMMU systems

In the old code fd was an argument, now we need to get the file descriptor
from the xstate structure.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agops: fix build failure if FEATURE_PS_TIME is disabled
Ron Yorston [Tue, 22 Aug 2017 10:21:56 +0000 (11:21 +0100)]
ps: fix build failure if FEATURE_PS_TIME is disabled

The global seconds_since_boot is only defined if FEATURE_PS_TIME
is enabled.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm,rpm2cpio: do not compile not-configurred parts of rpm.c
Denys Vlasenko [Tue, 22 Aug 2017 13:33:04 +0000 (15:33 +0200)]
rpm,rpm2cpio: do not compile not-configurred parts of rpm.c

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorun-init: if doing dry run, do not require pid==1
Denys Vlasenko [Tue, 22 Aug 2017 09:40:27 +0000 (11:40 +0200)]
run-init: if doing dry run, do not require pid==1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agops: allow ps config options if minips is enabled
Kang-Che Sung [Sat, 19 Aug 2017 06:18:27 +0000 (14:18 +0800)]
ps: allow ps config options if minips is enabled

Follow-up of commit ab77e81a8527fa11a4f9392d97c2da037d6f4f98
"klibc-utils: new applets: resume, nuke, minips"

Also put FEATURE_PS_UNUSUAL_SYSTEMS to under FEATURE_PS_TIME in the
menu.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorun-init: implement -n "dry run"
Denys Vlasenko [Tue, 22 Aug 2017 08:37:30 +0000 (10:37 +0200)]
run-init: implement -n "dry run"

function                                             old     new   delta
switch_root_main                                     637     706     +69
packed_usage                                       31743   31757     +14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 83/0)               Total: 83 bytes
   text    data     bss     dec     hex filename
 915247     563    5844  921654   e1036 busybox_old
 915303     563    5844  921710   e106e busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorun-init: new applet
Denys Vlasenko [Mon, 21 Aug 2017 17:30:01 +0000 (19:30 +0200)]
run-init: new applet

function                                             old     new   delta
switch_root_main                                     354     637    +283
drop_usermodehelper                                    -     157    +157
cap_name_to_number                                     -      77     +77
packed_usage                                       31707   31743     +36
applet_names                                        2665    2674      +9
applet_main                                         1544    1548      +4
applet_install_loc                                   193     194      +1
setpriv_main                                         933     928      -5
getcaps                                              131     122      -9
parse_cap                                            117      29     -88
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 5/3 up/down: 567/-102)          Total: 465 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibbb: move capability names code to libbb
Denys Vlasenko [Mon, 21 Aug 2017 00:14:19 +0000 (02:14 +0200)]
libbb: move capability names code to libbb

function                                             old     new   delta
cap_name_to_number                                     -      77     +77
parse_cap                                            117      29     -88
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/1 up/down: 77/-88)            Total: -11 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosetpriv: code shrink
Denys Vlasenko [Sun, 20 Aug 2017 18:21:31 +0000 (20:21 +0200)]
setpriv: code shrink

function                                             old     new   delta
parse_cap                                            125     117      -8
setpriv_main                                         949     933     -16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-24)             Total: -24 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agonuke: shorten help text
Denys Vlasenko [Fri, 18 Aug 2017 17:23:51 +0000 (19:23 +0200)]
nuke: shorten help text

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoklibc-utils: new applets: resume, nuke, minips
Denys Vlasenko [Fri, 18 Aug 2017 17:15:29 +0000 (19:15 +0200)]
klibc-utils: new applets: resume, nuke, minips

minips is a pure alias to ps, just in case someone needs 100% klibc-utils compat.
nuke is a primitive version of "rm -rf" without options and error checks. ~30 bytes.

resume is a tool for initramfs which resumes from a given block device.

function                                             old     new   delta
resume_main                                            -     582    +582
packed_usage                                       31640   31712     +72
nuke_main                                              -      28     +28
xstrtoull                                              -      24     +24
applet_names                                        2646    2665     +19
applet_main                                         1532    1544     +12
applet_suid                                           96      97      +1
applet_install_loc                                   192     193      +1
applet_flags                                          96      97      +1
------------------------------------------------------------------------------
(add/remove: 5/0 grow/shrink: 6/0 up/down: 740/0)             Total: 740 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosetpriv: accept any case in capability names
Denys Vlasenko [Fri, 18 Aug 2017 17:11:57 +0000 (19:11 +0200)]
setpriv: accept any case in capability names

This should work: setpriv --inh-caps -SyS_ReSOuRCE sh

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: stage backported LINENO support as a separate patch
Denys Vlasenko [Thu, 17 Aug 2017 14:43:33 +0000 (16:43 +0200)]
ash: stage backported LINENO support as a separate patch

Looks biggish and not particularly useful, but may be easier to just eat
the impact if future backports from dash would be otherwise increasingly
difficult.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotelnet: "-a" + "-l USER" should respect USER
Denys Vlasenko [Thu, 17 Aug 2017 11:37:51 +0000 (13:37 +0200)]
telnet: "-a" + "-l USER" should respect USER

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: trivial code shrink in builtin_getopts
Denys Vlasenko [Thu, 17 Aug 2017 10:36:39 +0000 (12:36 +0200)]
hush: trivial code shrink in builtin_getopts

function                                             old     new   delta
builtin_getopts                                      368     363      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoawk: stop on first non-option, closes 9861
Denys Vlasenko [Wed, 16 Aug 2017 17:07:53 +0000 (19:07 +0200)]
awk: stop on first non-option, closes 9861

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years ago*: stop using atexit in non-debug build: saves ~260 in bss with musl
Denys Vlasenko [Wed, 16 Aug 2017 15:45:32 +0000 (17:45 +0200)]
*: stop using atexit in non-debug build: saves ~260 in bss with musl

"builtin" below is atexit's 32-element global array of functions to call.

function                                             old     new   delta
top_main                                             879     889     +10
launch_helper                                        185     193      +8
powertop_main                                       1555    1559      +4
sed_main                                             651     650      -1
slot                                                   4       -      -4
call                                                   4       -      -4
atexit                                                23       -     -23
kill_helper                                           31       -     -31
__funcs_on_exit                                      120       -    -120
__cxa_atexit                                         168       -    -168
builtin                                              260       -    -260
------------------------------------------------------------------------------
(add/remove: 0/8 grow/shrink: 3/1 up/down: 22/-611)          Total: -589 bytes
   text    data     bss     dec     hex filename
 912364     563    6132  919059   e0613 busybox_old
 912035     563    5844  918442   e03aa busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agosyslogd,logger: code shrink for musl
Denys Vlasenko [Wed, 16 Aug 2017 13:05:36 +0000 (15:05 +0200)]
syslogd,logger: code shrink for musl

function                                             old     new   delta
syslogd_main                                        1252    1910    +658
logger_main                                          277     393    +116
timestamp_and_log                                    434     542    +108
static.__compound_literal                              -     104    +104
parse_fac_prio_20                                    137       -    -137
pencode                                              167       -    -167
parse_syslogdcfg                                     715       -    -715
------------------------------------------------------------------------------
(add/remove: 1/3 grow/shrink: 3/0 up/down: 986/-1019)         Total: -33 bytes
   text    data     bss     dec     hex filename
 912506     563    6132  919201   e06a1 busybox_old
 912364     563    6132  919059   e0613 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agofsck_minix,mkfs_minix: fix "strict-aliasing" warnings
Denys Vlasenko [Wed, 16 Aug 2017 09:53:48 +0000 (11:53 +0200)]
fsck_minix,mkfs_minix: fix "strict-aliasing" warnings

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agouevent: placate gcc
Denys Vlasenko [Wed, 16 Aug 2017 09:45:09 +0000 (11:45 +0200)]
uevent: placate gcc

How sizeof() can be an aliasing problem?

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotop: switch to malloced "globals".
Denys Vlasenko [Wed, 16 Aug 2017 09:40:10 +0000 (11:40 +0200)]
top: switch to malloced "globals".

This seems to be more efficient:

function                                             old     new   delta
clearmems                                              -      28     +28
display_process_list                                1001    1018     +17
read_cpu_jiffy                                       171     177      +6
do_stats                                             194     198      +4
reset_term                                            20      23      +3
topmem_sort                                           63      65      +2
mult_lvl_cmp                                          44      45      +1
get_jiffy_counts                                     247     248      +1
display_topmem_process_list                          549     546      -3
top_main                                             912     879     -33
handle_input                                         630     549     -81
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 7/3 up/down: 62/-117)           Total: -55 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: unset OPTARG if getopts exits 1, support OPTERR=0 behavior
Denys Vlasenko [Tue, 15 Aug 2017 13:44:41 +0000 (15:44 +0200)]
ash: unset OPTARG if getopts exits 1, support OPTERR=0 behavior

function                                             old     new   delta
getoptscmd                                           522     547     +25

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash,hush: comment and debug tweaks, no code changes
Denys Vlasenko [Tue, 15 Aug 2017 13:27:41 +0000 (15:27 +0200)]
ash,hush: comment and debug tweaks, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: one "current line = 1" might be missing, fix that
Denys Vlasenko [Mon, 14 Aug 2017 17:46:56 +0000 (19:46 +0200)]
ash: one "current line = 1" might be missing, fix that

I'm not sure this is necessary, but dash has this init here.
Just in case, do it too.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: update testsuite (we now error out on ${#=})
Denys Vlasenko [Mon, 14 Aug 2017 13:01:32 +0000 (15:01 +0200)]
ash: update testsuite (we now error out on ${#=})

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: [PARSER] Catch variable length expansions on non-existant specials
Denys Vlasenko [Mon, 14 Aug 2017 12:23:45 +0000 (14:23 +0200)]
ash: [PARSER] Catch variable length expansions on non-existant specials

Upstream commit:

    Date: Thu, 30 Oct 2014 11:53:35 +0800
    [PARSER] Catch variable length expansions on non-existant specials

    Currently we only check special variable names that follow directly
    after $ or ${.  So errors such as ${#&} are not caught.  This patch
    fixes that by moving the is_special check to just before we print out
    the special variable name.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
function                                             old     new   delta
readtoken1                                          2630    2635      +5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobuild system: remove unused CONFIG_FEATURE_HAVE_RPC
Denys Vlasenko [Mon, 14 Aug 2017 10:25:55 +0000 (12:25 +0200)]
build system: remove unused CONFIG_FEATURE_HAVE_RPC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoshell: tweak getopts tests, no code changes
Denys Vlasenko [Sun, 13 Aug 2017 00:59:00 +0000 (02:59 +0200)]
shell: tweak getopts tests, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: implement "silent" optstrings of ":opts"
Denys Vlasenko [Fri, 11 Aug 2017 15:21:14 +0000 (17:21 +0200)]
hush: implement "silent" optstrings of ":opts"

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: add a test which fails due to uclibc bug in getopt()
Denys Vlasenko [Fri, 11 Aug 2017 15:00:39 +0000 (17:00 +0200)]
hush: add a test which fails due to uclibc bug in getopt()

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix redirect code (was using uninitialized variables)
Denys Vlasenko [Fri, 11 Aug 2017 13:41:39 +0000 (15:41 +0200)]
hush: fix redirect code (was using uninitialized variables)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoshell: add OPTARG poisoning to getopt_optarg.tests
Denys Vlasenko [Fri, 11 Aug 2017 00:37:48 +0000 (02:37 +0200)]
shell: add OPTARG poisoning to getopt_optarg.tests

ash fails this!

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: teach getopts to set/unset OPTARG
Denys Vlasenko [Fri, 11 Aug 2017 00:05:21 +0000 (02:05 +0200)]
hush: teach getopts to set/unset OPTARG

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: getopts builtin
Denys Vlasenko [Thu, 10 Aug 2017 23:32:46 +0000 (01:32 +0200)]
hush: getopts builtin

function                                             old     new   delta
builtin_getopts                                        -     271    +271
bltins1                                              372     384     +12
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/0 up/down: 283/0)             Total: 283 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: fix "unset OPTIND" throwing an error message
Denys Vlasenko [Thu, 10 Aug 2017 22:59:36 +0000 (00:59 +0200)]
ash: fix "unset OPTIND" throwing an error message

Added test was failing quite severely. Now only one subtest fails
(OPTERR=0 has no effect).

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: optional times builtin
Denys Vlasenko [Thu, 10 Aug 2017 14:34:03 +0000 (16:34 +0200)]
hush: optional times builtin

function                                             old     new   delta
builtin_times                                          -     108    +108
bltins1                                              360     372     +12
static.times_tbl                                       -       9      +9
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 1/0 up/down: 129/0)             Total: 129 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agofdisk: typo fix
Denys Vlasenko [Thu, 10 Aug 2017 13:12:11 +0000 (15:12 +0200)]
fdisk: typo fix

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agops: improve TIME column for large times: showing "14453:50" is not good
Denys Vlasenko [Thu, 10 Aug 2017 13:01:43 +0000 (15:01 +0200)]
ps: improve TIME column for large times: showing "14453:50" is not good

function                                             old     new   delta
format_time                                            -     110    +110
func_time                                             59      50      -9
func_etime                                            67      53     -14
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 110/-23)            Total: 87 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agops: make it NOEXEC
Denys Vlasenko [Thu, 10 Aug 2017 12:15:52 +0000 (14:15 +0200)]
ps: make it NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agops: stop using AT_CLKTCK, there are more standard ways
Denys Vlasenko [Thu, 10 Aug 2017 12:10:56 +0000 (14:10 +0200)]
ps: stop using AT_CLKTCK, there are more standard ways

function                                             old     new   delta
ps_main                                              537     558     +21
func_time                                             66      59      -7
get_kernel_HZ                                        102       -    -102
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/1 up/down: 21/-109)           Total: -88 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm,rpm2cpio: INIT_G() was missing (it is a nop here so far)
Denys Vlasenko [Thu, 10 Aug 2017 11:22:01 +0000 (13:22 +0200)]
rpm,rpm2cpio: INIT_G() was missing (it is a nop here so far)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoHopefully fix "will break strict-aliasing rules" warning for get_le32
Denys Vlasenko [Thu, 10 Aug 2017 10:40:48 +0000 (12:40 +0200)]
Hopefully fix "will break strict-aliasing rules" warning for get_le32

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1
Denys Vlasenko [Thu, 10 Aug 2017 09:52:42 +0000 (11:52 +0200)]
libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1

function                                             old     new   delta
unsafe_symlink_target                                  -     147    +147
unzip_main                                          2711    2732     +21
copy_file                                           1657    1678     +21
tar_main                                             999     971     -28
data_extract_all                                    1038     984     -54
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/2 up/down: 189/-82)           Total: 107 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm2cpio: handle LZMA compressed rpms. closes 10166
Denys Vlasenko [Thu, 10 Aug 2017 08:35:08 +0000 (10:35 +0200)]
rpm2cpio: handle LZMA compressed rpms. closes 10166

function                                             old     new   delta
rpm2cpio_main                                         78     120     +42
setup_lzma_on_fd                                       -      29     +29
fork_transformer_and_free                              -      28     +28
...
setup_unzip_on_fd                                     56      32     -24
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 3/5 up/down: 104/-67)            Total: 37 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm2cpio: use rpm_gettags
Denys Vlasenko [Thu, 10 Aug 2017 07:56:49 +0000 (09:56 +0200)]
rpm2cpio: use rpm_gettags

function                                             old     new   delta
rpm_gettags                                            -     451    +451
rpm2cpio_main                                        140      78     -62
skip_header                                           92       -     -92
rpm_main                                            1477    1049    -428
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 451/-582)         Total: -131 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm: prepare rpm_gettags for reuse in rpm2cpio
Denys Vlasenko [Thu, 10 Aug 2017 07:41:57 +0000 (09:41 +0200)]
rpm: prepare rpm_gettags for reuse in rpm2cpio

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm,rpm2cpio: put both sources into one file, no code changes
Denys Vlasenko [Thu, 10 Aug 2017 07:30:38 +0000 (09:30 +0200)]
rpm,rpm2cpio: put both sources into one file, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoUpdate NOFORK_NOEXEC.lst
Denys Vlasenko [Wed, 9 Aug 2017 17:51:17 +0000 (19:51 +0200)]
Update NOFORK_NOEXEC.lst

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoipcs: tweak output orer to match util-linux 2.28
Denys Vlasenko [Wed, 9 Aug 2017 17:27:01 +0000 (19:27 +0200)]
ipcs: tweak output orer to match util-linux 2.28

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoipcrm,ipcs: make them NOEXEC
Denys Vlasenko [Wed, 9 Aug 2017 17:24:19 +0000 (19:24 +0200)]
ipcrm,ipcs: make them NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoipcrm: code shrink
Denys Vlasenko [Wed, 9 Aug 2017 17:20:08 +0000 (19:20 +0200)]
ipcrm: code shrink

function                                             old     new   delta
ipcrm_main                                           698     663     -35

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agovconfig: make it NOEXEC
Denys Vlasenko [Wed, 9 Aug 2017 16:52:19 +0000 (18:52 +0200)]
vconfig: make it NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorpm: code shrink
Denys Vlasenko [Wed, 9 Aug 2017 16:20:01 +0000 (18:20 +0200)]
rpm: code shrink

function                                             old     new   delta
rpm_getstr0                                            -       7      +7
rpm_getstr                                           112     110      -2
rpm_getint                                           120     118      -2
bsearch_rpmtag                                        15      13      -2
shell_builtin_read                                  1334    1320     -14
rpm_main                                            1548    1474     -74
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/5 up/down: 7/-94)             Total: -87 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoshell: more efficient check for EOL in read
Denys Vlasenko [Wed, 9 Aug 2017 12:04:07 +0000 (14:04 +0200)]
shell: more efficient check for EOL in read

function                                             old     new   delta
shell_builtin_read                                  1334    1320     -14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: implement -d DELIM option for 'read'
Denys Vlasenko [Wed, 9 Aug 2017 11:52:36 +0000 (13:52 +0200)]
hush: implement -d DELIM option for 'read'

The POSIX standard only requires the 'read' builtin to handle '-r':
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/read.html

However, Bash introduced the option '-d <DELIM>' to override IFS for
just one invocation, and it is quite useful.

We already support this in ash, let's add it to hush, too.

function                                             old     new   delta
builtin_read                                         263     284     +21
.rodata                                           163587  163589      +2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 23/0)               Total: 23 bytes

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: implement -d DELIM option for read
Johannes Schindelin [Tue, 8 Aug 2017 14:46:39 +0000 (16:46 +0200)]
ash: implement -d DELIM option for read

The POSIX standard only requires the read builtin to handle -r:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/read.html

However, Bash introduced the option -d <DELIM> to override IFS for
just one invocation, and it is quite useful.

It is also super easy to implement in BusyBox' ash, so let's do that.

The motivation: This option is used by Git's test suite.

function                                             old     new   delta
.rodata                                           163505  163587     +82
shell_builtin_read                                  1244    1289     +45
readcmd                                              233     259     +26
builtin_read                                         258     263      +5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 158/0)             Total: 158 bytes

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochcon: show '--reference' in help text only if LONG_OPTS=y
Xabier Oneca [Wed, 9 Aug 2017 10:18:36 +0000 (12:18 +0200)]
chcon: show '--reference' in help text only if LONG_OPTS=y

Signed-off-by: Xabier Oneca <xoneca@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>