115 commits

Author	SHA1	Message	Date
Denys Vlasenko	14f57f5357	cut: code shrink ... move "linenum" manipulations to the one place where it is used. function old new delta cut_main 1373 1360 -13 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-21 00:43:45 +01:00
Denys Vlasenko	1ea89fa98a	cut: code shrink ... This change eliminates one temporary: - if (dcount++ < cut_list[cl_pos].startpos) + dcount++; + if (dcount <= cut_list[cl_pos].startpos) function old new delta cut_main 1402 1373 -29 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-21 00:24:30 +01:00
Denys Vlasenko	b03f5162ac	cut: fix up -D/-s behavior with -F ... function old new delta cut_main 1388 1402 +14 packed_usage 34934 34933 -1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 14/-1) Total: 13 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-20 22:12:33 +01:00
Denys Vlasenko	dd40b40ee5	cut: remove unnecessary initialization of regmatch_t ... function old new delta cut_main 1404 1388 -16 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-20 21:46:32 +01:00
Denys Vlasenko	e2304d47a9	cut: shorten error messages on bad syntax even more ... $ cut -s -b3 cut: -s requires -f or -F $ cut -d@ -b3 cut: -d DELIM requires -f or -F function old new delta static.requires_f - 19 +19 static._op_on_field 32 - -32 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/0 up/down: 19/-32) Total: -13 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-16 01:12:17 +01:00
Denys Vlasenko	ee8b94acbf	cut: shorten error messages on bad syntax ... We don't need to mimic GNU cut error messages. $ cut -d@ -b3 cut: -d DELIM makes sense only with -f or -F $ cut -s -b3 cut: -s makes sense only with -f or -F function old new delta static._op_on_field 31 32 +1 .rodata 105659 105598 -61 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 1/-61) Total: -60 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-16 00:53:51 +01:00
Denys Vlasenko	0bd84c9472	cut: terminate cut_list[] so that we don't need "size of the array" variable ... function old new delta cut_main 1410 1404 -6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-16 00:32:57 +01:00
Denys Vlasenko	ba9651b803	cut: we can't get empty cut_list[], remove the check for that ... function old new delta .rodata 105685 105659 -26 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-16 00:19:43 +01:00
Denys Vlasenko	e8622f0d85	cut: disallow -f '' and -f '-' ... function old new delta cut_main 1391 1410 +19 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-15 12:27:33 +01:00
Denys Vlasenko	b25ea3f156	cut: fix -F n-m to match toybox ... function old new delta cut_main 1339 1391 +52 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-14 13:58:49 +01:00
Denys Vlasenko	d48400d8fb	cut: simplify getopt32 code ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 20:35:28 +01:00
Denys Vlasenko	7624077772	cut: "it's legal to pass an empty list" seems to be untrue ... function old new delta cut_main 1344 1339 -5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 20:22:05 +01:00
Denys Vlasenko	f4f8dc6864	cut: whitespace fixes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 19:43:53 +01:00
Denys Vlasenko	ed6561685c	cut: tweak comments ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 19:39:34 +01:00
Denys Vlasenko	96a230f17b	cut: fix handling of -d '' ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 19:31:41 +01:00
Denys Vlasenko	9adafbc118	cut: prevent infinite loop if -F REGEX matches empty delimiter ... function old new delta cut_main 1339 1348 +9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-13 19:13:20 +01:00
Denys Vlasenko	a4894eaf71	cut: tweak --help ... function old new delta packed_usage 34901 34934 +33 cut_main 1353 1339 -14 .rodata 105724 105685 -39 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/2 up/down: 33/-53) Total: -20 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-11 01:10:05 +01:00
Denys Vlasenko	9e364b16d1	cut: fix -d$'\n' --output-delimiter=@@ behavior ... function old new delta cut_main 1261 1353 +92 packed_usage 34925 34901 -24 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 92/-24) Total: 68 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 21:01:52 +01:00
Denys Vlasenko	a208fa03de	cut: implement --output-delimiter ... function old new delta cut_main 1204 1261 +57 static.cut_longopts - 20 +20 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/0 up/down: 77/0) Total: 77 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 18:49:10 +01:00
Denys Vlasenko	b402b13fab	cut: with -F disabled in .config, don't show it in --help ... function old new delta packed_usage 34897 34849 -48 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 18:09:07 +01:00
Denys Vlasenko	38a3c0ad32	cut: comment out code which seems to be not needed ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 17:50:29 +01:00
Denys Vlasenko	103139d0e6	cut: fix "echo 1.2 | cut -d. -f1,3" (print "1", not "1.") ... function old new delta cut_main 1228 1201 -27 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 17:21:30 +01:00
Denys Vlasenko	470f009552	cut: with -F, do not regcomp() pattern for every file ... function old new delta cut_main 1218 1228 +10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 02:55:58 +01:00
Denys Vlasenko	55fc6a18da	cut: rename "cut_lists" to "cut_list" ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 02:29:48 +01:00
Denys Vlasenko	1220b1519d	cut: rename some variables to hopefully better names ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 02:15:25 +01:00
Denys Vlasenko	808155ebf3	cut: "orig_line" is redundant, remove it ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:55:25 +01:00
Denys Vlasenko	478ac90f2c	cut: allocate "printed" only if OPT_CHAR or OPT_BYTE ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:50:58 +01:00
Denys Vlasenko	ad12ab439b	cut: localize 'spos' variable, convert !NUMVAR to NUMVAR == 0 ... This imporves readability Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:44:13 +01:00
Denys Vlasenko	73e9d25d75	cut: simplify OPT_ names, eliminate one variable ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:38:31 +01:00
Ron Yorston	f020414413	cut: improve detection of invalid ranges ... Commit 0068ce2fa (cut: add toybox-compatible options -O OUTSEP, -D, -F LIST) added detection of reversed ranges. Further improvements are possible. - The test for reversed ranges compared the start after it had been decremented with the end before decrement. It thus missed ranges of the form 2-1. - Zero isn't a valid start value for a range. (Nor is it a valid end value, but that's caught by the test for a reversed range.) - The code if (!*ltok) e = INT_MAX; duplicates a check that's already been made. - Display the actual range in the error message to make it easier to find which range was at fault. function old new delta .rodata 100273 100287 +14 cut_main 1239 1237 -2 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 14/-2) Total: 12 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:29:44 +01:00
Colin McAllister	50e2b59370	cut: fix "-s" flag to omit blank lines ... Using cut with the delimiter flag ("-d") with the "-s" flag to only output lines containing the delimiter will print blank lines. This is deviant behavior from cut provided by GNU Coreutils. Blank lines should be omitted if "-s" is used with "-d". This change introduces a somewhat naiive, yet efficient solution, where line length is checked before looping though bytes. If line length is zero and the "-s" flag is used, the code will jump to parsing the next line to avoid printing a newline character. function old new delta cut_main 1196 1185 -11 Signed-off-by: Colin McAllister <colinmca242@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2024-12-10 01:27:04 +01:00
Denys Vlasenko	c484846c44	introduce and use exitcode_t ... function old new delta strings_main 422 420 -2 setfattr_main 175 173 -2 brctl_main 1548 1546 -2 makedevs_main 979 975 -4 rev_main 337 332 -5 getfattr_main 307 302 -5 cut_main 1201 1196 -5 cksum_main 398 393 -5 umount_main 573 565 -8 ln_main 516 508 -8 expand_main 660 652 -8 df_main 1068 1060 -8 renice_main 346 332 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/13 up/down: 0/-76) Total: -76 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2023-07-17 17:29:36 +02:00
Denys Vlasenko	5353df91cb	Update applet size estimates ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2023-07-10 17:25:21 +02:00
Denys Vlasenko	fe73c8d557	*: style fix ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2022-08-30 16:41:17 +02:00
Rob Landley	0068ce2fa0	cut: add toybox-compatible options -O OUTSEP, -D, -F LIST ... function old new delta cut_main 884 1201 +317 packed_usage 33823 33885 +62 .rodata 104186 104179 -7 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 379/-7) Total: 372 bytes Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2021-07-20 16:29:22 +02:00
Denys Vlasenko	e2b9215868	*: --help tweaks ... function old new delta packed_usage 33589 33552 -37 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2021-06-14 20:47:20 +02:00
Denys Vlasenko	ba9f9c2d2c	*: --help text tweaks ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2021-04-14 15:15:45 +02:00
Ron Yorston	cad3fc743a	libbb: introduce and use fputs_stdout ... function old new delta fputs_stdout - 12 +12 zxc_vm_process 7237 7230 -7 yes_main 85 78 -7 write_block 380 373 -7 wrapf 305 298 -7 strings_main 437 430 -7 show_bridge 353 346 -7 rev_main 384 377 -7 put_prompt_custom 58 51 -7 put_cur_glyph_and_inc_cursor 168 161 -7 print_numbered_lines 152 145 -7 print_named_ascii 130 123 -7 print_name 135 128 -7 print_login_issue 386 379 -7 print_ascii 208 201 -7 powertop_main 1249 1242 -7 od_main 1789 1782 -7 logread_main 518 511 -7 head_main 804 797 -7 display_process_list 1319 1312 -7 cut_main 1002 995 -7 bb_dump_dump 1550 1543 -7 bb_ask_noecho 393 386 -7 baseNUM_main 702 695 -7 expand_main 755 745 -10 dumpleases_main 497 487 -10 write1 12 - -12 putcsi 37 23 -14 print_login_prompt 55 41 -14 paste_main 525 511 -14 cat_main 440 426 -14 print_it 245 230 -15 print_addrinfo 1188 1171 -17 print_rule 770 750 -20 print_linkinfo 842 822 -20 httpd_main 791 771 -20 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/34 up/down: 12/-341) Total: -329 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2021-02-03 20:52:40 +01:00
James Byrne	6937487be7	libbb: reduce the overhead of single parameter bb_error_msg() calls ... Back in 2007, commit 0c97c9d437 ("'simple' error message functions by Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower overhead call to bb_perror_msg() when only a string was being printed with no parameters. This saves space for some CPU architectures because it avoids the overhead of a call to a variadic function. However there has never been a simple version of bb_error_msg(), and since 2007 many new calls to bb_perror_msg() have been added that only take a single parameter and so could have been using bb_simple_perror_message(). This changeset introduces 'simple' versions of bb_info_msg(), bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and bb_herror_msg_and_die(), and replaces all calls that only take a single parameter, or use something like ("%s", arg), with calls to the corresponding 'simple' version. Since it is likely that single parameter calls to the variadic functions may be accidentally reintroduced in the future a new debugging config option WARN_SIMPLE_MSG has been introduced. This uses some macro magic which will cause any such calls to generate a warning, but this is turned off by default to avoid use of the unpleasant macros in normal circumstances. This is a large changeset due to the number of calls that have been replaced. The only files that contain changes other than simple substitution of function calls are libbb.h, libbb/herror_msg.c, libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c, networking/udhcp/common.h and util-linux/mdev.c additonal macros have been added for logging so that single parameter and multiple parameter logging variants exist. The amount of space saved varies considerably by architecture, and was found to be as follows (for 'defconfig' using GCC 7.4): Arm: -92 bytes MIPS: -52 bytes PPC: -1836 bytes x86_64: -938 bytes Note that for the MIPS architecture only an exception had to be made disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h) because it made these files larger on MIPS. Signed-off-by: James Byrne <james.byrne@origamienergy.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2019-07-02 11:35:03 +02:00
Denys Vlasenko	b097a84d62	config: update size information ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-12-28 03:20:17 +01:00
Denys Vlasenko	22542eca18	getopt32: remove opt_complementary ... function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-08-08 21:55:02 +02:00
Denys Vlasenko	72089cf6b4	config: deindent all help texts ... Those two spaces after tab have no effect, and always a nuisance when editing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-21 09:50:55 +02:00
Denys Vlasenko	4eed2c6c50	Update menuconfig items with approximate applet sizes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-18 22:01:24 +02: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	6967578728	whitespace fixes. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 01:34:48 +01:00
Denys Vlasenko	66426760be	*: remove "Options:" string from help texts ... function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-06-05 03:58:28 +02:00
Pere Orga	34425389e0	move help text from include/usage.src.h to coreutils/*.c ... Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-03-31 14:43:25 +02:00
Denys Vlasenko	0ef64bdb40	*: make GNU licensing statement forms more regular ... This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 20:14:46 +02:00
Denys Vlasenko	7783248eaa	*: s/xatoi_u/xatoi_positive/g - I got bored of mistyping xatoi_u as xatou_i ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-12 14:14:45 +02:00
Denys Vlasenko	f3ea792bad	*: mass cosmetic removal of extra empty lines. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-07-26 01:06:14 +02:00