Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox

tar: implement --no-recursion

function                                             old     new   delta
tar_longopts                                         259     274     +15
.rodata                                             5757    5772     +15
tar_main                                            1038    1052     +14
writeTarFile                                         362     353      -9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 44/-9)              Total: 35 bytes
   text    data     bss     dec     hex filename
  81457    1706    8344   91507   16573 busybox_old
  81477    1706    8344   91527   16587 busybox_unstripped

Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

mdev: remove undocumented subsystem/devname matching hack

It was colliding with matching of devnames with slashes.
We need a more generic way to examine env.vars in rules anyway.

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

mdev: when found, print major,minor into mdev.log

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

tweak help text

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

mdev: add support for $DEVNAME and /dev/mdev.log debug aid

function                                             old     new   delta
make_device                                         1843    2083    +240
mdev_main                                            712     804     +92
packed_usage                                       29236   29251     +15
keywords                                             288      19    -269
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 347/-269)           Total: 78 bytes
   text    data     bss     dec     hex filename
 887506     497    7584  895587   daa63 busybox_old
 887982     497    7584  896063   dac3f busybox_unstripped

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

typo fix in comment

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

volume_id/ext: detect ext4 too

function                                             old     new   delta
volume_id_probe_ext                                  108     132     +24

Signed-off-by: Dees Troy<dees_troy@teamw.in>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

find: if DESKTOP=y, support -wholename (synonym for -path)

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

examples/mdev_fat.conf: small addition

I needed this to make Android's adb see my phone

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

busybox: tweak help text and copyright year

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

fix for spurious testsuite failure

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

mv: accept but ignore -v

function                                             old     new   delta
mv_longopts                                           36      46     +10

Signed-off-by: Simon B <sburnet@hotmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

mkdir,rmdir: accept and ignore -v, --verbose

function                                             old     new   delta
static.rmdir_longopts                                 38      48     +10
mkdir_longopts                                        18      28     +10

Signed-off-by: Simon B <sburnet@hotmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

sed: support long opts and -iSFX

function                                             old     new   delta
static.sed_longopts                                    -      67     +67
sed_main                                             618     682     +64
packed_usage                                       29179   29236     +57
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 188/0)             Total: 188 bytes

Signed-off-by: Simon B <sburnet@hotmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

ln: support -T and -v

function                                             old     new   delta
ln_main                                              445     524     +79
packed_usage                                       29182   29179      -3

Signed-off-by: Simon B <sburnet@hotmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

get_linux_version_code: don't fail on Linux version strints like "3.0-foo"

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

udhcpc6: depend on ipv6

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

fix build failure when compressed help is selected, but bz2 compression is not

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

sendmail: use host rather than NIS domain name for HELO

According to RFC 5321 the argument to HELO "contains the fully-qualified
domain name of the SMTP client" or its IP address if no FQDN is available.
BusyBox sendmail uses the NIS domain name instead which, in many cases,
is likely to be the default "(none)". [vda: yes, I checked my machine
and its uts.domainname was indeed "(none)"]

Using the host name is more likely to satisfy the intent of the RFC while
allowing the otherwise unused safe_getdomainname function to be removed.

Signed-off-by: Ron Yorston <rmy@tigress.co.uk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

lpr: small code shrink

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

lineedit: histfile can get emptied when CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y

When CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is set to y, the histfile
will get cleared if the total amount of history lines is less than MAX_HISTORY.
Only if the histfile is not empty _and_ the amount of lines currently
in memory are equal to or greater than MAX_HISTORY, history saving will
work as expected with this feature enabled.

Output from defconfig + CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y:
$ echo "foo" > ~/.ash_history
$ ./busybox ash
~/busybox/a $ echo "bar" > /dev/null
~/busybox/a $ exit
$ cat ~/.ash_history
$

Output with the patch applied and same config as above:
$ echo "foo" > ~/.ash_history
$ ./busybox ash
~/busybox/b $ echo "bar" > /dev/null
~/busybox/b $ exit
$ cat ~/.ash_history
foo
echo "bar" > /dev/null
exit
$

Signed-off-by: Dennis Groenen <tj.groenen at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

hush: remove sighandler_t definition hack, platform.h has it too

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

getty: fix for NOCTTY killing us with SIGHUP

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

sed: slightly better fix for prev commit's problem

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

sed: fix handling of s/// which has empty matches

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

ifupdown: improve compatibility with Debian

Set environment variable 'PHASE'.
Treat post-up and pre-down as aliases for up and down.
Uses the same logic as ifupdown.nw from ifupdown-0.6.16.
Makes it possible to execute Debian's ifupdown script for
wpa-supplicant.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

Start 1.21.0 development cycle

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

Bump version to 1.20.0

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

udhcpc: fix improper size calculation for OPTION_STRING_HOST

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

mdev: fix mode of creatred node if config file support is not configured

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

Fix another build failure found with randconfig

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

fix build breakage with gcc 4.2.1

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

whitespace fixes

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

fix build breakage found by randconfig

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

who: fix typo in help text

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

hwclock: fix wrong comparison of time value (when it will overlow int)

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

udhcp: make arpping code resistant to time jumps

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

who,less: tweaked help text

function                                             old     new   delta
packed_usage                                       29176   29173      -3

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

mktemp: add support for -u

zlib-1.2.6 Makefile uses "mktemp -u".

function                                             old     new   delta
___path_search                                         -     266    +266
mktemp_main                                          165     250     +85
tempnam                                                -      79     +79
packed_usage                                       29189   29176     -13
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 1/1 up/down: 430/-13)           Total: 417 bytes

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

Drop include/bb_linux_ext2_fs.h, use existing e2fsprogs/e2fs_defs.h

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

umount: make -d always active, add -D to suppress it

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

Tweak INSTALL text

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

Create and use our own copy of linux/ext2_fs.h

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

work around linux/ext2_fs.h breakage

See https://bugzilla.kernel.org/show_bug.cgi?id=42986

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

killall5: don't do STOP/CONT dance if the signal we send is SIGSTOP or SIGCONT

function                                             old     new   delta
kill_main                                            913     942     +29

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

httpd: emit correct content length on range requests past the end. Closes 4952

Signed-off-by: Rob Walker <rwalker@codeaurora.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

hostname: make -i not emit extra trailing space

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

ntpd: fix build failure if !NTPD_SERVER. Closes 4994

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

lsof: new applet

   text    data     bss     dec     hex filename
    221       0       0     221      dd lsof.o

Signed-off-by: Sven Oliver Moll <busybox@svol.li>
Signed-off-by: souf <souf_oued@yahoo.fr>
Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

bloat-o-meter: Remove unused code

The regex matching is way slower, so remove it since it was disabled
anyway.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

bloat-o-meter: handle huge (hex) sizes.

dynamic symbols with size >99999 are printed in hex.
see print_vma(psym->st_size, DEC_5)

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

hush: remove unused member struct command::is_stopped

function                                             old     new   delta
builtin_umask                                        133     132      -1
checkjobs                                            551     544      -7
builtin_fg_bg                                        291     267     -24

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

busybox: tweak help text

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

ftp{get,put}: tweak help text

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

Fix one-applet build for tcpsvd

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

nc: support "-<other_opts>e PROG" form of -e option

function                                             old     new   delta
nc_main                                              975    1033     +58
doexec                                                31      45     +14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 72/0)               Total: 72 bytes

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

ubi_tools: add workaround for bad kernel headers. Closes 4838

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

build system: remove bogus $(1) in last commit

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

build system: detect missing crypt and drop it from linking

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

ntpd: make "reply from IP" messages more uniform

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

test: "test !" was accessing argv past NULL - fix it. Closes 4832

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

ntpd: drop offset averaging code

function                                             old     new   delta
filter_datapoints                                    475     174    -301

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

tftpd: chroot to DIR, not merely chdir. Closes 4874

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

libbb: make xchroot do a chdir("/") after chroot

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

build system: fix broken CONFIG_SYSROOT handling

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

Add SYSROOT, EXTRA_{LDFLAGS,LDLIBS} config opts; sample Android NDK config

Signed-off-by: Rob Walker <rwalker@rwalker.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

printf: fix this case: printf "%b" '\0057usr\0057bin\n'

It was not accepting \0NNN. Standard printf tool does.

function                                             old     new   delta
printf_main                                          869     886     +17

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

printf: trim help text

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

ntpd: tweak log messages format

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

testsuite: add a test that tar detects XZ-compressed data

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

fix trivial bug in unpack_gz_stream (wrong fd used in read)

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

Don't compile get_header_tar_FOO function if they are not needed

Now get_header_tar_gz, get_header_tar_bz2, get_header_tar_lzma
are only used if dpkg is built.

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

tar,rpm2cpio: check that child decompressor did not error out

function                                             old     new   delta
check_errors_in_children                               -      57     +57
tar_main                                             833     848     +15
get_header_tar                                      1720    1733     +13
rpm2cpio_main                                        147     140      -7
handle_SIGCHLD                                        41       -     -41
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/1 up/down: 85/-48)             Total: 37 bytes

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

Move seamless .Z support into unpack_gz_stream

unpack_gz_stream                                     566     643     +77
unpack_gunzip                                        123      12    -111

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

update seamless uncompression code

This change makes "tar tf hello_world.txz" work without
adding special-casing for ".txz" extension. It also removes
ever-growing magic checking code in rpm2cpio and get_header_tar -
we reuse one which lives in setup_unzip_on_fd.

function                                             old     new   delta
unpack_gz_stream                                       7     566    +559
check_signature16                                      -      70     +70
setup_unzip_on_fd                                     99     142     +43
handle_SIGCHLD                                         -      41     +41
unpack_bz2_stream                                    342     376     +34
unzip_main                                          2352    2385     +33
bbunpack                                             503     533     +30
open_transformer                                      74     102     +28
unpack_Z_stream                                     1278    1304     +26
unpack_gunzip                                        101     123     +22
init_transformer_aux_data                              -      18     +18
unpack_xz_stream                                    2388    2402     +14
open_zipped                                          131     141     +10
rpm_main                                            1358    1363      +5
get_header_tar_lzma                                   52      57      +5
get_header_tar_bz2                                    52      57      +5
unpack_lzma_stream                                  2698    2702      +4
hash_find                                            234     233      -1
get_header_tar                                      1759    1733     -26
get_header_tar_gz                                     92      57     -35
unpack_uncompress                                     51      12     -39
rpm2cpio_main                                        201     147     -54
unpack_unxz                                           67      12     -55
unpack_bz2_stream_prime                               55       -     -55
get_header_tar_Z                                      86       -     -86
unpack_gz_stream_with_info                           539       -    -539
------------------------------------------------------------------------------
(add/remove: 3/3 grow/shrink: 14/6 up/down: 947/-890)          Total: 57 bytes

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

archival/libarchive/decompress_unzip.c -> decompress_gunzip.c. no code changes

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

preparatory cleanups for seamless uncompression improvements

unpack_gz_stream_with_info: fix buggy error check
man: fix possible accesses past the end of a string
move seamless uncompression helpers from read_printf.c to open_transformer.c

function                                             old     new   delta
show_manpage                                         153     212     +59
unpack_gz_stream_with_info                           520     539     +19

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

ssd: compat: match -x EXECUTABLE by /proc/pid/exe too

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

uudecode: tweak help text

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

uuencode: tweak help text

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

ntpd: fix a case when discipline_jitter = 0 if we step

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

cp: trim help text

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

du: trim help text a bit more

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

du: remove stray whitespace in help text

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

ntpd: experimental code to correct frequency a bit more aggressively

function                                             old     new   delta
update_local_clock                                   730     792     +62
recv_and_process_peer_pkt                            850     835     -15

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

blkid: if parameters are given, do not scan /dev

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

ntpd: fix the "are we a server" check in previous commit

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

ntpd: avoid printing messages between send and recv. good for fast networks

function                                             old     new   delta
ntpd_main                                            887     929     +42

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

ntpd: log clock drift with three digits after decimal point

+15 bytes.

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

ntpd: log jitter on update too; increase assumed clock precision x2 - to 2ms

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

date: extend help text to explain compat date format. Closes 4820

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

fbsplash: use line_length instead of xres * bytes_per_pixel

In some system (e.g. my "strange" device), line_length is not equal xres *
bytes_per_pixel, so we need to use line_length in scr_fix to mmap and draw
rectangle etc.

My "strange" device output this:
bytes_per_pixel: 4
xres: 600, yres: 1024
yoffset: 0, xoffset: 0, line_length: 2432
G.addr: b74da000

Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

libbb/procps.c: make fast_strtoul_10() stop on '\n' too

This time for real :)

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

grep: support for -x, match whole line

Specified in POSIX.
http://pubs.opengroup.org/onlinepubs/009604499/utilities/grep.html

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

libbb/procps.c: make fast_strtoul_10() stop on '\n' too

This is needed for parsing /proc data on linux 2.4

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

du: use long long for size field

du has issues with files reporting large block counts on
32-bit systems with 4 byte longs.  From looking at the stat.c code, it
seems the preference is to use 'long long', rather than blkcnt_t.

function                                             old     new   delta
du                                                   420     444     +24
du_main                                              317     321      +4
print                                                 43      41      -2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 28/-2)              Total: 26 bytes

Signed-off-by: Ian Wienand <ianw@vmware.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

ntpd: fix offset adjustment after step; better step printing

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

ntpd: increase OPT_qq constant to not collide with -L

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

tar: add support for PAX-encoded path=LONGFILENAME

function                                             old     new   delta
get_header_tar                                      1478    1759    +281

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