Denys Vlasenko
5f118ff885
Merge branch 'master' of git+ssh://busybox.net/var/lib/git/busybox
2011-11-21 14:25:15 +01:00
Denys Vlasenko
fc186711fe
makemime: document our current behavior. Tweak help text
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-19 14:43:02 +01:00
Denys Vlasenko
3bc4fc5857
makemime: content-type should default to application/octet-stream
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-19 13:55:46 +01:00
Denys Vlasenko
578b817151
sendmail: fix a mistake in previous commit
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-19 13:54:50 +01:00
Denys Vlasenko
41fea01066
sendmail: stop doing -t unconditionally; makemime: generate 76 char base64 lines
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-18 22:25:35 +01:00
Denys Vlasenko
a0bef7cc27
hexdump: fix hexdump -n1 -ve '8/2 ""' SEGV. Closes 4478
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-18 02:47:35 +01:00
Denys Vlasenko
860491c525
udhcpc: shrink code by setting xid more economically
...
function old new delta
send_decline 90 82 -8
udhcpc_main 2649 2640 -9
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-18 02:09:13 +01:00
Denys Vlasenko
1dc80bae0b
libbb.h: add check for bad off_t size detection
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-17 21:51:32 +01:00
Denys Vlasenko
f59a50ee30
libbb.h: tighten up macro code
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-16 21:30:19 +01:00
Denys Vlasenko
a092a89d8f
udhcpc6: rudimentary code to export data to script; fix IAADDR parsing
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-16 20:17:12 +01:00
Denys Vlasenko
2951add2bf
applets_sh/nologin: an applet implemented as shell script
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-10 18:00:28 +01:00
Denys Vlasenko
39b233182c
mount: resolve hosts to IPs in nfs mounts
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-10 17:01:39 +01:00
Denys Vlasenko
a86e02492d
mount: make FEATURE_MOUNT_NFS not needed for Linux 2.6.23+
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-10 16:53:35 +01:00
Dave Love
fae473c81b
mount: support -o noacl
...
Signed-off-by: Dave Love <fx@gnu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-10 15:19:25 +01:00
Bernhard Reutner-Fischer
b9f4cd85f0
Config: clarify {SHOW,VERBOSE,COMPRESS}_USAGE
...
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2011-11-09 20:23:38 +01:00
Peter Korsgaard
743edac6c8
bb_daemonize_or_rexec(): add flag to double-fork; use it in start-stop-daemon
...
Add a DAEMON_DOUBLE_FORK flag to make bb_daemonize double-fork so it isn't a
session leader, and hence doesn't get a controlling tty on Linux if a tty is
ever opened, similar to how libdaemon's daemon_fork or the big
start-stop-daemon does it - And use it in start-stop-daemon.
For details, see http://www.win.tue.nl/~aeb/linux/lk/lk-10.html#ss10.3
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-09 19:44:37 +01:00
Denys Vlasenko
7e21f0491c
udhcpc[6]: tweak help text, remove -B from udhcpc6 and "--version" from both
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-08 11:39:41 +01:00
Denys Vlasenko
2b6a6b90cc
udhcpc6: set hop limit to 1 in emitted raw packets
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-07 18:22:06 +01:00
Denys Vlasenko
68c5b28156
udhcpc6: fix endianness
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-07 16:21:24 +01:00
Denys Vlasenko
9ba75048c0
udhcpc6: new applet. Not yet functional.
...
It builds. It sends Solicit packets. Not sure these packets are well-formed.
I have no server to test it against.
function old new delta
udhcpc6_main - 2426 +2426
d6_send_raw_packet - 428 +428
d6_send_kernel_packet - 274 +274
d6_recv_raw_packet - 248 +248
send_d6_discover - 177 +177
packed_usage 28795 28966 +171
d6_run_script - 156 +156
send_d6_renew - 140 +140
send_d6_release - 126 +126
d6_recv_kernel_packet - 116 +116
send_d6_select - 95 +95
perform_d6_release - 78 +78
d6_find_option - 74 +74
init_d6_packet - 54 +54
d6_copy_option - 48 +48
d6_mcast_from_client_config_ifindex - 42 +42
d6_dump_packet - 24 +24
static.FF02__1_2 - 16 +16
d6_store_blob - 13 +13
applet_names 2432 2440 +8
applet_main 1412 1416 +4
applet_nameofs 706 708 +2
add_d6_client_options - 1 +1
------------------------------------------------------------------------------
(add/remove: 21/0 grow/shrink: 4/0 up/down: 4721/0) Total: 4721 bytes
text data bss dec hex filename
879080 493 7584 887157 d8975 busybox_old
884585 497 7584 892666 d9efa busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-07 15:55:39 +01:00
Denys Vlasenko
50089fc61c
udhcpc: trim help text, rename badly-named variable
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-07 15:44:46 +01:00
Denys Vlasenko
0fd4347ced
udhcpc: code shrink
...
function old new delta
udhcpc_main 2646 2649 +3
udhcp_run_script 816 802 -14
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-07 00:54:27 +01:00
Denys Vlasenko
3b46fcb95d
udhcpc: remove workaround for bugs in Win98 dhcp server ("MSFT 98" vendor string)
...
Stats for last three commits:
function old new delta
udhcpc_main 2635 2646 +11
udhcp_recv_raw_packet 425 414 -11
udhcp_recv_kernel_packet 210 134 -76
packed_usage 28940 28857 -83
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 11/-170) Total: -159 bytes
text data bss dec hex filename
879524 493 7584 887601 d8b31 busybox_old
879340 493 7584 887417 d8a79 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-05 01:26:18 +01:00
Denys Vlasenko
d38ca03946
udhcpc: reuse string constant; remove unneeded memset(0)
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-05 01:25:03 +01:00
Denys Vlasenko
2017d48c0d
udhcpc: deprecate --hostname NAME
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-05 01:24:14 +01:00
Denys Vlasenko
c0cae52662
lineedit: fix build failure
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-04 01:09:09 +01:00
Denys Vlasenko
9ce09bc9cb
lineedit: add support for M-b, M-f, M-d, M-Backspace
...
function old new delta
ctrl_left - 96 +96
ctrl_right - 76 +76
static.esccmds 81 93 +12
read_line_input 3876 3885 +9
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/0 up/down: 193/0) Total: 193 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 13:28:22 +01:00
Daniel Fandrich
45cdf166dc
android build system updates
...
Signed-off-by: Daniel Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 11:20:07 +01:00
Denys Vlasenko
f3efd3c2a0
rx: code shrink
...
function old new delta
rx_main 961 947 -14
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 10:19:53 +01:00
Dan Fandrich
f808e777db
rx: Fix file corruption with duplicate blocks
...
Rather than dropping the dupe, rx was appending it to the file.
Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 10:18:33 +01:00
Karol Lewandowski
b5ebe5fdb3
mount: handle list of comma-separated fs types in -t option
...
Allows one to specify list of filesystem types to be
tried when mounting particular device. E.g.
mount -t vfat,ext2 ...
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 10:02:31 +01:00
Denys Vlasenko
f85554c265
mount: free commented /etc/filesystems lines when we read it
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-03 09:54:53 +01:00
Denys Vlasenko
3b1603410a
nmeter: fix block i/o count on newer Linux kernels
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-11-01 23:34:46 +01:00
Denys Vlasenko
f8a5b792ba
cttyhack: move /sys/class/tty/console/active check to the front
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-31 16:57:04 +01:00
Alexander Shishkin
156840c249
cttyhack: print detected ctty name when called without parameters
...
Sometimes there's a need to figure out the controlling tty from a shell
script, for example, to obtain a line for getty. In this case it's easier
to call cttyhack than trying to repeat some of the cttyhack's logic.
function old new delta
cttyhack_main 283 327 +44
packed_usage 28911 28915 +4
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-31 13:18:44 +01:00
Denys Vlasenko
bcdae63875
testsuite: merge bzcat2.tests into bzcat.tests
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-31 01:10:47 +01:00
Denys Vlasenko
c0e37b4340
testsuite: fix the mishap in the previous commit
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-31 01:08:35 +01:00
Denys Vlasenko
c531b9a3e4
bzcat: fix unpacking of more than one file, and unpacking of zero-size bz2. Closes 4393
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-31 01:05:16 +01:00
Denys Vlasenko
b076193f74
modinfo: make it select PLATFORM_LINUX. Closes 4411
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-30 22:07:36 +01:00
Denys Vlasenko
e504c245f7
getty: Hurd has no CBAUD, work around that
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-30 21:27:33 +01:00
Denys Vlasenko
83e34ac4b5
makemime: fix -a option not taking parameter
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-28 18:25:38 +02:00
Christian Engelmayer
8de2e42201
syslogd: work around rename() not renaming hardlinks to themselves
...
Function log_locally() within the syslogd can potentially lock up when
restarting the daemon after a power loss in case the unplanned shutdown hit the
rename operation during logfile rotation.
While POSIX requires the rename operation to be atomic, many file systems such
as JFFS2 implement the rename operation in 2 steps by linking the new name
followed by unlinking the original name. In case of a power loss during the
rename the system can end up with /var/log/messages and /var/log/messages.0
being 2 hard links to the same file.
When the syslog daemon restarts in such a situation it will rediscover the need
to rotate the log files, however, POSIX also requires that rename does nothing
and reports success in case oldpath and newpath are existing hard links to the
same file. Looping through reopen: by (O_CREAT | O_APPEND), the daemon
eternally reopens the same file without succeeding to rotate.
Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-28 18:12:42 +02:00
Denys Vlasenko
e6094d95b5
libbb: shrink base64 decoding a bit
...
function old new delta
bb_uuenc_tbl_base64 67 66 -1
decode_base64 182 161 -21
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-28 16:15:00 +02:00
Denys Vlasenko
73d249e704
whitespace fixes
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-28 14:07:44 +02:00
Leonid Lisovskiy
328f27fe44
libbb: split decode_base64 off read_base64
...
function old new delta
decode_base64 - 182 +182
read_base64 378 255 -123
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/1 up/down: 182/-123) Total: 59 bytes
Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-28 13:59:55 +02:00
Denys Vlasenko
ec447c7f01
libbb.h: remove unused defines
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-24 04:06:18 +02:00
Denys Vlasenko
e9dc354df8
getty: fix a minor problem of Ctrl-D not printing '\n'
...
Also removed defines for control chars which are never changed,
and added login/getty README.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-23 23:58:59 +02:00
Denys Vlasenko
ee320c6d9c
getty: reset tty attrs on Ctrl-C and Ctrl-D too
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-23 18:05:58 +02:00
Denys Vlasenko
e206a4de4c
getty: add O_NONBLOCK to open which is used to drop ctty
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-22 08:19:42 +02:00
Denys Vlasenko
a241069004
remove duplicate include <sys/swap.h>
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-10-22 06:39:00 +02:00