92 Commits

Author	SHA1	Message	Date
Denys Vlasenko	8aa7cf305b	sort: fix -kN,M handling (was including last separator into the comparison) ... Testcase: $ printf '%s\n' a/a:a a:b | sort -t: -k1,1 a:b a/a:a Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-09-19 22:06:40 +02:00
Bartosz Golaszewski	5c13ab41bb	sort: check global flags on fallback sort ... Sort now performs global reverse on fallback sort if -r is set. Before only key local flags were checked. function old new delta compare_keys 712 738 +26 Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-01-19 09:10:14 +01:00
Bartosz Golaszewski	1a4d9f6521	sort.c: remove a magic number from compare_keys() ... Use bitwise OR of proper flags instead. Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-01-19 06:47:06 +01:00
Denys Vlasenko	6830ade6aa	whitespace fixes. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-15 13:58:01 +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	fb132e4737	whitespace cleanup ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-10-29 11:46:52 +02:00
Denys Vlasenko	5fe2f863b9	sort: -o FILE should create/truncate FILE ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-18 02:43:57 +02:00
Denys Vlasenko	c05387d5de	*: replace xopen3 with xopen where makes sense ... function old new delta uniq_main 421 416 -5 sort_main 803 798 -5 patch_main 2051 2046 -5 cpio_main 547 542 -5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-10-18 02:38:27 +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	aa42d13e32	sort: make sort -o FILE FILE (same FILE) work. Closes bug 785. -3 bytes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-12-13 02:09:22 +01:00
Denys Vlasenko	8684cbb5cc	libbb: robustify isXXXX(). +39 bytes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-18 11:34:43 +01:00
Denis Vlasenko	5415c856ea	libbb: [x]fopen_for_{read,write} introduced and used. ... (by Valdimir) function old new delta config_open2 - 41 +41 config_read 507 542 +35 find_pair 169 187 +18 fopen_for_write - 14 +14 fopen_for_read - 14 +14 find_main 406 418 +12 xfopen_for_write - 10 +10 xfopen_for_read - 10 +10 popstring 134 140 +6 parse_inittab 396 401 +5 next_token 923 928 +5 pack_gzip 1659 1661 +2 bb__parsespent 117 119 +2 fallbackSort 1719 1717 -2 evalvar 1376 1374 -2 qrealloc 36 33 -3 ... ... ... ... singlemount 4579 4569 -10 process_stdin 443 433 -10 patch_main 1111 1101 -10 ifupdown_main 2175 2165 -10 file_action_grep 90 80 -10 uuidcache_init 649 637 -12 hush_main 797 785 -12 read_config 230 217 -13 dpkg_main 3835 3820 -15 read_line_input 3134 3110 -24 sysctl_main 232 203 -29 config_open 40 10 -30 WARN_BAD_LINE 44 - -44 login_main 1714 1575 -139 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes	2008-07-21 23:05:26 +00:00
Denis Vlasenko	deeed59de0	libbb: introduce and use xrealloc_vector ... function old new delta xrealloc_vector_helper - 51 +51 create_list 84 99 +15 getopt_main 690 695 +5 passwd_main 1049 1053 +4 get_cached 85 89 +4 msh_main 1377 1380 +3 add_match 42 41 -1 read_lines 720 718 -2 grave 1068 1066 -2 fill_match_lines 143 141 -2 add_to_dirlist 67 65 -2 add_input_file 49 47 -2 act 252 250 -2 fsck_main 2252 2246 -6 man_main 765 757 -8 bb_internal_initgroups 228 220 -8 cut_main 1052 1041 -11 add_edge_to_node 55 43 -12 dpkg_main 3851 3835 -16 ifupdown_main 2202 2178 -24 sort_main 838 812 -26 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 5/15 up/down: 82/-124) Total: -42 bytes	2008-07-08 05:14:36 +00:00
Denis Vlasenko	a60f84ebf0	*: rename ATTRIBUTE_XXX to just XXX.	2008-07-05 09:18:54 +00:00
Denis Vlasenko	d50dda8c35	*: use llist_pop for traverse-and-free list operation ... function old new delta append_file_list_to_list 109 111 +2 udhcpc_main 2414 2413 -1 run_parts_main 325 324 -1 od_main 2324 2323 -1 getopt_main 709 707 -2 env_main 253 251 -2 sed_main 659 656 -3 ps_main 522 519 -3 traceroute_main 3960 3954 -6 sort_main 844 838 -6 diff_main 866 858 -8 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/10 up/down: 2/-33) Total: -31 bytes	2008-06-15 05:40:56 +00:00
Denis Vlasenko	77ad97f199	more -Wall warning fixes from Cristian Ionescu-Idbohrn. ... This time it resulted in small code changes: function old new delta nexpr 820 828 +8 tail_main 1200 1202 +2 wrapf 166 167 +1 parse_mount_options 227 209 -18 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/1 up/down: 11/-18) Total: -7 bytes	2008-05-13 02:27:31 +00:00
Denis Vlasenko	8ee649a02e	*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/	2008-03-26 20:04:27 +00:00
Denis Vlasenko	62a90cdd74	*: shrink by using [f]open_or_warn_stdin where appropriate ... function old new delta lsattr_main 62 143 +81 open_or_warn_stdin - 36 +36 fclose_if_not_stdin 20 47 +27 xfopen_stdin - 20 +20 tac_main 336 356 +20 cksum_main 249 259 +10 bb_argv_dash - 8 +8 su_main 448 455 +7 cmp_main 630 633 +3 passwd_main 1072 1074 +2 uudecode_main 317 315 -2 text_yank 110 108 -2 handle_incoming_and_exit 2653 2651 -2 flags 5 1 -4 write_leases 235 230 -5 fopen_or_warn_stdin 48 42 -6 fold_main 648 642 -6 static.argv_dash 8 - -8 sum_main 142 128 -14 tail_main 1237 1221 -16 sed_main 711 695 -16 cmp_xfopen_input 17 - -17 bb_cat 113 96 -17 catv_main 328 306 -22 strings_main 457 434 -23 hash_file 298 274 -24 sum_file 353 325 -28 sort_main 904 859 -45 expand_main 736 686 -50 cut_main 1116 1065 -51 md5_sha1_sum_main 549 493 -56 lsattr_args 90 - -90 read_stduu 408 255 -153 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 7/20 up/down: 214/-657) Total: -443 bytes text data bss dec hex filename 797417 658 7428 805503 c4a7f busybox_old 796973 658 7428 805059 c48c3 busybox_unstripped	2008-03-17 09:07:36 +00:00
Denis Vlasenko	68404f13d4	*: add -Wunused-parameter; fix resulting breakage ... function old new delta procps_scan 1265 1298 +33 aliascmd 278 283 +5 parse_file_cmd 116 120 +4 dname_enc 373 377 +4 setcmd 90 93 +3 execcmd 57 60 +3 count_lines 72 74 +2 process_command_subs 340 339 -1 test_main 409 407 -2 mknod_main 179 177 -2 handle_incoming_and_exit 2653 2651 -2 argstr 1312 1310 -2 shiftcmd 131 128 -3 exitcmd 46 43 -3 dotcmd 297 294 -3 breakcmd 86 83 -3 evalpipe 353 349 -4 evalcommand 1180 1176 -4 evalcmd 109 105 -4 send_tree 374 369 -5 mkfifo_main 82 77 -5 evalsubshell 152 147 -5 typecmd 75 69 -6 letcmd 61 55 -6 add_cmd 1190 1183 -7 main 891 883 -8 ash_main 1415 1407 -8 parse_stream 1377 1367 -10 alloc_procps_scan 55 - -55 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 7/21 up/down: 54/-148) Total: -94 bytes text data bss dec hex filename 797195 658 7428 805281 c49a1 busybox_old 797101 658 7428 805187 c4943 busybox_unstripped	2008-03-17 09:00:54 +00:00
Denis Vlasenko	3b92eaac53	sort: -z outputs NUL terminated lines. Closes bug 1591.	2008-02-13 14:30:33 +00:00
Bernhard Reutner-Fischer	7c2db5c198	- use standard-imposed constants some more	2007-11-16 12:39:16 +00:00
Denis Vlasenko	9b49a5ed85	add -fvisibility=hidden to CC flags, mark XXX_main functions ... EXTERNALLY_VISIBLE. 5% size reduction of libbusybox.so	2007-10-11 10:05:36 +00:00
Denis Vlasenko	fe7cd642b0	don't pass argc in getopt32, it's superfluous ... (add/remove: 0/0 grow/shrink: 12/131 up/down: 91/-727) Total: -636 bytes text data bss dec hex filename 773469 1058 11092 785619 bfcd3 busybox_old 772644 1058 11092 784794 bf99a busybox_unstripped	2007-08-18 15:32:12 +00:00
Denis Vlasenko	6ca409e0e4	trylink: produce even more info about final link stage ... trylink: explain how to modify link and drastically decrease amount of padding (unfortunately, needs hand editing ATM). *: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts size saving: 0.5k	2007-08-12 20:58:27 +00:00
Denis Vlasenko	091965768d	libbb: nuke BB_GETOPT_ERROR, always die if there are mutually exclusive options ... find_pair 164 180 +16 passwd_main 1222 1230 +8 display_speed 91 96 +5 msh_main 1335 1339 +4 qrealloc 38 36 -2 refresh 1190 1182 -8 cut_main 543 532 -11 sendCgi 1807 1794 -13 getopt32 1063 1045 -18 arith 2077 2030 -47 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/6 up/down: 33/-99) Total: -66 bytes text data bss dec hex filename 781548 1168 11900 794616 c1ff8 busybox_old 781452 1168 11900 794520 c1f98 busybox_unstripped	2007-07-21 13:27:44 +00:00
Denis Vlasenko	b6adbf1be2	usage.c: remove reference to busybox.h ... *: s/include "busybox.h"/include "libbb.h"	2007-05-26 19:00:18 +00:00
Denis Vlasenko	99912ca733	audit small applets and mark some of them as NOFORK. ... Put big scary warnings in relevant places.	2007-04-10 15:43:37 +00:00
Denis Vlasenko	8d9f495d68	getopt32: fix llist_t options ordering. llist_rev is not unused. ... function old new delta tar_main 705 695 -10 sort_main 928 918 -10 decode_format_string 886 876 -10 run_parts_main 197 185 -12 ps_main 513 500 -13 wget_main 2764 2750 -14 awk_main 1014 1000 -14 od_main 2886 2866 -20 llist_rev 25 - -25 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 0/8 up/down: 0/-128) Total: -128 bytes	2007-04-08 15:08:42 +00:00
Denis Vlasenko	54cf511ce1	sort: fix multiple -k (was ignoring all except last)	2007-02-17 18:11:45 +00:00
Denis Vlasenko	06af216528	suppress warnings about easch <applet>_main() having ... no preceding prototype	2007-02-03 17:28:39 +00:00
Denis Vlasenko	8336f080cb	diff: small optimizations; do not try to diff non-seekable stream ... (currently we don't support that) sort: fixes. testsuites fixed: sort with non-default leading delim 1 sort with non-default leading delim 2 sort key doesn't strip leading blanks, disables fallback global sort	2007-01-07 00:21:41 +00:00
Mike Frysinger	a71199e0f0	str2u() is only used when FEATURE_SORT_BIG is enabled	2007-01-02 05:43:30 +00:00
Denis Vlasenko	b2abef3e54	stty: fix width of a field for ppc32 ... sort: fix -u to match coreutils 6.3 msh: compile fix (my fault)	2007-01-01 18:18:04 +00:00
Denis Vlasenko	bf0a201008	style fixes ... last xcalloc replaced by xzalloc	2006-12-26 10:42:51 +00:00
Denis Vlasenko	9f739445cd	inline strcmp(s, "-") [actually macro-ize it for now - gcc is too stupid]	2006-12-16 23:49:13 +00:00
Denis Vlasenko	664733f1a3	sort: two small optimizations	2006-11-26 15:48:54 +00:00
Denis Vlasenko	0d42ddff70	sort: reformat entire file wrt style. ... fix single obvious bug: right hand was 0 here: flags & (FLAG_b&FLAG_d&FLAG_f&FLAG_i&FLAG_bb) fixed to use |	2006-11-26 15:48:03 +00:00
Bernhard Reutner-Fischer	e766715032	- end may be used uninitialized. ... - TODO: should eventually use skip_whitespace there	2006-11-17 11:28:00 +00:00
Denis Vlasenko	d3d004dd35	last nail into error_msg() (de)capitalization	2006-10-27 09:02:31 +00:00
Denis Vlasenko	f0ed376eda	remove bb_printf and the like	2006-10-26 23:21:47 +00:00
Denis Vlasenko	2d5ca60bfb	bb_get_[chomped]line_from_file wasn't descriptive enough. ... Renaming...	2006-10-12 22:43:20 +00:00
Denis Vlasenko	372686bde7	cut, mount: small improvements	2006-10-12 22:42:33 +00:00
Denis Vlasenko	40920825d5	rename bb_default_error_retval -> xfunc_error_retval	2006-10-03 20:28:06 +00:00
Denis Vlasenko	c16bd212e3	silly switch style fix	2006-09-27 19:51:06 +00:00
Denis Vlasenko	9213a9e0f2	whitespace cleanup	2006-09-17 16:28:10 +00:00
Rob Landley	081e38483e	Remove xcalloc() and convert its callers to xzalloc(). About half of them ... were using "1" as one of the arguments anyway, and as for the rest a multiply and a push isn't noticeably bigger than pushing two arguments on the stack.	2006-08-03 20:07:35 +00:00
Rob Landley	d921b2ecc0	Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate ... things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)	2006-08-03 15:41:12 +00:00
Rob Landley	39218932b1	Fix bug found by Joey Hess and forwarded by Bastian Bunk. Add Joey Hess's ... test case to the testsuite, plus another one that would have been broken by the first attempt at a fix.	2006-06-15 20:50:38 +00:00
Rob Landley	f893250a3b	Replace isnan() and isinf() with inline tests so uClibc doesn't want us to ... link sort against libm. This adds 22 bytes for glibc but is a win for uClibc, and since glibc is bigger than all of busybox it seems kind of silly to worry about it.	2006-05-09 23:14:39 +00:00