*: declare strings with ALIGN1, as appropriate

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

testsuite: make mkfs.minix test not fail spuriously on big endian

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

sed: allow 'w' cmd to use two address form

function                                             old     new   delta
add_cmd                                             1101    1094      -7

Signed-off-by: Mimi Li <felloak@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

tftpd: fix -u USER to work with chroot. Closes 5348

function                                             old     new   delta
tftpd_main                                           546     568     +22
tftp_protocol                                       1844    1839      -5

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

awk: fix FS assignment behavior. Closes 5108

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

ftpd: free allocated string on error path

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

ftpd: fix MDTM's month value. Closes 5336

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

ash: add a comment about VEXPORT

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

fbset: respect rgba configuration lines in fb.modes

The fbset utility would not respect "rgba" config entries in
the fb.modes file such as this (for the ARM Integrator/CP):

mode "640x480-60-clcd"
    # D: 25.175 MHz, H: 31.469 kHz, V: 59.94 Hz
    geometry 640 480 640 480 16
    timings 39722 48 16 33 10 96 2
    rgba 5/10,5/5,5/0,1/15
endmode

This is important especially for this ARGB5551 device which
is hopeless to configure otherwise. I noticed this lacking
feature after the TI "fbtest" program managed to set up the
the colormode correctly.

Signed-off-by: Linus Walleij <triad@df.lth.se>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

acpid: add missing lid switch definition

This patch adds a missing LID0 switch definition.
Without it, closing the notebook lid is not detected by acpid.

Signed-off-by: Eric Martin <eric.martin@gmx.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

include sys/resource.h where needed

We use functions from sys/resource.h in misc applets, but don't include
the header.  This breaks building with newer glibc versions, so add the
include where needed.

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

mount: support strictatime option. Closes 5240

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

awk: make -F STR interpret escape sequences. Closes 5126

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

dpkg: fix creation of .list files (were empty since b768aeb). Closes 5324

While at it, fix filename order and free the list of names.

function                                             old     new   delta
llist_rev                                              -      21     +21
get_header_tar                                      1733    1741      +8
unpack_package                                       587     585      -2
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/1 up/down: 29/-2)              Total: 27 bytes

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

trivial small speed optimization

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

mount: do not pass "comment=ANYTHING" option to kernel. Closes 5240

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

mount: undo recent breakage when mount flags were made unsigned

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

mount: fix the wrongly stored fs creation time

This bug made our ext2 images non-mountable by ext4 driver.

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

mount: set up RO loop device if mount -o ro. Closes 4784

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

tweak help texts

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

adduser: install to /usr, not /, like all other similar tools

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

Move several applets to different install dir:

Moved to [/usr]/sbin:
addgroup, adduser, delgroup, deluser,
arping, chat, ether-wake, fdformat, ifplugd,
ip, ipaddr, iplink, iproute, iprule, iptunnel,
killall5, readahead, rtcwake, tftpd, add-shell, remove-shell, powertop.

Moved to /bin for /usr/bin: kbd_mode.

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

tweak help text

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

build system: fix build of kconfig on Darwin

Of course busybox cannot be used on Darwin (Mac OS X), but it can be
cross-compiled for Linux there. Cross-compilation still requires kconfig
to be built as native host tool.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

wget: fix wget-supports--P testsuite failure. Closes 4940

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

config: do not refer to HTTPS for wget

Signed-off-by: Pierre Carrier <pierre@spotify.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

wget: make -c _not_ truncate the file

function                                             old     new   delta
retrieve_file_data                                   396     436     +40
reset_beg_range_to_zero                               52      45      -7

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

unzip: make options parsing more robust on getopt w/o gnu extensions

Also, code shrank:

function                                             old     new   delta
static.extn                                           15      10      -5
packed_usage                                       29231   29217     -14
unzip_main                                          2388    2291     -97
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-116)           Total: -116 bytes

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

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

wget: correctly handle failure to -c (continue)

function                                             old     new   delta
reset_beg_range_to_zero                                -      52     +52
wget_main                                           2168    2189     +21

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

wget: add dummy --no-cache

function                                             old     new   delta
static.wget_longopts                                 155     166     +11
packed_usage                                       29259   29231     -28

Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

ps: use separate get_uptime() and make it work on non-linux too

Create get_uptime() function in procps/ps.c, and use it rather than
relying on linux-specific sysinfo() inline.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

nanddump: make dumping read-only partitions work

Make dumping read-only partitions work by opening the device
O_RDONLY; otherwise the open() will fail with -EPERM.

Signed-off-by: Matt Reimer <mreimer@sdgsystems.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

modinfo: match more standard module fields and fix version field

Previously, -F version could match the srcversion= string.

before :
  ~ # modinfo -F version tiwlan_drv
  version:        6.1.2012.05.29
  version:        533BB7E5866E52F63B9ACCB
  version:        0x%x, oui=0x%x, 0x%x, 0x%x
  version:        0x%x

  ~ # modinfo tiwlan_drv
  filename:       tiwlan_drv.ko
  author:         Texas Instruments Inc - Retouched by CyanogenDefy
  license:        GPL
  vermagic:       2.6.32.9 preempt mod_unload ARMv7
  parm:           g_sdio_debug_level:debug level
  depends:

now :
  ~ # modinfo -F version tiwlan_drv
  version:        6.1.2012.05.29

  ~ # modinfo tiwlan_drv
  filename:       tiwlan_drv.ko
  license:        GPL
  author:         Texas Instruments Inc - Retouched by CyanogenDefy
  version:        6.1.2012.05.29
  srcversion:     533BB7E5866E52F63B9ACCB
  depends:
  uts_release:    2.6.32.9-g306944c
  vermagic:       2.6.32.9 preempt mod_unload ARMv7
  parm:           g_sdio_debug_level:debug level

This patch also add support for the old "-n" and some other helpers

Change-Id: Icb4e9ca513cbce46b075a6f038799a7a19fb7e22
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

volume_id/ext: use common bb_e2fs_defs.h for ext2/3/4 constants and structs

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

su: do not change to home dir unless -l

Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

remove FEATURE_VI_OPTIMIZE_CURSOR from example config

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

rdate: code shrink

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

Add comments in keyboard escape sequences table

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

vi: save/restore screen upon invocation

function                                             old     new   delta
vi_main                                              253     273     +20

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

vi: nuke FEATURE_VI_OPTIMIZE_CURSOR

It is not Unicode safe, it is not saving much of I/O, and it's large:

function                                             old     new   delta
vi_main                                              255     253      -2
go_bottom_and_clear_to_eol                            28      26      -2
do_cmd                                              4194    4182     -12
show_status_line                                     388     374     -14
strncat                                               39       -     -39
__GI_strncat                                          39       -     -39
refresh                                              774     724     -50
place_cursor                                         276      83    -193
------------------------------------------------------------------------------
(add/remove: 0/3 grow/shrink: 0/6 up/down: 0/-351)           Total: -351 bytes

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

ntpd: on time step, kill all outstanding replies from other peers

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

testsuite: some more awk tests related to conditions

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

rdate: code shrink

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

vi: do not set autoindent by default

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

libbb: add missing_syscalls.c: for now, only Android syscalls

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

android: some sensible defconfig changes

- no /usr
- no skip rootfs
- use /system/lib/modules

And for niceties:
- show usage
- have installer
- long opts
- verbose cp
- ls --color support
- bbconfig

Also adds lsof (new in 1.20.0)

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

platform.h: Android tweaks: ioprio defines, BB_ADDITIONAL_PATH

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

android: fix 'stat', ifdef S_TYPEIS* in coreutiles/stat.c

patch modified from 'BusyBox Patch V1.0 (Vitaly Greck)'
https://code.google.com/p/busybox-android/downloads/detail?name=patch_busybox

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

inetd: fix build failure in Android

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

brctl: fix build failure by s/strtotimeval/bb_strtotimeval/ (android has strtotimeval)

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

lpr: don't send 0-byte print jobs (compat)

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

tar: fix 256-bit encoded number decoding

Signed-off-by: Etienne Le Sueur <elesueur@vmware.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

ash: fix a bug in >${varexp} handling. Closes 5282

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

sed: yet another fix on top of zero length match code

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

man: fix handling of gzipped manpages

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

sed: fix breakage added by zero length match code

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

sed: code shrink

function                                             old     new   delta
process_files                                       2181    2173      -8

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

sed: fix zero chars match/replace

function                                             old     new   delta
process_files                                       2099    2181     +82

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

ifplugd: tweak help text

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

udhcpc[6]: show select timeout in log

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

unzip: ignore chmod errors

This makes unzip to FAT filesystems not exit with error.
This is similar to how the "normal" unzip works.

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

tar: support -J, --xz explicit compression option

function                                             old     new   delta
tar_main                                             868     881     +13
tar_longopts                                         285     290      +5
packed_usage                                       29267   29270      +3

Signed-off-by: Boris Reisig <boris@boris.ca>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

build system: fix build failure when only gunzip is selected

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

mdev: tell kernel that we didn't find the firmware

function                                             old     new   delta
mdev_main                                            797     801      +4

Signed-off-by: Christoph Lohmann <20h@r-36.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

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>