ash: revert initialisation of SHLVL: fixed upstream
docs: tweak keep_data_small.txt

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
examples/udhcp: do not rewrite resolv.conf if no DNS servers. Closes 6788

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
awk: treat \r as a space character to skip
ash: reset pointers to builtin environment variables after fork

The builtin environment variables can be accessed using macros
that reference the varinit array.  initvar puts pointers to varinit
into the variable hash table.  During forkshell_prepare two copies
of the builtin variables are made:  once as the varinit array and
again through the pointers in the hash table.  One of these copies
is accessed by code that uses the macros and the other by code that
looks up the variable by name.

This is the cause of the strange behaviour of IFS in backticks:

   https://github.com/pclouds/busybox-w32/issues/12

To avoid the problem the pointers in the hash table are reset to
the varinit array in forkshell_init.  It seemed easier to do it
this way than to try and prevent the duplicate copies being made
in the first place.
tar: enable -X, -T and --exclude in MINGW32 configuration
adduser,addgroup: introduce and use CONFIG_LAST_ID

Changes adduser.c, addgroup.c and Config.src to set and use CONFIG_LAST_ID.

function                                             old     new   delta
adduser_main                                         841     865     +24
addgroup_main                                        407     425     +18

Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
gitignore: ignore files generated by 'make test'

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
sort.c: remove a magic number from compare_keys()

Use bitwise OR of proper flags instead.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
sort: check global flags on fallback sort

Sort now performs global reverse on fallback sort if -r is set. Before
only key local flags were checked.

function                                             old     new   delta
compare_keys                                         712     738     +26

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
date: emulate %e format
date: actually use modified strftime
date: add dummy stime
ntpd: fix compilation warnings

GCC complained about since_last_update being set but not used.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
ntpd: remove now unnecessary check for IP_PKTINFO definition

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
top.c: fix compilation warnings

pfd[1] is unused

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
win32: use strptime from gnulib
libbb: fix parsing of "10101010" date/time form

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Merge branch 'busybox' into merge