aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-03-08 16:16:38 +0000
committerkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-03-08 16:16:38 +0000
commit29c8397531f80ba7ef508eb84d920359f4ced4dc (patch)
treef7a9131e497cf82554f355fda41e834af8b2c2de
parenta5cb9c78e4dc2aaff26996962ebc9ded685de008 (diff)
downloadbusybox-w32-29c8397531f80ba7ef508eb84d920359f4ced4dc.tar.gz
busybox-w32-29c8397531f80ba7ef508eb84d920359f4ced4dc.tar.bz2
busybox-w32-29c8397531f80ba7ef508eb84d920359f4ced4dc.zip
* fileutils/ls.c (showfiles): Display multiple short names on a line.
git-svn-id: svn://busybox.net/trunk/busybox@4337 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--coreutils/ls.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 07e083f5a..e9c2e8643 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -443,12 +443,7 @@ static void showfiles(struct dnode **dn, int nfiles)
443 if (column_width < len) 443 if (column_width < len)
444 column_width= len; 444 column_width= len;
445 } 445 }
446 if (column_width >= 6) 446 ncols = (int)(terminal_width / (column_width + COLUMN_GAP));
447 ncols = (int)(terminal_width / (column_width + COLUMN_GAP));
448 else {
449 ncols = 1;
450 column_width = COLUMN_WIDTH;
451 }
452#else 447#else
453 ncols= TERMINAL_WIDTH; 448 ncols= TERMINAL_WIDTH;
454#endif 449#endif