15724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Denys Vlasenko	e93031e6dc	ash: if "[[" bashism is not supported, do not handle it anywhere ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-10 01:23:19 +02:00
Denys Vlasenko	57b7efb0d5	ash: trivial code shrink ... function old new delta parse_command 1677 1674 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-10 01:20:26 +02:00
Ron Yorston	1f27fa9838	testsuite: allow tests to work in paths containing spaces ... Tweak some tests so they work when the path to the test directory or $HOME contains spaces. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-09 20:35:48 +02:00
Denys Vlasenko	9db344a0f4	hush: fix var_leaks.tests and var_preserved.tests on NOMMU ... function old new delta remove_nested_vars - 77 +77 run_pipe 1756 1786 +30 pseudo_exec_argv 376 379 +3 leave_var_nest_level 98 32 -66 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 2/1 up/down: 110/-66) Total: 44 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-09 19:05:11 +02:00
Denys Vlasenko	eb0de05d68	hush: fix func_return2.tests on NOMMU ... function old new delta hush_main 1714 1718 +4 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-09 17:54:07 +02:00
Denys Vlasenko	a1870f4807	unlzma: fix segfault on bad archive ... function old new delta unpack_lzma_stream 2647 2653 +6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 20:45:16 +02:00
Denys Vlasenko	38ccd6af8a	bzip2: fix two crashes on corrupted archives ... As it turns out, longjmp'ing into freed stack is not healthy... function old new delta unpack_usage_messages - 97 +97 unpack_bz2_stream 369 409 +40 get_next_block 1667 1677 +10 get_bits 156 155 -1 start_bunzip 212 183 -29 bb_show_usage 181 120 -61 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 2/3 up/down: 147/-91) Total: 56 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 20:05:04 +02:00
Denys Vlasenko	8e2174e9bd	wget: check chunk length for overflowing off_t ... function old new delta retrieve_file_data 428 465 +37 wget_main 2386 2389 +3 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 40/0) Total: 40 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 18:06:24 +02:00
Denys Vlasenko	7bcde5f00d	libbb.h: always include sys/resource.h ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 17:23:27 +02:00
Denys Vlasenko	87a08e476b	lzop: remove method checks which are always true/false ... function old new delta do_lzo_compress 232 224 -8 lzo_compress 531 488 -43 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-51) Total: -51 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 16:44:45 +02:00
Denys Vlasenko	3d4f688a19	lzop: buffer several 32-bit writes when we start a new compressed block ... function old new delta lzo_compress 483 531 +48 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 16:31:02 +02:00
Denys Vlasenko	24ef5c6375	lzop: reuse strings ... function old new delta lzo_compress 470 483 +13 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 13/0) Total: 13 bytes text data bss dec hex filename 940011 477 7284 947772 e763c busybox_old 939976 477 7284 947737 e7619 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 14:00:03 +02:00
Denys Vlasenko	15684bf545	lzop: checksum reads do not need to be checksummed ... function old new delta do_lzo_decompress 404 427 +23 f_read32 22 - -22 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 13:45:04 +02:00
Denys Vlasenko	3a7d16d488	lzop: don't support ancient versions < 0.94 (15 Oct 1997) ... 0.94 came only 2 months after initial 0.90: 0.90 (10 Aug 1997): First public release of lzop ... 0.94 (15 Oct 1997): Header format change function old new delta do_lzo_decompress 411 404 -7 f_read8 24 - -24 f_read16 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 0/1 up/down: 0/-62) Total: -62 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 13:35:28 +02:00
Denys Vlasenko	434f95960a	lzop: code shrink by using header_t matching on-disk layout ... function old new delta add_bytes_to_chksum 37 47 +10 lzo_decompress 524 532 +8 init_chksum 14 21 +7 chksum_getresult 13 17 +4 f_read 33 28 -5 f_write8 20 - -20 f_write32 22 - -22 f_write16 25 - -25 f_write 36 - -36 do_lzo_compress 328 232 -96 do_lzo_decompress 526 411 -115 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 4/3 up/down: 29/-319) Total: -290 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-08 13:33:43 +02:00
Denys Vlasenko	7924b69f99	tar: trim help text ... Usage: tar c|x|t [-ZzJjahmvokO] [-f TARFILE] [-C DIR] [-T FILE] [-X FILE] [--exclude PATTERN]... [FILE]... Create, extract, or list files from a tar file Operation: <============== DELETED c Create x Extract t List -f FILE Name of TARFILE ('-' for stdin/out) -C DIR Change to DIR before operation -v Verbose -O Extract to stdout -m Don't restore mtime -o Don't restore user:group -k Don't replace existing files -Z (De)compress using compress -z (De)compress using gzip -J (De)compress using xz -j (De)compress using bzip2 -a (De)compress using lzma -h Follow symlinks -T FILE File with names to include -X FILE File with glob patterns to exclude --exclude PATTERN Glob pattern to exclude Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 21:04:39 +02:00
Denys Vlasenko	8d6eab3225	hush: fix prompt in multi-line $(()) ... Now shows PS2 in this case: /path/to/dir $ a=b; echo $(( > _ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 17:01:31 +02:00
Denys Vlasenko	17058a06c4	libbb: switch bb_ask_noecho() to "mallocing" string return API ... function old new delta bb_ask_noecho 313 330 +17 get_cred_or_die 125 115 -10 passwd_main 995 958 -37 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/2 up/down: 17/-47) Total: -30 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 15:50:30 +02:00
Denys Vlasenko	bae8fc4436	xargs: use bb_ask_y_confirmation_FILE() instead of homegrown copy ... function old new delta bb_ask_y_confirmation_FILE - 83 +83 inetd_main 2033 2043 +10 udhcp_send_kernel_packet 295 301 +6 rmescapes 306 310 +4 send_tree 353 355 +2 i2cdetect_main 674 672 -2 confirm_or_abort 43 38 -5 get_terminal_width_height 242 234 -8 bb_ask_y_confirmation 76 10 -66 xargs_main 823 755 -68 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 4/5 up/down: 105/-149) Total: -44 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 15:23:10 +02:00
Denys Vlasenko	77cb6b99a4	libbb: rename bb_ask -> bb_ask_noecho, bb_ask_confirmation -> bb_ask_y_confirmation ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 15:08:12 +02:00
Denys Vlasenko	2f094ae821	telnet: move winsize detection closer to I/O loop, delete non-functioning debug code ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 15:02:20 +02:00
Denys Vlasenko	e0afe0a9fd	ftpd: allow -A if !FTPD_AUTHENTICATION as well ... Users will be able to use "ftpd -A" in scripts regardless of build config Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 14:18:42 +02:00
Denys Vlasenko	8edaaced16	ftpd: added -A option to disable all authentication, closes 10921 ... function old new delta packed_usage 32745 32777 +32 ftpd_main 2162 2156 -6 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 32/-6) Total: 26 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 14:02:21 +02:00
Denys Vlasenko	32c3e3a44c	wget,ftpd: shorten and reuse strings ... function old new delta wget_main 2382 2386 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 4/0) Total: 4 bytes text data bss dec hex filename 934228 477 7296 942001 e5fb1 busybox_old 934202 477 7296 941975 e5f97 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 13:22:52 +02:00
Denys Vlasenko	9fe8bd8d61	httpd: do not default to Content-type: application/octet-stream ... Instead, simply don't send this header. On Mon, Apr 2, 2018 at 8:17 PM, xisd <xisd-dev@riseup.net> wrote: > I had some trouble using busybox httpd to serve a static website and I > thought the issue might be of interest. > > My problem is related to something that seem quite common for static > site generator : the use of html files without the '.html' extension > (it is called 'clean url'...) > > Most web server guess that these files are html and display them like > any other .html files. > > From what I understood, the MIME type for files without extension in > busybox htttp default settings is 'application/octet-stream', and > because of that 'clean url' pages are not displayed. > > It is only trouble because I wanted to deploy my website on freshly > installed linux without editing any configuration. > > The default MIME setting make sense to me as it is, I just thought that > might be worth mentioning since the use of 'clean url' seem to be a > common practice for static sites generators (the one I use is callled > 'yellow' (https://github.com/datenstrom/yellow)) > > Here is a link for the related issue on github : > https://github.com/datenstrom/yellow/issues/317 function old new delta send_headers 702 718 +16 send_headers_and_exit 23 20 -3 handle_incoming_and_exit 2794 2791 -3 send_file_and_exit 772 756 -16 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/3 up/down: 16/-22) Total: -6 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-07 01:13:30 +02:00
Denys Vlasenko	6b6a3d9339	scripts/kconfig/mconf.c: survive is SIGWINCH is not defined ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 19:05:53 +02:00
Denys Vlasenko	2c99702810	i386: make stack size optimization selectable, and allow i486 insns (bswap) ... It's hard to imagine someone still using non-bswap equipped CPU function old new delta xmalloc_optname_optval 888 879 -9 write_leases 214 205 -9 write32 36 27 -9 update_status 612 603 -9 udhcpd_main 1468 1459 -9 udhcpc_main 2708 2699 -9 udhcp_run_script 804 795 -9 sha256_process_block64 423 414 -9 sha1_process_block64 337 328 -9 sha1_end 80 71 -9 send_ACK 161 152 -9 select_lease_time 64 55 -9 rpm_getint 118 109 -9 readprofile_main 1719 1710 -9 read32 33 24 -9 rdate_main 236 227 -9 machtime 39 30 -9 inet_addr_match 103 94 -9 get_prefix 344 335 -9 f_write32 31 22 -9 f_read32 31 22 -9 dumpleases_main 620 611 -9 KeyExpansion 197 188 -9 udhcp_str2optset 536 518 -18 read_config 222 204 -18 lfp_to_d 55 37 -18 ipaddr_modify 1226 1208 -18 dnsd_main 1278 1260 -18 des_crypt 1344 1326 -18 d_to_lfp 106 88 -18 bb_bswap_64 29 11 -18 INET_setroute 827 809 -18 read_leases 330 309 -21 zcip_main 1256 1229 -27 send_offer 476 449 -27 ipcalc_main 534 507 -27 handle_incoming_and_exit 2821 2794 -27 fmt_time_bernstein_25 131 104 -27 common_traceroute_main 3804 3768 -36 rpm_gettags 451 397 -54 parse_args 1412 1358 -54 volume_id_probe_hfs_hfsplus 627 564 -63 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/42 up/down: 0/-732) Total: -732 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 19:01:51 +02:00
Denys Vlasenko	2ab994f707	placate gcc-8.0.1 warnings ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 18:26:33 +02:00
Denys Vlasenko	f5018dac21	hush: fix "unset PS1/PS2", and put them into initial variable set ... "unset PS1/PS2" causes prompts to be empty strings function old new delta hush_main 1031 1089 +58 goto_new_line 27 33 +6 fgetc_interactive 244 245 +1 unset_local_var 155 149 -6 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/1 up/down: 65/-6) Total: 59 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 17:58:21 +02:00
Denys Vlasenko	d1d6d9c5d8	sort: smaller and more agressive FEATURE_SORT_OPTIMIZE_MEMORY ... function old new delta sort_main 1098 1037 -61 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 16:44:50 +02:00
Denys Vlasenko	00bd76728d	hush: if we did match "LINENO" or "OPTIND", stop further comparisons ... function old new delta handle_changed_special_names 99 101 +2 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 14:57:53 +02:00
Denys Vlasenko	cf079ffe1c	hush: consolidate handling of setting/unsetting of PSn, LINENO, OPTIND ... function old new delta handle_changed_special_names - 99 +99 unset_local_var 256 155 -101 set_local_var 557 437 -120 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/2 up/down: 99/-221) Total: -122 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-06 14:50:12 +02:00
Denys Vlasenko	de02625985	hush: update to correctly handle changed var_bash[346].tests ... function old new delta expand_one_var 1612 1604 -8 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 17:04:53 +02:00
Denys Vlasenko	f2ed39b930	hush: implement "hush -s" ... function old new delta hush_main 1015 1031 +16 packed_usage 32757 32745 -12 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 16/-12) Total: 4 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 16:46:49 +02:00
Denys Vlasenko	d878ccca9c	placate gcc 8.0.1 sprintf overflow warnings in config tools ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 15:21:34 +02:00
Denys Vlasenko	21b7f1b6b6	hush: fix a few more corner cases with empty-expanding cmds ... See added testcases function old new delta run_pipe 1723 1784 +61 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 15:15:53 +02:00
Denys Vlasenko	41d8f10813	hush: fix corner cases with exec in empty expansions ... Cases like these: var=val exec >redir var=val `` >redir function old new delta run_pipe 1701 1723 +22 redirect_and_varexp_helper 56 55 -1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 22/-1) Total: 21 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 14:41:21 +02:00
Denys Vlasenko	929a41d577	hush: less mind-bending set_vars_and_save_old() ... function old new delta run_pipe 1651 1701 +50 set_local_var 510 557 +47 pseudo_exec_argv 544 581 +37 redirect_and_varexp_helper 64 56 -8 set_vars_and_save_old 164 149 -15 unset_local_var 274 256 -18 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/3 up/down: 134/-41) Total: 93 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 14:09:14 +02:00
Denys Vlasenko	4e1dc539e9	hush: "no logic changes" in last commit was not true, fix it up ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 13:10:34 +02:00
Denys Vlasenko	34f6b12330	hush: make run_pipe code simpler to understand, no logic changes ... function old new delta run_pipe 1641 1651 +10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 11:30:17 +02:00
Denys Vlasenko	d358b0b65d	hush: fix a bug where we don't properly handle f() { a=A; b=B; }; a= f ... function old new delta unset_local_var 20 274 +254 leave_var_nest_level - 98 +98 set_vars_and_save_old 128 164 +36 enter_var_nest_level - 32 +32 builtin_local 46 50 +4 pseudo_exec_argv 554 544 -10 redirect_and_varexp_helper 77 64 -13 run_pipe 1890 1641 -249 unset_local_var_len 267 - -267 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 3/3 up/down: 424/-539) Total: -115 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-05 00:51:55 +02:00
Denys Vlasenko	332e4115c9	hush: make var nesting code independent of "local" support ... Also, add code to abort at ~65000 function recursion depth. SEGVing is not as nice as exiting with a message (and restoring termios!): $ f() { echo -n .; f; }; f ....<many dots later>....hush: fatal recursion (depth 65281) function old new delta run_pipe 1826 1890 +64 pseudo_exec_argv 544 554 +10 parse_and_run_file 71 80 +9 i_getch 104 107 +3 done_command 99 102 +3 set_local_var 508 510 +2 helper_export_local 214 215 +1 builtin_local 49 46 -3 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 7/1 up/down: 92/-3) Total: 89 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-04 22:35:13 +02:00
Denys Vlasenko	61407807ab	hush: fix for readonly vars in "ro=A ro=B cmd" case ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-04 21:14:28 +02:00
Denys Vlasenko	759ca8a4cb	sort: move misplaced comment ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-04 17:07:21 +02:00
Denys Vlasenko	c29c2e60d8	sort: FEATURE_SORT_OPTIMIZE_MEMORY ... On sorting all kernel/linux/arch/ *.[ch] files, this reduces memory usage by 6%. yes | head -99999999 | sort goes down from 1900Mb to 380 Mb. function old new delta sort_main 862 1098 +236 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-04 17:03:41 +02:00
Denys Vlasenko	ee1fd1246e	ash: unbreak PS1 parsing after "ash: parser: Add syntax stack..." commit ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-04 13:59:53 +02:00
Denys Vlasenko	fbf44854a3	hush: support "f() (cmd)" functions ... Many other shells support this construct function old new delta parse_stream 2950 3018 +68 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-03 14:56:52 +02:00
Denys Vlasenko	49015a60cb	hush: fix mishandling of "true | f() { echo QWE; }" ... function old new delta run_pipe 1820 1826 +6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-03 13:02:43 +02:00
Denys Vlasenko	5fa0505f8a	hush: fix "set -e; false || x=1; echo OK" ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-03 11:21:13 +02:00
Denys Vlasenko	11752d46d1	hush: one-word, no-globbing handling of local/export/readonly args ... function old new delta done_word 738 790 +52 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-04-03 08:20:58 +02:00