emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,977 Commits 1 Branch 0 Tags 33 MiB
c87e81f944
Commit Graph

238 Commits

Author SHA1 Message Date
Denys Vlasenko
ea351b9742 ls: fix columnar output. Closes 8731 
In coreutils/ls.c, 1.19 introduced commit
2f7d9e8903, removing the variable tabstops and
hard coding the column separation to 2 characters, but was not done correctly.
The column_width assumes a gap of 1 character, so the computed number of
columns exceeds the terminal width when many small files are encountered.

A minor problem but surprisingly annoying.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2016-03-06 17:53:11 +01:00
Denys Vlasenko
641caaec3d libbb: factor out code which queries screen width 
function                                             old     new   delta
get_terminal_width                                     -      17     +17
stty_main                                           1196    1197      +1
pstree_main                                          321     319      -2
ls_main                                              735     731      -4
watch_main                                           232     225      -7
bb_progress_update                                   714     706      -8
ps_main                                              555     543     -12
run_applet_and_exit                                  708     695     -13
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/6 up/down: 18/-46)            Total: -28 byte

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2015-10-23 01:44:22 +02:00
Denys Vlasenko
c5beaa08eb ls: heed compiler warning 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2015-02-23 15:25:58 +01:00
Denys Vlasenko
0cb981c5e2 ls: trivial code shrink 
function                                             old     new   delta
display_single                                       914     893     -21

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2015-02-18 11:29:07 +01:00
Denys Vlasenko
8e92df15b5 ls: fix year 9999 bug :) 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2015-02-16 15:36:25 +01:00
Denys Vlasenko
fca0ee5959 ls: make "ls -s DIR" show total too. Clases 4946 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2014-02-27 15:40:26 +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
b47b3ce1bd randomconfig fixes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-08-10 00:51:29 +02:00
Denys Vlasenko
1e18a01fa2 ls: fix HAVE_STRVERSCMP check; add check for older uclibc versions 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-06-21 17:12:52 +02:00
Denys Vlasenko
561f9c8585 Add HAVE_STRVERSCMP, guard the only usage of strverscmp with #ifdef 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-06-21 16:38:29 +02:00
Denys Vlasenko
8ea683d5df ls: fix comment about -p (it's compatible now) 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-06-13 02:24:18 +02:00
Denys Vlasenko
f194cc1f33 ls: make -v and -X actually work as intended 
function                                             old     new   delta
strverscmp                                             -     236    +236
sortcmp                                              186     254     +68
static.result_type                                     -      60     +60
static.next_state                                     12      16      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-06-13 02:13:42 +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
8dd29da2c6 ls: code shrink 
function                                             old     new   delta
sort_and_display_files                                 -     427    +427
scan_and_display_dirs_recur                          497     488      -9
ls_main                                              765     735     -30
display_files                                        422       -    -422
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 427/-461)          Total: -34 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-13 17:55:08 +02:00
Denys Vlasenko
4029e21b37 ls: reorder and rename functions. No code changes 
function                                             old     new   delta
display_single                                         -     931    +931
scan_and_display_dirs_recur                            -     497    +497
display_files                                          -     422    +422
showfiles                                            422       -    -422
showdirs                                             497       -    -497
list_single                                          931       -    -931
------------------------------------------------------------------------------
(add/remove: 3/3 grow/shrink: 0/0 up/down: 1850/-1850)          Total: 0 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-13 17:28:46 +02:00
Denys Vlasenko
2a81639534 ls: reduce memory consumption and speed up (don't do redundant [l]stat) 
function                                             old     new   delta
my_stat                                              110     278    +168
splitdnarray                                         120     118      -2
ls_main                                              769     765      -4
list_single                                          961     931     -30
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 168/-36)           Total: 132 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-13 17:28:09 +02:00
Denys Vlasenko
66ca241dca ls: avoid forward declaration. No code changes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-13 17:27:36 +02:00
Denys Vlasenko
d27ac299eb ls: code shrink 
function                                             old     new   delta
list_single                                          990     961     -29

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-13 17:27:15 +02:00
Denys Vlasenko
279a7ac04e ls: fix help text: -w N is optional 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-12 18:44:51 +02:00
Denys Vlasenko
4ad95e6b0e ls: fix -p help text, improve comments and define names 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-05-12 18:40:59 +02:00
Denys Vlasenko
fa9126e689 ls: better help text for -a and -A 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-04-03 01:27:49 +02:00
Denys Vlasenko
ea684c6aaf ls: fix handling of symlinks by option -1 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-03-12 03:12:36 +01:00
Denys Vlasenko
3b28dae17d ls: widen -s (1k blocks) column from 4 to 6 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-03-01 05:37:41 +01:00
Denys Vlasenko
26d11b8133 ls: -g implies -l 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-02-28 12:38:08 +01:00
Denys Vlasenko
9f368e38fb ls: fix bits for -T, -w and --color; make -n imply -l; fix comments 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-02-28 12:16:10 +01:00
Denys Vlasenko
cd387f2554 ls: fix one-bit-off which caused -H to behave as -h 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-02-27 04:10:00 +01:00
James Youngman
a4bc10cec7 ls: remove redundant constants LIST_FILENAME and LIST_SHORT 
LIST_FILENAME is always true and LIST_SHORT affects nothing.

Signed-off-by: James Youngman <jay@gnu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-20 01:36:16 +01:00
Denys Vlasenko
982aa263a0 ls: add support for -H 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 21:54:39 +01:00
Denys Vlasenko
407ab2a434 ls: tweak -e handling; better comments 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 16:29:08 +01:00
Denys Vlasenko
2f7d9e8903 ls: print a space after each column. Closes bug 2941 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 07:06:44 +01:00
Denys Vlasenko
163d864357 ls: make -F not follow symlinks of the command line 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 06:16:28 +01:00
Denys Vlasenko
d87815d5e0 ls: make -x force columnar output; remove unused parts of TRIGGER code 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 05:43:44 +01:00
Denys Vlasenko
f313746a6d ls: for some options, only last takes effect. Closes bug 2959 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-12-19 05:05:34 +01:00
Denys Vlasenko
4909fec73e ls: fix -lg to show group (was showing user) 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
 2010-11-06 00:46:57 +01:00
Dan Fandrich
77d4872691 Avoid side effects in putc(), which may be implemented as a macro 
Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
 2010-09-09 11:48:02 +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
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
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
d8528b8e56 ls: unicode fixes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-31 05:15:38 +01:00
Denys Vlasenko
6b01b71e83 randomconfig fixes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-24 22:52:21 +01:00
Denys Vlasenko
9f93d62192 libbb: better unicode width support. Hopefully fixes bug 839. 
Also opens up a possibility to make other unicode stuff smaller
and more correct later. but:

function                                             old     new   delta
static.combining                                       -     516    +516
bb_wcwidth                                             -     328    +328
unicode_cut_nchars                                     -     141    +141
mbstowc_internal                                       -      93     +93
in_table                                               -      78     +78
cal_main                                             899     961     +62
static.combining0x10000                                -      40     +40
unicode_strlen                                         -      31     +31
bb_mbstrlen                                           31       -     -31
bb_mbstowcs                                          173     102     -71
------------------------------------------------------------------------------
(add/remove: 7/1 grow/shrink: 1/1 up/down: 1289/-102)        Total: 1187 bytes

Uses code of Markus Kuhn, which is in public domain:
http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
"Permission to use, copy, modify, and distribute this software
 for any purpose and without fee is hereby granted. The author
 disclaims all warranties with regard to this software."

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-24 07:44:03 +01:00
Denys Vlasenko
7be97c5b6b ls: fix sort of very large files. +21 byte 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-18 13:02:27 +01:00
Denys Vlasenko
9c3b84a304 ls: make it so that group never glues itself to file size 
+ smaller enhancements: inode is long long; -h is a bit narrower; etc

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-18 01:55:00 +01:00
Denys Vlasenko
28055028a7 fold: unicode support. Based on a patch by Tomas Heinrich <heinrich.tomas@gmail.com> 
General Unicode support is tweaked to expose unicode_status.

function                                             old     new   delta
init_unicode                                           -      77     +77
write2stdout                                           -      19     +19
adjust_column                                         68      71      +3
unicode_status                                         -       1      +1
unicode_is_enabled                                     1       -      -1
grep_main                                            780     773      -7
fold_main                                            619     552     -67
check_unicode_in_env                                  77       -     -77
------------------------------------------------------------------------------
(add/remove: 3/2 grow/shrink: 1/2 up/down: 100/-152)          Total: -52 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-01-04 20:49:58 +01:00
Denys Vlasenko
d93fc61725 ls: fix "ls | cat" to not show "total NNN" header 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-23 16:22:25 +02:00
Denys Vlasenko
0bf44d00a4 libbb/human_readable.c: shrink; and reduce bss usage 
also, move smart_ulltoaN there and comment usage locations

function                                             old     new   delta
static.unit_chars                                      7       9      +2
utoa_to_buf                                          110     108      -2
make_human_readable_str                              262     258      -4
fallbackSort                                        1723    1719      -4
static.fmt                                            97      92      -5
static.fmt_tenths                                     10       -     -10
static.str                                            21       4     -17
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/5 up/down: 2/-42)             Total: -40 bytes
   text    data     bss     dec     hex filename
 820981     453    6932  828366   ca3ce busybox_old
 820968     453    6916  828337   ca3b1 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-13 01:25:09 +02:00
Denys Vlasenko
1d63f046d0 ls: forgotten chunk from prev commit 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-03 11:45:07 +02:00
Denys Vlasenko
cae409c6aa ls: code shrink 
function                                             old     new   delta
count_dirs                                            81      86      +5
dnalloc                                               13      17      +4
showfiles                                            372     370      -2
ls_main                                              833     825      -8
showdirs                                             505     489     -16
splitdnarray                                         189     120     -69
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/4 up/down: 9/-95)             Total: -86 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-03 11:43:48 +02:00
Denys Vlasenko
ffd4774ad2 ls: fix for !FEATURE_LS_RECURSIVE (forgotten free); cleanups 
no code changes if FEATURE_LS_RECURSIVE

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-03 11:42:33 +02:00
Denys Vlasenko
0683d4d633 ls: add standards doc; record author of "total NNNN" code 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-10-03 10:53:36 +02:00