Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

This significantly syncronises ash-signals and hush-signals tests.

function                                             old     new   delta
process_wait_result                                  449     450      +1
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
process_wait_result                                  438     449     +11
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Upstream commit:

    Date: Tue, 2 Jun 2020 23:46:48 +1000
    jobs: Fix waitcmd busy loop

    We need to clear gotsigchld in waitproc because it is used as
    a loop conditional for the waitcmd case.  Without it waitcmd
    may busy loop after a SIGCHLD.

    This patch also changes gotsigchld into a volatile sig_atomic_t
    to prevent compilers from optimising its accesses away.

    Fixes: 6c691b3e5099 ("jobs: Only clear gotsigchld when waiting...")
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>

This change also incorporates other changes to bring us closer to upstream.

function                                             old     new   delta
dowait                                               553     636     +83
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Upstream commit:

    Date: Fri, 10 Apr 2020 21:03:09 +1000
    jobs: Fix infinite loop in waitproc

    After we changed the resetting of gotsigchld so that it is only
    done if jp is NULL, we can now get an infinite loop in waitproc
    if gotsigchld is set but there is no outstanding child because
    everything had been waited for previously without gotsigchld being
    zeroed.

    This patch fixes it by always zeroing gotsigchld as we did before.
    The bug that the previous patch was trying to fix is now resolved
    by switching the blocking mode to DOWAIT_NORMAL after the specified
    job has been completed so that we really do wait for all outstanding
    dead children.
Reported-by: NHarald van Dijk <harald@gigawatt.nl>
    Fixes: 6c691b3e5099 ("jobs: Only clear gotsigchld when waiting...")
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>

function                                             old     new   delta
dowait                                               553     631     +78
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Upstream tried it, and then reverted by:

    From: Herbert Xu <herbert@gondor.apana.org.au>
    Date: Tue, 26 May 2020 23:19:05 +1000
    parser: Fix double-backslash nl in old-style command sub
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

With bash's read builtin it is possible to read from a file (e.g.
device-tree) until the first '\0' character:

IFS= read -r -d '' VARIABLE < file

In busybox ash the -d extension is also implemented, but checking the
read character for '\0' has to be performed after comparing with the
delimiter.
Signed-off-by: NChristian Eggers <ceggers@arri.de>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

The udhcpc script calls ip addr flush .. which flushes addresses
of any address family, including IPv6. However, busybox udhcpc is
IPv4 only and should not influence IPv6 addressing. Hence use ip
addr flush with family constraint.

The script particularly broke IPv6 SLAAC: Typically when udhcpc
calls the script the kernel already assigned the IPv6 link-local
address. The flush removes the link-local IPv6 address again and
prohibits proper IPv6 operation such as SLAAC since neighbor
discovery protocol relies on IPv6 link-local addressing.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
[Taken from https://git.openembedded.org/openembedded-core/commit/meta/recipes-core/busybox/files/simple.script?id=b77541dbb2f442e51842f9d24c8745a6df2d1478]
Signed-off-by: NQuentin Schulz <quentin.schulz@streamunlimited.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
static.MAC_DHCP6MCAST_ADDR                             -       6      +6
Signed-off-by: NUwe Glaeser <uwe.glaeser@dormakaba.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
collect_tv                                             -     132    +132
collect_monotonic                                      -      61     +61
nmeter_main                                          754     778     +24
gmtime                                                 -      21     +21
init_monotonic                                         -      18     +18
init_functions                                        44      48      +4
packed_usage                                       33432   33420     -12
collect_time                                         125      19    -106
------------------------------------------------------------------------------
(add/remove: 5/0 grow/shrink: 2/2 up/down: 260/-118)          Total: 142 bytes
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

these options were added in b4ef2e34 commit
gcc shows unrecognized command-line option warnings
Signed-off-by: NBiswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

On Alpine, some users use /dev/null as a home directory. When removing
such a user with `deluser --remove-home` this causes the /dev/null
device file to be removed which is undesirable. To prevent this pitfall,
check if the home directory specified for the user is an actual
directory (or a symlink to a directory).

Implementations of similar tools for other operating systems also
implement such checks. For instance, the OpenBSD rmuser(1)
implementation [0].

[0]: https://github.com/openbsd/src/blob/b69faa6c70c5bfcfdddc6138cd8e0ee18cc15b03/usr.sbin/adduser/rmuser.perl#L143-L151

function                                             old     new   delta
deluser_main                                         337     380     +43
Signed-off-by: NSören Tempel <soeren+git@soeren-tempel.net>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
len_of_option_as_string                               14      13      -1
dhcp_option_lengths                                   14      13      -1
udhcp_str2optset                                     641     637      -4
static.xmalloc_optname_optval                        777     718     -59
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-65)             Total: -65 bytes
Signed-off-by: NMartin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Commit d1b75e18 (httpd: permit non-default home directory with NOMMU
enabled) only works when used with the '-f' (foreground) option.

When '-f' isn't specified and NOMMU is enabled bb_daemonize_or_rexec()
is called to daemonize the server.  Since the server process has been
re-execed the previous patch results in the xchdir() not being called.

Fix this by resetting the re_execed variable in this case.
Signed-off-by: NRon Yorston <rmy@pobox.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
attach_option                                        411     406      -5
dname_enc                                            381     167    -214
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-219)           Total: -219 bytes
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
sysctl_act_recursive                                 165     179     +14
sysctl_act_on_setting                                467     471      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 18/0)               Total: 18 bytes
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Prior to the patch, both -f and --first-only are in all cases either
no-op or ignored.
Without --tabs, --first-only is the default so specifying it is a no-op.
With --tabs, --all is implied, and --first-only is intended to reset this.

function                                             old     new   delta
expand_main                                          690     694      +4
Signed-off-by: NMark Edgar <medgar123@gmail.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: NMartin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Incorporated valid_domain_label into good_hostname to simplify the implementation.

function                                             old     new   delta
static.xmalloc_optname_optval                        973     958     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-15)             Total: -15 bytes
   text	   data	    bss	    dec	    hex	filename
 993144	  16915	   1872	1011931	  f70db	busybox_old
 993129	  16915	   1872	1011916	  f70cc	busybox_unstripped
Signed-off-by: NMartin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

function                                             old     new   delta
parse_expr                                           887     896      +9
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

When ENABLE_FEATURE_WGET_OPENSSL is enabled, correctly implement TLS
verification by default. And only ignore verification errors, if
--no-check-certificate was passed.

Also note, that previously OPENSSL implementation did not implement
TLS verification, nor printed any warning messages that verification
was not performed.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1879533

CVE-2018-1000500
Signed-off-by: NDimitri John Ledkov <xnox@ubuntu.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

show_history() checks that its argument in non-null so there's
no need to repeat the test at call sites.

function                                             old     new   delta
historycmd                                            25      17      -8
builtin_history                                       29      21      -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-16)             Total: -16 bytes
Signed-off-by: NRon Yorston <rmy@pobox.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

mim runs scripts from a specification file which can be thought
of as an extremely limited Makefile. Neither make variables nor
dependencies are supported. By default the file 'Mimfile' is read.
An example:

   hello:
      echo hello $1

   clean:
      rm -rf *

The command 'mim' or 'mim hello' will echo 'hello'. Unlike 'make'
arguments after the first are available to the script; they don't
specify additional targets.

mim isn't enabled by default.  Enabling it increases the size of the
binary by about 500 bytes.
Signed-off-by: NRon Yorston <rmy@pobox.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

Since commit 7eb8eecb (ash: eval: Add assignment built-in support
again) building BusyBox with the 'command' built-in disabled fails.

parse_command_args() only needs to be called when the 'command'
built-in is run.  Which it won't be if it's disabled.

v2: Avoiding infinite loops is good, too.  Thanks, Harald van Dijk.
Reported-by: NDeweloper <deweloper@wp.pl>
Signed-off-by: NRon Yorston <rmy@pobox.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

When BusyBox is compiled with NOMMU enabled running httpd with
the '-h' option fails even if the specified directory exists:

   $ ls -d www
   www
   $ busybox httpd  -fvvvp 8080 -h www
   ...
   ... try to access http://localhost:8080/www
   ...
   httpd: can't change directory to 'www': No such file or directory

The parent process executes xchdir("www").  When a connection is accepted
it's handled by re-executing httpd in inetd mode.  The child process
inherits the current directory "www" and tries to change directory again
to "www", which fails.

Omit the call to xchdir() when httpd is re-executed.
Signed-off-by: NRon Yorston <rmy@pobox.com>
Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>

From POSIX.1-2008:

	The pattern_list's value shall consist of one or more patterns
	separated by <newline> characters;

As such, given patterns need to be split at newline characters. Without
doing so, busybox grep will interpret the newline as part of the pattern
which is not in accordance with POSIX.

See also: https://bugs.busybox.net/show_bug.cgi?id=12721Signed-off-by: NDenys Vlasenko <vda.linux@googlemail.com>