summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorMatt Kraai2002-03-08 16:16:38 +0000
committerMatt Kraai2002-03-08 16:16:38 +0000
commit3bd31ebc9a6643d61f11b17811e885596aca61e0 (patch)
treef7a9131e497cf82554f355fda41e834af8b2c2de /coreutils
parent372f91f07c65277db6c7fded61800fe77c15a336 (diff)
downloadbusybox-3bd31ebc9a6643d61f11b17811e885596aca61e0.zip
busybox-3bd31ebc9a6643d61f11b17811e885596aca61e0.tar.gz
* fileutils/ls.c (showfiles): Display multiple short names on a line.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/ls.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 07e083f..e9c2e86 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -443,12 +443,7 @@ static void showfiles(struct dnode **dn, int nfiles)
if (column_width < len)
column_width= len;
}
- if (column_width >= 6)
- ncols = (int)(terminal_width / (column_width + COLUMN_GAP));
- else {
- ncols = 1;
- column_width = COLUMN_WIDTH;
- }
+ ncols = (int)(terminal_width / (column_width + COLUMN_GAP));
#else
ncols= TERMINAL_WIDTH;
#endif