Denys Vlasenko
4cde4cca65
ls: handle -d and -R through option_mask32
...
function old new delta
scan_and_display_dirs_recur 545 550 +5
display_single 1039 1044 +5
append_char 67 68 +1
display_files 399 396 -3
ls_main 736 717 -19
opt_flags 68 11 -57
.rodata 168864 168784 -80
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/4 up/down: 11/-159) Total: -148 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 20:08:22 +01:00
Denys Vlasenko
96d9c5bdbd
ls: handle -p and -F through option_mask32
...
function old new delta
display_single 1039 1044 +5
append_char 67 68 +1
display_files 399 396 -3
scan_and_display_dirs_recur 545 541 -4
ls_main 736 722 -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/3 up/down: 6/-21) Total: -15 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 19:56:13 +01:00
Denys Vlasenko
51b01fda30
ls: LIST_ID_NAME/ID_NUMERIC/LOPT/LONG are the same, merge as LONG
...
Also, handle -n and --full-time using option_mask32
function old new delta
scan_and_display_dirs_recur 548 545 -3
display_single 1053 1039 -14
ls_main 777 736 -41
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-58) Total: -58 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 19:42:12 +01:00
Denys Vlasenko
a1cbaca1ba
ls: make -Z output compatible with GNU coreutils 8.25
...
This also makes it clear that LIST_MODEBITS == LIST_LOPT
function old new delta
ls_main 752 777 +25
display_files 400 399 -1
display_single 1055 1053 -2
my_stat 320 317 -3
packed_usage 32311 32280 -31
.rodata 168895 168864 -31
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/5 up/down: 25/-68) Total: -43 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 19:30:14 +01:00
Denys Vlasenko
2c3131d88e
ls: LIST_NLINKS/SIZE/DATE_TIME/SYMLINK are always the same, merge as LIST_LOPT
...
They are always set and cleared together
function old new delta
append_char 69 68 -1
display_single 910 908 -2
ls_main 677 664 -13
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-16) Total: -16 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 19:05:11 +01:00
Denys Vlasenko
5d43ddc59b
ls: handle -s through option_mask32
...
function old new delta
scan_and_display_dirs_recur 493 494 +1
sort_and_display_files 424 423 -1
ls_main 682 677 -5
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 18:43:43 +01:00
Denys Vlasenko
b60686cc2a
ls: handle -i through option_mask32
...
function old new delta
sort_and_display_files 420 424 +4
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 18:34:11 +01:00
Denys Vlasenko
f5bd6f631c
ls: handle -a and -A through option_mask32
...
function old new delta
ls_main 685 682 -3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 18:24:05 +01:00
Denys Vlasenko
11540a8da4
ls: handle all sort options through option_mask32
...
function old new delta
packed_usage 31007 31024 +17
my_stat 318 324 +6
sort_and_display_files 419 420 +1
print_name 216 217 +1
sortcmp 228 216 -12
opt_flags 96 64 -32
ls_main 732 685 -47
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/3 up/down: 25/-91) Total: -66 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-23 18:01:48 +01:00
Denys Vlasenko
e1f90d13fa
ls: -1 should be ignored by -l (and options which imply -l)
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-22 22:02:19 +01:00
Denys Vlasenko
f580baf94a
ls: more correct handling of -c, -u
...
function old new delta
my_stat 302 318 +16
packed_usage 30977 30969 -8
display_single 928 910 -18
sortcmp 258 228 -30
ls_main 776 732 -44
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/4 up/down: 16/-100) Total: -84 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-22 19:02:57 +01:00
Denys Vlasenko
194b2ebd2a
ls: replace -e with --full-time, add --group-directories-first, delete -K
...
-K and -e were non-standard
function old new delta
static.ls_longopts 9 47 +38
ls_main 748 776 +28
display_single 901 928 +27
sortcmp 254 258 +4
ls_options 32 31 -1
opt_flags 100 96 -4
packed_usage 31032 30977 -55
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/3 up/down: 97/-60) Total: 37 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-22 17:32:20 +01:00
Denys Vlasenko
bbc7bee966
make --help texts more uniform
...
function old new delta
packed_usage 31062 31035 -27
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-21 02:49:58 +01:00
Denys Vlasenko
ed15dde60a
Move FEATURE_AUTOWIDTH config option to two applets which use it
...
No code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-11 16:35:52 +01:00
Denys Vlasenko
265062d59d
shells: make hush test optional, rename ASH_BUILTIN_foo -> ASH_foo
...
This makes hash and ash more symmetrical wrt config menu and config
options.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-10 15:13:30 +01:00
Denys Vlasenko
f560422fa0
Big cleanup in config help and description
...
Redundant help texts (one which only repeats the description)
are deleted.
Descriptions and help texts are trimmed.
Some config options are moved, even across menus.
No config option _names_ are changed.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-10 14:58:54 +01:00
Denys Vlasenko
1cc6804f69
hush: make echo builtin optional
...
It's a bit overkill (who would want it off?) but ash already has it
configurable. Let's be symmetric.
Also tweak kbuild logic to use ASH_BUILTIN_ECHO to select echo.o,
not ASH.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-09 17:10:04 +01:00
Denys Vlasenko
1125d7d680
hush: kill builtin and kill %jobspec support
...
Also made it and printf, type and wait builtins optional.
function old new delta
builtin_kill - 323 +323
bltins1 336 348 +12
builtin_type 114 116 +2
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 337/0) Total: 337 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-08 17:19:38 +01:00
Denys Vlasenko
0b8835861b
Make it possible to select "sh" and "bash" aliases without selecting ash or hush
...
The same can be done for msh, but we are probably better off just deleting it
in a next versio or two.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-12-23 16:56:43 +01:00
Denys Vlasenko
e184a88356
df: implement -B n<suff> and -B <suff> formats of -B option
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-12-12 19:56:31 +01:00
Denys Vlasenko
4bd0c2ab38
fix musl problem with dirname, now for all users of bb_make_directory()
...
function old new delta
bb_make_directory 412 419 +7
install_main 793 769 -24
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-24) Total: -17 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-12-04 10:42:07 +01:00
Denys Vlasenko
cf2600c366
install: fix musl problem with dirname
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-12-03 11:49:23 +01:00
Denys Vlasenko
15fb91cefb
test: make [ and [[ forms individually selectable
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-23 18:31:48 +01:00
Denys Vlasenko
73f743a381
Remove remnants of disabled "length" applet
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-23 14:54:38 +01:00
Denys Vlasenko
7caf1369f5
Make dos2unix/unix2dos independently selectable
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-23 14:52:19 +01:00
Denys Vlasenko
af3f420116
Convert all coreutils/* applets to "new style" applet definitions
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-23 14:46:56 +01:00
Denys Vlasenko
42eeb255c1
test: fix compile error in last commit
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-10-02 02:35:13 +02:00
Denys Vlasenko
de89205bdf
test: memory leak: free group id list
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-10-02 01:49:13 +02:00
Denys Vlasenko
7373759947
fix "aloc" -> "alloc" typos
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-09-17 20:58:22 +02:00
Denys Vlasenko
d811aaa43c
sha3sum: fix config text (it's no longer only 512-bit)
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-08-29 15:20:15 +02:00
Denys Vlasenko
71a090f187
sha3: fix to conform to final SHA3 padding standard, add -a BITS option
...
function old new delta
hash_file 331 396 +65
md5_sha1_sum_main 485 538 +53
packed_usage 30423 30464 +41
sha3_begin 17 31 +14
sha3_hash 101 110 +9
sha3_end 41 49 +8
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-08-29 14:05:25 +02:00
Denys Vlasenko
e695ac97fd
typo fixes
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-07-19 17:48:55 +02:00
Denys Vlasenko
b0056ea86d
{md5,shaN}sum: make -c EMPTY fail
...
function old new delta
md5_sha1_sum_main 466 485 +19
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-07-11 19:51:08 +02:00
Denys Vlasenko
237bedd499
getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST
...
In many cases, this aqllows to drop use of opt_complementary.
Approximately -400 bytes:
function old new delta
getopt32 1423 1502 +79
opt_string 17 18 +1
OPT_STR 24 25 +1
uniq_main 416 406 -10
timeout_main 279 269 -10
sulogin_main 270 260 -10
readprofile_main 1825 1815 -10
ps_main 543 533 -10
pidof_main 245 235 -10
pgrep_main 611 601 -10
od_main 2600 2590 -10
mkfs_minix_main 2684 2674 -10
mkfs_ext2_main 2603 2593 -10
microcom_main 712 702 -10
makemime_main 315 305 -10
ionice_main 282 272 -10
inetd_main 2074 2064 -10
ifplugd_main 1144 1134 -10
halt_main 353 343 -10
getopt_main 636 626 -10
fdisk_main 2854 2844 -10
env_main 206 196 -10
dmesg_main 319 309 -10
conspy_main 1214 1204 -10
awk_main 981 971 -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes
text data bss dec hex filename
919373 906 14060 934339 e41c3 busybox_old
918969 906 14060 933935 e402f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-07-06 21:58:02 +02:00
Natanael Copa
8f4faa1e3d
df: use f_frsize instead of f_bsize for correct sizes
...
Use the correct field f_frsize instead of f_bsize.
The statfs f_bsize is the "Optimal transfer block size" while the
f_frsize is the "Fragment size (since Linux 2.6)". On some FUSE
filesystems those may differ.
Fixes bug 9046
URL: https://bugs.busybox.net/show_bug.cgi?id=9046
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-06-24 04:12:01 +02:00
Denys Vlasenko
877dedb825
cp: add -u/--update and --remove-destination
...
Based on the patch by wdlkmpx@gmail.com
function old new delta
copy_file 1546 1644 +98
add_partition 1270 1362 +92
ask_and_unlink 95 133 +38
do_iproute 132 157 +25
decode_one_format 710 715 +5
cp_main 369 374 +5
ubirename_main 198 202 +4
read_package_field 232 230 -2
bb_make_directory 421 412 -9
packed_usage 30505 30476 -29
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 7/3 up/down: 267/-40) Total: 227 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-05-27 00:46:38 +02:00
Denys Vlasenko
3e134ebf6a
*: slap on a few ALIGN1/2s where appropriate
...
The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map"
text data bss dec hex filename
829901 4086 1904 835891 cc133 busybox_before
829665 4086 1904 835655 cc047 busybox
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-22 18:09:21 +02:00
Denys Vlasenko
9de2e5a222
*: hopefully all setup_common_bufsiz() are in place
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-21 18:38:51 +02:00
Denys Vlasenko
47cfbf32fd
*: add most of the required setup_common_bufsiz() calls
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-21 18:18:48 +02:00
Denys Vlasenko
e6a2f4cc5a
libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it
...
The config item is FEATURE_USE_BSS_TAIL. When it is off (default):
function old new delta
read_config 210 228 +18
doCommands 2279 2294 +15
ipneigh_list_or_flush 763 772 +9
ipaddr_list_or_flush 1256 1261 +5
display_process_list 1301 1306 +5
conspy_main 1378 1383 +5
do_lzo_compress 352 355 +3
do_lzo_decompress 565 567 +2
push 46 44 -2
inetd_main 2136 2134 -2
uevent_main 421 418 -3
addLines 97 92 -5
bb_common_bufsiz1 8193 1024 -7169
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes
text data bss dec hex filename
829850 4086 9080 843016 cdd08 busybox_old
829901 4086 1904 835891 cc133 busybox_unstripped
FEATURE_USE_BSS_TAIL=y:
read_config 210 228 +18
doCommands 2279 2294 +15
ipneigh_list_or_flush 763 772 +9
ipaddr_list_or_flush 1256 1261 +5
display_process_list 1301 1306 +5
conspy_main 1378 1383 +5
do_lzo_compress 352 355 +3
do_lzo_decompress 565 567 +2
inetd_main 2136 2134 -2
bb_common_bufsiz1 8193 - -8193
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes
text data bss dec hex filename
829850 4086 9080 843016 cdd08 busybox_old
829911 4086 880 834877 cbd3d busybox_unstripped
FIXME: setup_common_bufsiz() calls are missing.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-21 17:39:11 +02:00
Denys Vlasenko
b14374a5ba
sort: "-o FILE", not "-o", is the syntax
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-02 18:20:26 +02:00
Denys Vlasenko
c87e81f944
sort: help text does not need to say that -mST are supported but ignored
...
Such information is useless for users of "sort --help"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-02 17:39:50 +02:00
Denys Vlasenko
ea351b9742
ls: fix columnar output. Closes 8731
...
In coreutils/ls.c, 1.19 introduced commit
2f7d9e8903vda.linux@googlemail.com >
2016-03-06 17:53:11 +01:00
Rafał Miłecki
c30a5b1373
dd: support iflag=skip_bytes
...
It allows specifying amount of bytes directly (not only amount of
blocks) is also supported by GNU's Coreutils.
function old new delta
parse_comma_flags - 93 +93
static.iflag_words - 12 +12
dd_main 1569 1580 +11
packed_usage 30591 30600 +9
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/0 up/down: 125/0) Total: 125 bytes
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-02-01 02:17:28 +01:00
Ron Yorston
4a79224cfc
printf: short-circuit output when argument to %b includes \c
...
printf wasn't correctly handling \c in an argument to the %b format
specifier.
printf %bXX OK\\c
returned 'OK\cXX' rather than the expected 'OK'.
function old new delta
printf_main 886 899 +13
Signed-off-by: Ron Yorston <rmy@pobox.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-01-31 22:23:05 +01:00
Denys Vlasenko
c7e47cf627
dos2unix: try to preserve ownership. closes 8311
...
function old new delta
dos2unix_main 426 441 +15
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-01-17 03:50:36 +01:00
Mike Frysinger
6a70db85cf
truncate: use O_WRONLY|O_NONBLOCK
...
This matches coreutils behavior. We don't read the fd, and truncation
does not need blocking.
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
2016-01-13 13:30:20 -05:00
Ari Sundholm
e111a16404
truncate: always set mode when opening file to avoid fortify errors
...
Busybox crashes due to no mode being given when opening:
$ ./busybox truncate -s 1M foo
*** invalid open64 call: O_CREAT without mode ***: ./busybox terminated
======= Backtrace: =========
/lib/x86_64-linux-gnu/libc.so.6(+0x7338f)[0x7f66d921338f]
/lib/x86_64-linux-gnu/libc.so.6(__fortify_fail+0x5c)[0x7f66d92aac9c]
/lib/x86_64-linux-gnu/libc.so.6(+0xeb6aa)[0x7f66d928b6aa]
./busybox[0x4899f9]
======= Memory map: ========
00400000-004d0000 r-xp 00000000 00:1a 137559 /home/ari/busybox/busybox
006cf000-006d0000 r--p 000cf000 00:1a 137559 /home/ari/busybox/busybox
006d0000-006d1000 rw-p 000d0000 00:1a 137559 /home/ari/busybox/busybox
006d1000-006d4000 rw-p 00000000 00:00 0
014e7000-01508000 rw-p 00000000 00:00 0 [heap]
7f66d8f8a000-7f66d8fa0000 r-xp 00000000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f66d8fa0000-7f66d919f000 ---p 00016000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f66d919f000-7f66d91a0000 rw-p 00015000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f66d91a0000-7f66d935b000 r-xp 00000000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
7f66d935b000-7f66d955a000 ---p 001bb000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
7f66d955a000-7f66d955e000 r--p 001ba000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
7f66d955e000-7f66d9560000 rw-p 001be000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
7f66d9560000-7f66d9565000 rw-p 00000000 00:00 0
7f66d9565000-7f66d966a000 r-xp 00000000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
7f66d966a000-7f66d9869000 ---p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
7f66d9869000-7f66d986a000 r--p 00104000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
7f66d986a000-7f66d986b000 rw-p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
7f66d986b000-7f66d988e000 r-xp 00000000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
7f66d9a64000-7f66d9a67000 rw-p 00000000 00:00 0
7f66d9a8a000-7f66d9a8d000 rw-p 00000000 00:00 0
7f66d9a8d000-7f66d9a8e000 r--p 00022000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
7f66d9a8e000-7f66d9a8f000 rw-p 00023000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
7f66d9a8f000-7f66d9a90000 rw-p 00000000 00:00 0
7ffc47761000-7ffc47782000 rw-p 00000000 00:00 0 [stack]
7ffc477ab000-7ffc477ad000 r-xp 00000000 00:00 0 [vdso]
ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]
Aborted (core dumped)
$
Fix this by simply always setting the mode, as it doesn't hurt even
when O_CREAT is not specified.
This bug is a regression introduced in fc3e40eari@tuxera.com >
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
2016-01-13 13:28:01 -05:00
Denys Vlasenko
ace833028f
stat: make -f optional. This allows to build stat for non-linux systems
...
function old new delta
packed_usage 30761 30706 -55
Based on the patch by Ron Yorston.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-30 22:10:44 +01:00
Richard Genoud
d683c5c2f1
tr: support octal ranges
...
now, we can do printf "a\tb\tcdef\n" | ./busybox tr -d "\1-\14b-e"
af
and bonus, we save some bytes.
function old new delta
expand 718 699 -19
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-19) Total: -19
bytes
Signed-off-by: Richard Genoud <richard.genoud@gmail.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-26 17:18:07 +01:00
