Denys Vlasenko
c5d16e92c1
diff: fix -N and nonexistent files. Closes 7454
...
function old new delta
diffreg 1253 1310 +57
diff_main 1329 1355 +26
create_J 1819 1821 +2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 85/0) Total: 85 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-05-05 18:39:22 +02:00
Denys Vlasenko
0cc9b1843d
vi: survive if stdin is nonblocking. closes 9851
...
function old new delta
readit 55 69 +14
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-05-02 20:39:02 +02:00
Denys Vlasenko
10ad622dc2
Spelling fixes in comments, documentation, tests and examples
...
By klemens <ka7@github.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-04-17 16:13:32 +02:00
Denys Vlasenko
8a134ec680
libbb: move isqrt from factor, use it in diff too
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-04-11 07:34:56 +02:00
Yousong Zhou
8f3bf4f0d3
vi: avoid touching a new file with ZZ when no editing has been done
...
This is the behaviour observed with standard vim and busybox vi of at
least 1.22.1. It was changed with commit "32afd3a vi: some
simplifications" which happened before 1.23.0.
Mistyping filename on command line happens fairly often and it's better
we restore the old behaviour to avoid a few unnecessary flash writes and
sometimes efforts of debugging bugs caused by those unneeded stray
files.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-03-24 21:13:10 +01:00
Denys Vlasenko
e88608eae2
vi: don't touch file with :x when modified_count == 0
...
Along with it, there are other changes
- Check for uppercase X is removed as the expression will be always false and
:X itself is another totally different command in standard vim
- The status line will show number of written lines instead of lines requested
by the colon command. This is also how the standard vim is doing, though
the difference is that '!' has to be explicitly specified in vim to allow
partial writes
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-03-13 20:50:42 +01:00
Denys Vlasenko
eba7fe6bb9
vi,fsck: do not use build timestamp unconditionally. Closes 9626
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-29 19:14:26 +01:00
Denys Vlasenko
01ccdd1d3c
libbb: consolidate the code to set termios unbuffered mode
...
function old new delta
set_termios_to_raw - 116 +116
count_lines 72 74 +2
powertop_main 1458 1430 -28
top_main 943 914 -29
more_main 759 714 -45
fsck_minix_main 2969 2921 -48
conspy_main 1197 1135 -62
rawmode 99 36 -63
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/6 up/down: 118/-275) Total: -157 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2017-01-11 16:17:59 +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
1d3a04a3a4
Code style fixes, no code changes
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-28 01:22:57 +01:00
Aaro Koskinen
cb810c48c0
patch: fix matching failure
...
Fix matching failure when plist is advanced while checking for buffered
lines - the lines in the hunk that are about to be added should be
skipped when checking for matching context.
Also add a valid test case that fails with current busybox and is fixed
by the change.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-24 11:40:36 +01:00
Aaro Koskinen
2eff59667d
patch: fix debug log failure
...
If we reach the end of plist it means the input has still data while we
are expecting EOF. Fix the log to avoid a crash.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-11-24 11:38:56 +01:00
Brian Foley
61d5997b58
awk: fix segfault on for loop syntax error
...
Parsing "for()" segfaults as awk fails to find loop iteration expressions.
Signed-off-by: Brian Foley <bpfoley@google.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-10-24 02:09:56 +02:00
Denys Vlasenko
61fcc8c781
vi: fix '' command (goto to prev context)
...
The '' command in vi doesn't currently work because after the first
apostrophe is read, the next character is converted to an integer
between 0 and 25 inclusive (for indexing the array of marks). The
comparison of the converted character with an apostrophe therefore never
succeeds, meaning that '' doesn't do anything.
Based on the patch by Francis Rounds <francis.rounds@4bridgeworks.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-09-28 16:23:05 +02:00
Denys Vlasenko
de1996dac5
vi: make "g<key>" error message less likely to show garbage
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-09-15 13:53:42 +02:00
Denys Vlasenko
76d72376e0
sed: fix "sed n (flushes pattern space, terminates early)" testcase failure
...
Patch based on work by Dengke Du <dengke.du@windriver.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-09-01 01:59:11 +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
Denys Vlasenko
f2559e5c2b
sed: fix append command to match GNU sed 4.2.1
...
This closes one testcase failure
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-05-06 18:25:56 +02:00
Denys Vlasenko
cbdff15bb7
sed: understand \n,\r and \t in i and a commands. Closes 8871
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-24 16:18:03 +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
e4d925b889
sed: support "-f -" idiom
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-04-08 00:20:36 +02:00
Denys Vlasenko
2a4bba3ce2
sed: make 's///w FILE' actually write to FILE. Closes 8251
...
function old new delta
add_cmd 1167 1210 +43
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-01-24 15:52:16 +01:00
Denys Vlasenko
eb5091070f
patch: correctly handle "patch FILE_TO_PATCH" form. Closes 7736
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2016-01-23 05:13:15 +01:00
Denys Vlasenko
7b85ec30b5
*: more BUILD_BUG_ON conversions
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-13 17:17:34 +02:00
Denys Vlasenko
7f3a2a2256
join some common strings, -400 bytes
...
function old new delta
print_intel_cstates 499 511 +12
file_insert 355 364 +9
dpkg_main 2944 2940 -4
ifenslave_main 645 640 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 21/-9) Total: 12 bytes
text data bss dec hex filename
937564 932 17676 956172 e970c busybox_old
937164 932 17676 955772 e957c busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-08 11:24:44 +02:00
Denys Vlasenko
d60752f8c9
build system: -fno-builtin-printf
...
Benefits are: drops reference to out-of-line putchar(), fixes a few cases
of failed string merge.
function old new delta
i2cdump_main 1488 1502 +14
sha256_process_block64 423 433 +10
sendmail_main 1183 1185 +2
list_table 1114 1116 +2
i2cdetect_main 1235 1237 +2
fdisk_main 2852 2854 +2
builtin_type 119 121 +2
unicode_conv_to_printable2 325 324 -1
scan_recursive 380 378 -2
mkfs_minix_main 2687 2684 -3
buffer_fill_and_print 178 169 -9
putchar 152 - -152
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 7/4 up/down: 34/-167) Total: -133 bytes
text data bss dec hex filename
937788 932 17676 956396 e97ec busybox_old
937564 932 17676 956172 e970c busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-07 22:42:45 +02:00
Denys Vlasenko
28b00ce6ff
awk: support "length" form of "length()". Closes 8371
...
function old new delta
parse_expr 805 848 +43
tokenlist 447 448 +1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-10-02 02:41:39 +02:00
Aaro Koskinen
a47fccaa63
diff: fix -B with single line changes
...
Fix -B with single line changes. They were always ignored regardless
if they were blank or not.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-07-31 16:50:49 +02:00
Maninder Singh
97f2f7ca7f
Removes stray empty line from code
...
This patch removes stray empty line from busybox code
reported by script find_stray_empty_lines
Signed-off-by: Maninder Singh <maninder1.s@samsung.com >
Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-07-13 03:25:46 +02:00
Maninder Singh
97c6491b4e
typo fixes
...
Signed-off-by: Maninder Singh <maninder1.s@samsung.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-05-25 13:46:36 +02:00
Andrew Fuller
4d8ddb810d
vi: basic undo feature shouldn't depend on yankmark
...
Currently basic undo functionality with the 'u' key depends on
FEATURE_VI_YANKMARK. These two features are separate, so we can remove this
dependency.
Signed-off-by: Andrew Fuller <abf@google.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-05-03 18:18:25 +02:00
Denys Vlasenko
63f4d32c98
sed: implement ",+N" range end
...
function old new delta
add_cmd 1115 1173 +58
process_files 2226 2253 +27
sed_main 696 702 +6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 91/0) Total: 91 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-04-17 14:24:55 +02:00
Denys Vlasenko
49acc1a761
vi: make BACKSPACE and DELETE join lines at start/end of line
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-03-12 21:15:34 +01:00
Denys Vlasenko
8dff01d06a
libbb: introduce and use is_prefixed_with()
...
function old new delta
is_prefixed_with - 18 +18
complete_username 78 77 -1
man_main 737 735 -2
fsck_device 429 427 -2
unpack_ar_archive 80 76 -4
strip_unsafe_prefix 105 101 -4
singlemount 1054 1050 -4
rtc_adjtime_is_utc 90 86 -4
resolve_mount_spec 88 84 -4
parse_one_line 1029 1025 -4
parse_conf 1460 1456 -4
may_wakeup 83 79 -4
loadkmap_main 219 215 -4
get_irqs_from_stat 103 99 -4
get_header_cpio 913 909 -4
findfs_main 79 75 -4
fbsplash_main 1230 1226 -4
load_crontab 776 771 -5
expand_vars_to_list 1151 1146 -5
date_main 881 876 -5
skip_dev_pfx 30 24 -6
make_device 2199 2193 -6
complete_cmd_dir_file 773 767 -6
run_applet_and_exit 715 708 -7
uudecode_main 321 313 -8
pwdx_main 197 189 -8
execute 568 560 -8
i2cdetect_main 1186 1176 -10
procps_scan 1242 1230 -12
procps_read_smaps 1017 1005 -12
process_module 746 734 -12
patch_main 1903 1891 -12
nfsmount 3572 3560 -12
stack_machine 126 112 -14
process_timer_stats 449 435 -14
match_fstype 111 97 -14
do_ipaddr 1344 1330 -14
open_list_and_close 359 343 -16
get_header_tar 1795 1779 -16
prepend_new_eth_table 340 323 -17
fsck_main 1811 1794 -17
find_iface_state 56 38 -18
dnsd_main 1321 1303 -18
base_device 179 158 -21
find_keyword 104 82 -22
handle_incoming_and_exit 2785 2762 -23
parse_and_put_prompt 774 746 -28
modinfo 347 317 -30
find_action 204 171 -33
update_passwd 1470 1436 -34
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/49 up/down: 18/-540) Total: -522 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-03-12 17:48:34 +01:00
Denys Vlasenko
fe8b5802ba
patch: segfault fix. Closes 7916
...
Fix segfault on this case (malformed --- line):
-- dwarves.orig 2015-02-25 01:45:27.753000000 +0000
+++ dwarves 2015-02-25 01:46:08.199000000 +0000
@@ -1,7 +1,7 @@
Bashful
Doc
Dopey
-Grouchy
+Grumpy
Happy
Sleepy
Sneezy
function old new delta
patch_main 1903 1957 +54
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-03-11 18:01:34 +01:00
Denys Vlasenko
39f017293a
diff: fix a bug in diffing against stdin. Closes 7784
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-01-11 16:41:54 +01:00
Ron Yorston
70f4320b40
vi: fix reading of file after last line
...
If the :r command is used to read a file after the last line of the
buffer the last line of the buffer and the first line of the file
are joined. An extra blank line appears at the end of the buffer.
file 1
file 1
file 1file 2
file 2
file 2
~
~
The insertion point is normally at the start of the line following the
specified line. When the specified line is the last one the next_line
function baulks at moving to the non-existent following line.
Signed-off-by: Ron Yorston <rmy@tigress.co.uk >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-01-07 18:23:29 +01:00
Ron Yorston
e5213cee38
vi: failure to open file is not an error when initialising buffer
...
Commit 32afd3army@tigress.co.uk >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2015-01-07 17:00:48 +01:00
Denys Vlasenko
cd73871178
sed: fix "sed CMD -i nonexistent_file". Closes 7484
...
function old new delta
sed_main 643 676 +33
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-10-05 02:44:34 +02:00
Denys Vlasenko
9caea2448e
sed: fix a buglet in s///NUM handling
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-09-16 01:11:13 +02:00
Denys Vlasenko
05399fc53d
vi: fix incorrect memory access on brace matching. Closes 7256
...
While at it, fix brace matching to actually show the match
(missed fflush was causing cursor positioning to be buffered);
shorten brace matching code; remove unused macro indirection
in indicate_error().
Custom linker script 'busybox_ldscript' found, using it
function old new delta
indicate_error - 61 +61
mysleep 43 56 +13
char_insert 483 486 +3
find_pair 167 124 -43
Indicate_Error 61 - -61
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/1 up/down: 77/-104) Total: -27 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-09-15 17:06:10 +02:00
Denys Vlasenko
5f8daefb83
awk: fix handling of "if ... break ; else ..." - closes 7226
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-06-26 16:40:28 +02:00
Denys Vlasenko
32afd3aa60
vi: some simplifications
...
function old new delta
file_insert 301 315 +14
init_text_buffer 179 171 -8
colon 2889 2878 -11
file_size 37 - -37
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/2 up/down: 14/-56) Total: -42 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-04-05 22:57:46 +02:00
Denys Vlasenko
e7430867a8
vi: clear undo buffer when we change to another file
...
function old new delta
init_text_buffer 156 190 +34
undo_push 360 382 +22
count_lines 74 72 -2
undo_pop 246 222 -24
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 56/-26) Total: 30 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-04-03 12:47:48 +02:00
Denys Vlasenko
2c51202aec
vi: undo code shrink
...
function old new delta
undo_push 414 395 -19
do_cmd 4803 4761 -42
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-04-03 01:45:05 +02:00
Jody Bruchon
a8d6f9bee4
vi: undo support for vi with intermediate queuing
...
function old new delta
undo_push - 411 +411
undo_pop - 288 +288
do_cmd 4160 4426 +266
char_insert 363 483 +120
undo_queue_commit - 61 +61
text_hole_delete 108 163 +55
string_insert 94 127 +33
colon 2864 2882 +18
yank_delete 92 101 +9
vi_main 273 280 +7
dot_scroll 88 93 +5
dot_right 29 34 +5
dot_prev 20 25 +5
dot_next 20 25 +5
dot_left 24 29 +5
dot_end 20 25 +5
dot_begin 20 25 +5
init_text_buffer 154 156 +2
text_hole_make 145 142 -3
file_insert 333 318 -15
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 15/2 up/down: 1305/-18) Total: 1287 bytes
(without queuing it's ~870 bytes)
Signed-off-by: Jody Bruchon <jody@jodybruchon.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2014-04-02 13:49:26 +02:00
David A. Wheeler
80a068d741
sed: accept s///i as a synonym for s///I ("ignore case")
...
Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com >
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com >
2013-12-18 16:23:49 +01:00
