From 3bd31ebc9a6643d61f11b17811e885596aca61e0 Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@debian.org>
Date: Fri, 8 Mar 2002 16:16:38 +0000
Subject: [PATCH] * fileutils/ls.c (showfiles): Display multiple short names on
 a line.

---
 coreutils/ls.c | 7 +------
 1 file changed, 1 insertion(+), 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)
 		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