197 Commits

Author	SHA1	Message	Date
Denys Vlasenko	03fd7e06f8	grep: fix echo "aa" | busybox grep -F -w "a" (should not match) ... function old new delta grep_file 1461 1470 +9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-03-29 18:03:50 +02:00
James Clarke	6bcc2c0f6c	grep: skip grepping symlinks to directories ... When grep is passed -r, recursive_action will treat any symlinks to directories not in the root as normal files, since it lstat's them and is therefore told they are not directories. However, file_action_grep will still try to fopen and read from them to see whether they match, which varies in behaviour across platforms. Linux will give EISDIR and thus grep will not find any matching lines, but FreeBSD will give the raw contents of the directory itself, which may match the given pattern. Also, if grep is passed -c, it will even print a count for these symlinks, even on Linux. Since this recursive_action behaviour is required for the correct functioning of other applets, such as tar, grep should handle this special case and skip any such symlinks. function old new delta file_action_grep 80 161 +81 Signed-off-by: James Clarke <jrtc27@jrtc27.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-10-31 15:23:55 +01:00
Denys Vlasenko	0c4dbd481a	regularize format of source file headers, no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-09-18 16:28:43 +02: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	75d151e31d	libarchive: FEATURE_LZMA_FAST should be visible if FEATURE_SEAMLESS_LZMA ... While at it, tweak some config help texts. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-20 23:28:00 +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	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	c5496d3585	grep: FEATURE_GREP_CONTEXT should be available for "fgrep only" too ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-04-12 17:53:54 +02:00
Denys Vlasenko	205d48e948	*: add comment about APPLET_ODDNAME format ... It confused me more than once Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-01-29 14:57:33 +01:00
Denys Vlasenko	1924e99ad3	Make grep/egrep/fgrep independently selectable ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-11-14 05:09:48 +01: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	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	94046d0495	randomconfig fixes 3 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-06-20 00:36:21 +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	73dfdda92e	grep: make errors other than "not found" result in exit code 2. Closes 8796 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-03-28 22:12:09 +02: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	34cc6c91a2	grep: fix "grep -r PATTRN SYMLINK_TO_DIR" ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-08-28 15:50:09 +02:00
Denys Vlasenko	83e49ade57	grep: fix -w match if first match isn't a word, but second is. Closes 4520 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-02-27 14:56:12 +01:00
Bartosz Golaszewski	3ba2df874c	grep: properly handle grep -w "^str" in !EXTRA_COMPAT case too ... function old new delta grep_file 1267 1288 +21 Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-02-07 17:15:56 +01:00
Denys Vlasenko	cd55f2d933	grep: fix two bugs with -w ... Unfortunately, with !EXTRA_COMPAT, "grep -w ^str" still erroneously matches "strstr". function old new delta grep_file 1499 1510 +11 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-01-07 14:59:30 +01:00
James Hogan	5fc0585c01	grep: fix grep -x to not set REG_NOSUB ... When -F isn't specified (and !ENABLE_EXTRA_COMPAT), grep -x uses regexec's regmatch_t output to determine if the match was the entire line. However it also set the REG_NOSUB flag which makes it ignore the regmatch_t argument. Add an exception to the setting of REG_NOSUB for OPT_x and add some test cases to test the behaviour of -x. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Natanael Copa <ncopa@alpinelinux.org> Cc: Denys Vlasenko <vda.linux@googlemail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-16 14:47:05 +02:00
Bartosz Golaszewski	414db791d0	grep: don't bail out on first mismatch if '-w' option is set ... Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-15 09:20:40 +02:00
Denys Vlasenko	2f5b5beb28	grep: fix grep -Fw not respecting the -w option. Closes 5792 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-20 16:57:19 +01:00
Denys Vlasenko	60cb48ca50	whitespace cleanup. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 15:57:44 +01:00
Natanael Copa	cd09e81520	grep: support for -x, match whole line ... Specified in POSIX. http://pubs.opengroup.org/onlinepubs/009604499/utilities/grep.html Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-02-28 03:44:08 +01:00
Lauri Kasanen	7b46220d92	grep: be GNU compatible with -f EMPTY_FILE ... Signed-off-by: Lauri Kasanen <curaga@operamail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-08-28 12:39:04 +02: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
Denys Vlasenko	b9f2d9f7d9	mass removal of underscores from _BB_DIR_foo and _BB_SUID_foo ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-01-18 13:58:01 +01:00
Denys Vlasenko	0296fd3af1	grep: cap insane -B NUM values to MAX_INT / 8. Fixes bug 2653. ... function old new delta grep_main 766 779 +13 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-02 12:42:28 +02:00
Denys Vlasenko	3d8b96d58d	grep: fix -o match with empty string (suggested by Colin Watson <cjwatson@ubuntu.com>) ... function old new delta grep_file 1216 1251 +35 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-23 02:39:47 +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	4f731ce30e	findutils/*: move usage and applet bits to *.c files ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-15 15:40:16 +02:00
Denys Vlasenko	2f32bf8be6	remove defconfig. Now "make defconfig" simply uses defaults from Config.in ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-06 04:14:28 +02:00
Denys Vlasenko	7fb68f199f	make it possible to keep Config/Kbuild snippets in *.c files ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-05-09 04:22:48 +02:00
Ian Wienand	0a2c793bd6	grep: fix -Fi ... function old new delta grep_file 1151 1169 +18 Signed-off-by: Ian Wienand <ianw@vmware.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-30 09:32:10 +02:00
Denys Vlasenko	05273daf6f	grep: makw -w support unconditional ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-04-26 08:45:44 +02:00
Denys Vlasenko	98a4c7cf3d	*: suppress ~60% of "aliased warnings" on gcc-4.4.1 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-02-04 15:00:15 +01:00
Denys Vlasenko	2ec91aead5	*: remove some uses of argc ... function old new delta whoami_main 34 37 +3 logname_main 60 63 +3 hostid_main 35 38 +3 ttysize_main 136 135 -1 nmeter_main 673 672 -1 logger_main 387 386 -1 uuencode_main 330 328 -2 ifupdown_main 2125 2123 -2 mesg_main 158 155 -3 free_main 333 330 -3 cal_main 902 899 -3 acpid_main 443 440 -3 ar_main 196 189 -7 find_main 476 467 -9 ifconfig_main 1235 1221 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49) Total: -40 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-01-04 14:15:38 +01:00
Denys Vlasenko	6dc0ace109	grep: fix a case when -o loops forever ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-12-04 02:48:14 +01:00
Denys Vlasenko	09449630fb	grep: fix -E + {range}; fix -o not printing all matches (bug 489) ... two different bugs, one with EXTRA_COMPAT, other without. function old new delta grep_file 1132 1129 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-07-29 01:20:09 +02:00
Denis Vlasenko	5e34ff29bc	*: mass renaming of USE_XXXX to IF_XXXX ... and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!	2009-04-21 11:09:40 +00:00
Denis Vlasenko	3266aa9ec2	trailing whitespace removal	2009-04-01 11:24:04 +00:00
Denis Vlasenko	83518d18a3	Compatibility fixes: ... grep: support -z find: support --mindepth together +45 bytes cpio: support -p (configurable, +230 bytes) libbb: tweaks for cpio	2009-03-20 22:17:13 +00:00
Denis Vlasenko	a9acbe6cad	timeout: new applet. 370 bytes. by Roberto Foglietta.	2008-11-24 13:25:20 +00:00
Denis Vlasenko	f60719cd49	grep: fix 'echo aaa | grep -o a' + ENABLE_EXTRA_COMPAT case ... by Natanael Copa	2008-09-30 22:37:29 +00:00
Denis Vlasenko	9ac706b7a6	grep: yet another fixlet for EXTRA_COMPAT	2008-09-19 21:32:51 +00:00
Denis Vlasenko	c110b7d61f	grep: fix EXTRA_COMPAT grep to honor -E and -i	2008-09-19 21:29:21 +00:00
Denis Vlasenko	3fd15e197e	grep: option to use GNU regex matching instead of POSIX one. ... This fixes problems with NULs in files being scanned, but costs +800 bytes. The same can be done to sed (TODO).	2008-08-09 16:15:14 +00:00