oweals/busybox.git
6 years agohush: fix raw ^C handlisg in single-quoted strings
Denys Vlasenko [Sat, 13 Jan 2018 18:14:27 +0000 (19:14 +0100)]
hush: fix raw ^C handlisg in single-quoted strings

function                                             old     new   delta
parse_stream                                        2719    2754     +35

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: add command2.tests from ash tests
Denys Vlasenko [Fri, 12 Jan 2018 16:58:20 +0000 (17:58 +0100)]
hush: add command2.tests from ash tests

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: tweak command -vV printing code, no logic changes
Denys Vlasenko [Fri, 12 Jan 2018 15:17:59 +0000 (16:17 +0100)]
hush: tweak command -vV printing code, no logic changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: implement "command -v -V"
Denys Vlasenko [Fri, 12 Jan 2018 13:41:45 +0000 (14:41 +0100)]
hush: implement "command -v -V"

function                                             old     new   delta
pseudo_exec_argv                                     231     374    +143
if_command_vV_print_and_exit                           -     127    +127
builtin_set                                          267     273      +6
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 276/0)             Total: 276 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agowhich: fix TODO with NOFORK+malloc_failure misbehaving
Denys Vlasenko [Fri, 12 Jan 2018 12:21:33 +0000 (13:21 +0100)]
which: fix TODO with NOFORK+malloc_failure misbehaving

function                                             old     new   delta
find_executable                                       86     104     +18
which_main                                           202     194      -8
executable_exists                                     66      51     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 18/-23)             Total: -5 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: implement "command" builtin (no options are supported yet)
Denys Vlasenko [Thu, 11 Jan 2018 17:05:05 +0000 (18:05 +0100)]
hush: implement "command" builtin (no options are supported yet)

function                                             old     new   delta
pseudo_exec_argv                                     194     231     +37

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix handling of ^C in eval
Denys Vlasenko [Thu, 11 Jan 2018 12:17:30 +0000 (13:17 +0100)]
hush: fix handling of ^C in eval

function                                             old     new   delta
run_list                                            1044    1259    +215
builtin_eval                                          45     126     +81
expand_strvec_to_string                               91       -     -91
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 2/0 up/down: 296/-91)           Total: 205 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix handling of raw ^C in scripts: "echo ^C"
Denys Vlasenko [Thu, 11 Jan 2018 11:39:48 +0000 (12:39 +0100)]
hush: fix handling of raw ^C in scripts: "echo ^C"

function                                             old     new   delta
expand_vars_to_list                                 1133    1187     +54
parse_stream                                        2690    2719     +29

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: remove dead code
Denys Vlasenko [Thu, 11 Jan 2018 10:19:00 +0000 (11:19 +0100)]
hush: remove dead code

function                                             old     new   delta
done_word                                            761     711     -50

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: ALWAYS_INLINE grabstackblock()
Denys Vlasenko [Wed, 10 Jan 2018 14:18:35 +0000 (15:18 +0100)]
ash: ALWAYS_INLINE grabstackblock()

function                                             old     new   delta
grabstackblock                                         5       -      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoinit: stop using static data
Denys Vlasenko [Wed, 10 Jan 2018 12:32:20 +0000 (13:32 +0100)]
init: stop using static data

function                                             old     new   delta
init_action_list                                       4       -      -4
new_init_action                                      148     142      -6
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-10)             Total: -10 bytes
   text    data     bss     dec     hex filename
 927839     481    6832  935152   e44f0 busybox_old
 927833     481    6824  935138   e44e2 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: make ${v:N:M} more robust for very large M by clamping to MIN/MAX_INT
Denys Vlasenko [Wed, 10 Jan 2018 12:22:25 +0000 (13:22 +0100)]
ash: make ${v:N:M} more robust for very large M by clamping to MIN/MAX_INT

Before this patch, "${v:2:0x100000001}" = "${v:2:1}",
and similarly, constructs like "${v:2:9999999999}" may give wrong result
due to int overflows.

function                                             old     new   delta
substr_atoi                                            -      43     +43

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agodd: fixed partial count logic
Denys Vlasenko [Wed, 10 Jan 2018 10:04:09 +0000 (11:04 +0100)]
dd: fixed partial count logic

$ busybox dd if=/dev/zero of=/dev/loop0 bs=100M count=8; echo $?
8+0 records in
7+0 records out  <=========== FIXED, was 7+1
805220352 bytes (767.9MB) copied, 0.464010 seconds, 1.6GB/s
1

function                                             old     new   delta
write_and_stats                                       97      99      +2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agodd: exit with 1 if last write was incomplete
Denys Vlasenko [Wed, 10 Jan 2018 09:58:55 +0000 (10:58 +0100)]
dd: exit with 1 if last write was incomplete

$ busybox dd if=/dev/zero of=/dev/loop0 bs=100M count=8; echo $?
8+0 records in
7+1 records out
805220352 bytes (767.9MB) copied, 0.464010 seconds, 1.6GB/s
1  <=========== FIXED

function                                             old     new   delta
write_and_stats                                       96      97      +1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: add comment explaining last change
Denys Vlasenko [Tue, 9 Jan 2018 16:25:58 +0000 (17:25 +0100)]
ash: add comment explaining last change

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: fix var_bash5.tests - ${VAR/pattern/repl} construct
Denys Vlasenko [Tue, 9 Jan 2018 16:01:00 +0000 (17:01 +0100)]
ash: fix var_bash5.tests - ${VAR/pattern/repl} construct

function                                             old     new   delta
subevalvar                                          1198    1279     +81
rmescapes                                            308     330     +22
preglob                                                8      10      +2
parsefname                                           152     154      +2
expandarg                                            973     975      +2
argstr                                              1144    1146      +2
mklocal                                              290     288      -2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 6/1 up/down: 111/-2)            Total: 109 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoumount: ignore -c
Shawn Landden [Mon, 8 Jan 2018 12:31:58 +0000 (13:31 +0100)]
umount: ignore -c

"-c, --no-canonicalize: Do not canonicalize paths."

As busybox doesn't canonicalize paths in the first place it is safe to ignore
this option.

See https://github.com/systemd/systemd/issues/7786

Signed-off-by: Shawn Landden <slandden@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agomknod: better --help, much clearer code
Denys Vlasenko [Mon, 8 Jan 2018 10:22:37 +0000 (11:22 +0100)]
mknod: better --help, much clearer code

function                                             old     new   delta
packed_usage                                       32066   32091     +25
mknod_main                                           173     174      +1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoless: code shrink
Denys Vlasenko [Mon, 8 Jan 2018 09:27:23 +0000 (10:27 +0100)]
less: code shrink

function                                             old     new   delta
less_main                                           2471    2464      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agodhcprelay: code shrink
Denys Vlasenko [Mon, 8 Jan 2018 09:14:17 +0000 (10:14 +0100)]
dhcprelay: code shrink

function                                             old     new   delta
dhcprelay_main                                       961     958      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agonice: code shrink
Denys Vlasenko [Mon, 8 Jan 2018 09:13:11 +0000 (10:13 +0100)]
nice: code shrink

function                                             old     new   delta
nice_main                                            157     152      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years ago*: make "argc UNUSED_PARAM" consistent
Denys Vlasenko [Mon, 8 Jan 2018 08:43:51 +0000 (09:43 +0100)]
*: make "argc UNUSED_PARAM" consistent

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoawk: code shrink
Denys Vlasenko [Sun, 7 Jan 2018 13:39:34 +0000 (14:39 +0100)]
awk: code shrink

function                                             old     new   delta
awk_main                                             955     948      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: fail if 'shift' operand is out of range
Ingo van Lil [Fri, 5 Jan 2018 14:04:23 +0000 (15:04 +0100)]
ash: fail if 'shift' operand is out of range

If the numeric argument passed to ash's 'shift' built-in is greater than
'$#' the command performs no operation and exits successfully. It should
return a non-zero exit code instead:

http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#shift

This is consistent with bash and hush.

function                                             old     new   delta
shiftcmd                                             122     120      -2

Signed-off-by: Ingo van Lil <inguin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoawk: fix 'delete array[var--]' decrementing var twice
Denys Vlasenko [Sun, 7 Jan 2018 00:19:08 +0000 (01:19 +0100)]
awk: fix 'delete array[var--]' decrementing var twice

function                                             old     new   delta
evaluate                                            3395    3390      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibbb: compile obscure() only if FEATURE_PASSWD_WEAK_CHECK=y
Denys Vlasenko [Thu, 4 Jan 2018 14:21:25 +0000 (15:21 +0100)]
libbb: compile obscure() only if FEATURE_PASSWD_WEAK_CHECK=y

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobuild system: add rule to install without cloberring existing utilities
Yann E. MORIN [Thu, 28 Dec 2017 22:49:49 +0000 (23:49 +0100)]
build system: add rule to install without cloberring existing utilities

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoapplets/install: accept more than one install option
Yann E. MORIN [Thu, 28 Dec 2017 22:49:48 +0000 (23:49 +0100)]
applets/install: accept more than one install option

Currently, it is impossible to pass more than one option to the isntall
script, so it totally prevents using --noclobber.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoapplets/install: respect noclobber for script wrappers too
Yann E. MORIN [Thu, 28 Dec 2017 22:49:47 +0000 (23:49 +0100)]
applets/install: respect noclobber for script wrappers too

Simplify the handling of --noclobber so that it applies to all types of
installation types, even to script wrappers.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotc: enables this applet
Denys Vlasenko [Thu, 4 Jan 2018 09:27:51 +0000 (10:27 +0100)]
tc: enables this applet

function                                             old     new   delta
tc_main                                                -     946    +946
cbq_print_opt                                          -     517    +517
print_qdisc                                            -     475    +475
print_class                                            -     359    +359
llproto_names                                          -     264    +264
packed_usage                                       31853   32066    +213
ll_proto_a2n                                           -     112    +112
llproto_ids                                            -      86     +86
print_tc_classid                                       -      82     +82
static.objects                                         -      20     +20
static._q_                                             -      16     +16
applet_main                                         1564    1568      +4
print_filter                                           -       3      +3
applet_names                                        2708    2711      +3
------------------------------------------------------------------------------
(add/remove: 13/0 grow/shrink: 3/0 up/down: 3100/0)          Total: 3100 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoStart 1.29.0 development cycle
Denys Vlasenko [Tue, 2 Jan 2018 05:11:19 +0000 (06:11 +0100)]
Start 1.29.0 development cycle

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoBump version to 1.28.0 1_28_0
Denys Vlasenko [Tue, 2 Jan 2018 05:07:28 +0000 (06:07 +0100)]
Bump version to 1.28.0

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoscripts/randomtest: do not try building static libbysubox
Denys Vlasenko [Sun, 31 Dec 2017 19:31:05 +0000 (20:31 +0100)]
scripts/randomtest: do not try building static libbysubox

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochown: fix a mistake in opt_complementary change
Denys Vlasenko [Sun, 31 Dec 2017 16:59:16 +0000 (17:59 +0100)]
chown: fix a mistake in opt_complementary change

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agorandomconfig fixes
Denys Vlasenko [Sun, 31 Dec 2017 16:30:02 +0000 (17:30 +0100)]
randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agontpd: do run the script at leat once in 11 minutes
Denys Vlasenko [Tue, 26 Dec 2017 19:19:37 +0000 (20:19 +0100)]
ntpd: do run the script at leat once in 11 minutes

function                                             old     new   delta
ntpd_main                                           1197    1226     +29

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoenv: -u option fails due to typo
Ron Yorston [Mon, 25 Dec 2017 20:36:05 +0000 (21:36 +0100)]
env: -u option fails due to typo

The -u option is supposed to be allowed to appear multiple times; the
option string supplied to getopt32long requires it to be followed by a
nonnegative integer.

Reported-by: Keith Maxwell <keith.maxwell@gmail.com>
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agotar: code shrink
Denys Vlasenko [Mon, 13 Nov 2017 00:56:51 +0000 (01:56 +0100)]
tar: code shrink

function                                             old     new   delta
packed_usage                                       31863   31853     -10
tar_main                                            1013    1002     -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-21)             Total: -21 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agotar: code shrink, better help text
Denys Vlasenko [Mon, 13 Nov 2017 00:40:28 +0000 (01:40 +0100)]
tar: code shrink, better help text

function                                             old     new   delta
tar_main                                             994    1013     +19
packed_usage                                       31893   31863     -30
writeTarFile                                         250     207     -43
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 19/-73)            Total: -54 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agotar: improve help text
Denys Vlasenko [Fri, 10 Nov 2017 21:14:22 +0000 (22:14 +0100)]
tar: improve help text

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoinetd: fix for running by non-root
Denys Vlasenko [Thu, 9 Nov 2017 15:19:42 +0000 (16:19 +0100)]
inetd: fix for running by non-root

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agounshare: -r should map root to user, not the other way around
Denys Vlasenko [Thu, 9 Nov 2017 15:06:33 +0000 (16:06 +0100)]
unshare: -r should map root to user, not the other way around

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agounshare: -r implies -U, not -u
Denys Vlasenko [Thu, 9 Nov 2017 14:59:22 +0000 (15:59 +0100)]
unshare: -r implies -U, not -u

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agounzip: add missing -j to trivial usage
Eugene Rudoy [Tue, 7 Nov 2017 07:03:37 +0000 (08:03 +0100)]
unzip: add missing -j to trivial usage

Signed-off-by: Eugene Rudoy <gene.devel@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agounzip: fix content listing and filtering when -j is used
Eugene Rudoy [Tue, 7 Nov 2017 07:03:36 +0000 (08:03 +0100)]
unzip: fix content listing and filtering when -j is used

Original Info-ZIP's unzip uses unstripped filenames
while doing content listing and filtering, i.e.
 - in content listing mode -j is ignored completely
 - filtering is applied to non-stripped names, -j
   takes effect first while extracting the files

997ad2c64abbe931dffa3598b015c5de04e515cf strips path
components a little bit too early resulting in behavior
deviations.

Fix it by doing stripping after listing/filtering.

p.s. Info-ZIP's unzip behavior is the same as
     that of tar in --strip-components=NUM mode

Signed-off-by: Eugene Rudoy <gene.devel@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agolineedit: get terminal width before printing prompt
Denys Vlasenko [Wed, 8 Nov 2017 12:38:12 +0000 (13:38 +0100)]
lineedit: get terminal width before printing prompt

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agolineedit: do not tab-complete any strings which have control characters
Denys Vlasenko [Tue, 7 Nov 2017 17:09:29 +0000 (18:09 +0100)]
lineedit: do not tab-complete any strings which have control characters

function                                             old     new   delta
add_match                                             41      68     +27

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoash: fix nofork bug where environment is not properly passed to a command
Denys Vlasenko [Fri, 3 Nov 2017 13:16:25 +0000 (14:16 +0100)]
ash: fix nofork bug where environment is not properly passed to a command

function                                             old     new   delta
listvars                                             144     252    +108
evalcommand                                         1500    1546     +46
showvars                                             142     147      +5
shellexec                                            242     245      +3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 162/0)             Total: 162 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoinit: reduce the window when init can lose reboot/poweroff signals
Denys Vlasenko [Thu, 2 Nov 2017 14:25:28 +0000 (15:25 +0100)]
init: reduce the window when init can lose reboot/poweroff signals

function                                             old     new   delta
init_main                                            695     712     +17

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoash: retain envvars with bad names in initial environment. Closes 10231
Denys Vlasenko [Thu, 2 Nov 2017 11:56:24 +0000 (12:56 +0100)]
ash: retain envvars with bad names in initial environment. Closes 10231

Reworks "ash: [VAR] Sanitise environment variable names on entry"
commit.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agontpd: skip over setting next DNS resolution attempt if it is not needed
Denys Vlasenko [Tue, 31 Oct 2017 15:53:23 +0000 (16:53 +0100)]
ntpd: skip over setting next DNS resolution attempt if it is not needed

function                                             old     new   delta
ntpd_main                                           1177    1197     +20
resolve_peer_hostname                                127     129      +2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoFix build failures if MAXHOSTNAMELEN or MAXPATHLEN is not defined
Denys Vlasenko [Tue, 31 Oct 2017 14:59:19 +0000 (15:59 +0100)]
Fix build failures if MAXHOSTNAMELEN or MAXPATHLEN is not defined

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agogrep: skip grepping symlinks to directories
James Clarke [Sat, 7 Oct 2017 17:53:24 +0000 (18:53 +0100)]
grep: skip grepping symlinks to directories

When grep is passed -r, recursive_action will treat any symlinks to
directories not in the root as normal files, since it lstat's them and
is therefore told they are not directories. However, file_action_grep
will still try to fopen and read from them to see whether they match,
which varies in behaviour across platforms. Linux will give EISDIR and
thus grep will not find any matching lines, but FreeBSD will give the
raw contents of the directory itself, which may match the given pattern.
Also, if grep is passed -c, it will even print a count for these
symlinks, even on Linux.

Since this recursive_action behaviour is required for the correct
functioning of other applets, such as tar, grep should handle this
special case and skip any such symlinks.

function                                             old     new   delta
file_action_grep                                      80     161     +81

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agontpd: mention in help text that -d can be repeated
Denys Vlasenko [Tue, 31 Oct 2017 11:47:07 +0000 (12:47 +0100)]
ntpd: mention in help text that -d can be repeated

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agontpd: improve treatment of DNS resolution failures
Denys Vlasenko [Tue, 31 Oct 2017 11:44:37 +0000 (12:44 +0100)]
ntpd: improve treatment of DNS resolution failures

function                                             old     new   delta
ntpd_main                                           1106    1177     +71
resolve_peer_hostname                                122     127      +5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 76/0)               Total: 76 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoudp_io, traceroute: Standardise IPv6 PKTINFO handling to be portable
James Clarke [Sat, 7 Oct 2017 17:53:23 +0000 (18:53 +0100)]
udp_io, traceroute: Standardise IPv6 PKTINFO handling to be portable

The current standard (RFC 3542) is for IPV6_RECVPKTINFO to be given to
setsockopt, and IPV6_PKTINFO to be used as the packet type. Previously,
RFC 2292 required IPV6_PKTINFO to be used for both, but RFC 3542
re-purposed IPV6_PKTINFO when given to setsockopt. The special
Linux-specific IPV6_2292PKTINFO has the same semantics as IPV6_PKTINFO
in RFC 2292, but was introduced at the same time as IPV6_RECVPKTINFO.

Therefore, if we have IPV6_RECVPKTINFO available, we can use the RFC
3542 style, and if not, we assume that only the RFC 2292 API is
available, using IPV6_PKTINFO for both.

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agodf: Use statvfs instead of non-standard statfs
James Clarke [Sat, 7 Oct 2017 17:53:20 +0000 (18:53 +0100)]
df: Use statvfs instead of non-standard statfs

Platforms differ on what their implementations of statfs include.
Importantly, FreeBSD's does not include a f_frsize member inside struct
statfs. However, statvfs is specified by POSIX and includes everything
we need, so we can just use that instead.

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoxfuncs: Handle missing non-POSIX termios constants
James Clarke [Mon, 30 Oct 2017 14:18:32 +0000 (15:18 +0100)]
xfuncs: Handle missing non-POSIX termios constants

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoblkdiscard: Only build on Linux
James Clarke [Sat, 7 Oct 2017 17:53:19 +0000 (18:53 +0100)]
blkdiscard: Only build on Linux

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agonetworking: Fall back on IPPROTO_RAW when SOL_RAW is not defined
James Clarke [Sat, 7 Oct 2017 17:53:21 +0000 (18:53 +0100)]
networking: Fall back on IPPROTO_RAW when SOL_RAW is not defined

Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agontpd: perform DNS resolution out of send/receive loop - closes 10466
Denys Vlasenko [Sat, 28 Oct 2017 15:54:24 +0000 (17:54 +0200)]
ntpd: perform DNS resolution out of send/receive loop - closes 10466

Bad case: send request to server1good.com; then try to resolve server2bad.com -
this fails, and failure takes ~5 secs; then receive server1's
response 5 seconds later. We'll never sync up in this case...

function                                             old     new   delta
ntpd_main                                           1079    1106     +27

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoiproute/iprule: support toolchains without RTA_TABLE routing attribute
Eugene Rudoy [Wed, 18 Oct 2017 22:05:11 +0000 (00:05 +0200)]
iproute/iprule: support toolchains without RTA_TABLE routing attribute

 iproute.c: In function 'print_route':
 iproute.c:85:9: error: 'RTA_TABLE' undeclared (first use in this function)
 iproute.c:85:9: note: each undeclared identifier is reported only once for each function it appears in
 iproute.c: In function 'iproute_modify':
 iproute.c:467:36: error: 'RTA_TABLE' undeclared (first use in this function)

Fix it by partially #ifdef'ing the code added in b42107f21538e39d9a344376372f8261aed589b2

Signed-off-by: Eugene Rudoy <gene.devel@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agotime: fix build for toolchains without O_CLOEXEC
Denys Vlasenko [Fri, 27 Oct 2017 17:05:00 +0000 (19:05 +0200)]
time: fix build for toolchains without O_CLOEXEC

Based on patch by Eugene Rudoy <gene.devel@gmail.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agounlzma: fix SEGV, closes 10436
Denys Vlasenko [Fri, 27 Oct 2017 13:37:03 +0000 (15:37 +0200)]
unlzma: fix SEGV, closes 10436

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agobunzip2: fix runCnt overflow from bug 10431
Denys Vlasenko [Sun, 22 Oct 2017 16:23:23 +0000 (18:23 +0200)]
bunzip2: fix runCnt overflow from bug 10431

This particular corrupted file can be dealth with by using "unsigned".
If there will be cases where it genuinely overflows, there is a disabled
code to deal with that too.

function                                             old     new   delta
get_next_block                                      1678    1667     -11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agohush: fix comment parsing in `cmd`, closes 10421
Denys Vlasenko [Sun, 22 Oct 2017 13:55:48 +0000 (15:55 +0200)]
hush: fix comment parsing in `cmd`, closes 10421

function                                             old     new   delta
parse_stream                                        2692    2690      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agolsscsi: fix xchdir("..") from symlink in /sys/bus/scsi/devices
Markus Gothe [Sat, 21 Oct 2017 19:34:22 +0000 (21:34 +0200)]
lsscsi: fix xchdir("..") from symlink in /sys/bus/scsi/devices

Signed-off-by: Markus Gothe <nietzsche@lysator.liu.se>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agowhitespace fixes
Denys Vlasenko [Thu, 12 Oct 2017 17:40:47 +0000 (19:40 +0200)]
whitespace fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agotypo fix
Denys Vlasenko [Thu, 12 Oct 2017 17:35:42 +0000 (19:35 +0200)]
typo fix

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoash: survive failures in $PS1 expansion. Closes 10371
Denys Vlasenko [Thu, 12 Oct 2017 17:20:13 +0000 (19:20 +0200)]
ash: survive failures in $PS1 expansion. Closes 10371

function                                             old     new   delta
expandstr                                            120     209     +89

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agolineedit: improve multiline PS1 - redraw using last PS1 line. Closes 10381
Avi Halachmi [Thu, 12 Oct 2017 14:38:35 +0000 (16:38 +0200)]
lineedit: improve multiline PS1 - redraw using last PS1 line. Closes 10381

This patch only affects prompts with newlines.

We redraw the prompt [+ input] occasionally, e.g. during tab completion,
history browsing or search, etc, and we expect it to align with prior
redraws, such that the visible effect is that only the input changes.

With multi-line PS1, redraw always printed the prompt some lines below
the old one, which resulted in terminal scroll during every redraw.

Now we only redraw the last PS1 line, so vertical alignment is easier to
manage (we already calculated it using only the last line, but re-drew
all lines - that was the culprit), which fixes those extra scrolls.

Notes:
- We now use the full prompt for the initial draw, after clear-screen (^L),
  and after tab-completion choices are displayed. Everything else now
  redraws using the last/sole prompt line.

- During terminal resize we now only redraw the last[/sole] prompt line,
  which is arguably better because it's hard to do right (and we never did).

- Good side effect for reverse-i-search: its prompt now replaces only the
  last line of the original prompt - like other shells do.

function                                             old     new   delta
put_prompt_custom                                      -      66     +66
draw_custom                                            -      66     +66
parse_and_put_prompt                                 766     806     +40
read_line_input                                     3867    3884     +17
input_tab                                           1069    1076      +7
cmdedit_setwidth                                      61      63      +2
redraw                                                59      47     -12
put_prompt                                            46       -     -46
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 4/1 up/down: 198/-58)           Total: 140 bytes

Signed-off-by: Avi Halachmi <avihpit@yahoo.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agosendmail allow "=" symbol in recipient, closes 10241
Denys Vlasenko [Thu, 5 Oct 2017 15:18:23 +0000 (17:18 +0200)]
sendmail allow "=" symbol in recipient, closes 10241

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agowhitespace and comment format fixes, no code changes
Denys Vlasenko [Thu, 5 Oct 2017 13:33:28 +0000 (15:33 +0200)]
whitespace and comment format fixes, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agowhitespace and comment format fixes, no code changes
Denys Vlasenko [Thu, 5 Oct 2017 13:19:25 +0000 (15:19 +0200)]
whitespace and comment format fixes, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agodo not include <sys/stat.h> just before "libbb.h", it's there already
Denys Vlasenko [Thu, 5 Oct 2017 12:41:36 +0000 (14:41 +0200)]
do not include <sys/stat.h> just before "libbb.h", it's there already

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agowhitespace and comment format fixes, no code changes
Denys Vlasenko [Thu, 5 Oct 2017 12:40:24 +0000 (14:40 +0200)]
whitespace and comment format fixes, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agofree: no longer include common_bufsiz.h
Denys Vlasenko [Thu, 5 Oct 2017 12:16:09 +0000 (14:16 +0200)]
free: no longer include common_bufsiz.h

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agofree: make it NOFORK
Denys Vlasenko [Thu, 5 Oct 2017 12:06:49 +0000 (14:06 +0200)]
free: make it NOFORK

function                                             old     new   delta
parse_cached_kb                                        -      85     +85
free_main                                            580     537     -43
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/1 up/down: 85/-43)             Total: 42 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agodate: maybe_set_utc only once
Denys Vlasenko [Thu, 5 Oct 2017 10:53:25 +0000 (12:53 +0200)]
date: maybe_set_utc only once

It's not clear at all why we do it twice. git archaeology did not help.

function                                             old     new   delta
date_main                                            836     839      +3
maybe_set_utc                                         16       -     -16

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoi2cset: fix 'i' & 's' modes (3 extra bytes were sent)
Avi Fishman [Thu, 5 Oct 2017 09:25:16 +0000 (11:25 +0200)]
i2cset: fix 'i' & 's' modes (3 extra bytes were sent)

When 'i' or 's' modes are selected block array is filled from offset 3
(blen = 3) but copied to data.block buffer from offset 0 so first 3 bytes
contains garbage from stack.
The buffer that is sent is also 3 bytes too long due to those extra 3
bytes.

Signed-off-by: Avi Fishman <AviFishman70@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agouse %m printf specifier where appropriate
Denys Vlasenko [Fri, 29 Sep 2017 16:17:25 +0000 (18:17 +0200)]
use %m printf specifier where appropriate

function                                             old     new   delta
out                                                   85      75     -10
udhcpd_main                                         1472    1461     -11
open_stdio_to_tty                                     98      85     -13
init_exec                                            245     232     -13
udhcpc_main                                         2763    2749     -14
do_cmd                                              4771    4755     -16
status_line_bold_errno                                32      14     -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-95)             Total: -95 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoudhcpc[6]: make log2 messages for chaddr field indented like the rest
Denys Vlasenko [Fri, 29 Sep 2017 16:02:01 +0000 (18:02 +0200)]
udhcpc[6]: make log2 messages for chaddr field indented like the rest

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoudhcpc: paranoia when using kernel UDP mode for sending renew: server ID may be bogus
Denys Vlasenko [Fri, 29 Sep 2017 13:55:24 +0000 (15:55 +0200)]
udhcpc: paranoia when using kernel UDP mode for sending renew: server ID may be bogus

With new code, we request that target IP (server ID) must be directly reachable.
If it's not, this happens:

udhcpc: waiting 2000 seconds
udhcpc: entering listen mode: kernel
udhcpc: opening listen socket on *:68 wlan0
udhcpc: entering renew state
udhcpc: sending renew to 1.1.1.1
udhcpc: send: Network is unreachable
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1.1.1.1 needs routing, this is fishy!
udhcpc: entering rebinding state
udhcpc: entering listen mode: raw
udhcpc: created raw socket
udhcpc: sending renew to 0.0.0.0
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ going to use broadcast

which is the desired behavior. Before the patch, packet to 1.1.1.1 was routed
over eth0 (!) and maybe even into Internet (!!!).

function                                             old     new   delta
udhcpc_main                                         2752    2763     +11
udhcp_send_kernel_packet                             295     301      +6
send_renew                                            82      84      +2
send_packet                                          166     168      +2
bcast_or_ucast                                        23      25      +2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/0 up/down: 23/0)               Total: 23 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoudhcpc[6]: initialize entire sockaddr_ll
Denys Vlasenko [Fri, 29 Sep 2017 12:09:02 +0000 (14:09 +0200)]
udhcpc[6]: initialize entire sockaddr_ll

I see random field values like sll_hatype=0x267 when I strace.
They seem to not matter, but just in case they sometimes do,
let's at least have deterministic values (via memset(0)).

function                                             old     new   delta
change_listen_mode                                   308     322     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoregularize format of source file headers, no code changes
Denys Vlasenko [Mon, 18 Sep 2017 14:28:43 +0000 (16:28 +0200)]
regularize format of source file headers, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoip,ip*: make them NOEXEC
Denys Vlasenko [Mon, 18 Sep 2017 13:45:13 +0000 (15:45 +0200)]
ip,ip*: make them NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agoupdate NOFORK_NOEXEC.lst
Denys Vlasenko [Mon, 18 Sep 2017 12:34:15 +0000 (14:34 +0200)]
update NOFORK_NOEXEC.lst

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agohttpd: fix handling of range requests
Denys Vlasenko [Mon, 18 Sep 2017 11:09:11 +0000 (13:09 +0200)]
httpd: fix handling of range requests

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agostty: add cmspar, flusho, extproc attributes
Denys Vlasenko [Mon, 18 Sep 2017 10:16:47 +0000 (12:16 +0200)]
stty: add cmspar, flusho, extproc attributes

function                                             old     new   delta
mode_info                                            688     704     +16
mode_name                                            502     516     +14
wrapf                                                162     157      -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 30/-5)              Total: 25 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 years agonetcat: net applet (alias to nc)
Denys Vlasenko [Fri, 15 Sep 2017 16:55:53 +0000 (18:55 +0200)]
netcat: net applet (alias to nc)

function                                             old     new   delta
packed_usage                                       31807   31856     +49
applet_names                                        2701    2708      +7
applet_main                                         1560    1564      +4
applet_install_loc                                   195     196      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 61/0)               Total: 61 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>