From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 14 Jan 2003 18:13:13 +0000 (-0000)
Subject: last_patch75_2 from vodz,
X-Git-Tag: 1_00_pre1~234
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc4a0fd82eb89ad07cffcd0f4a764eb3c7db66c2;p=oweals%2Fbusybox.git

last_patch75_2 from vodz,
---

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 8a2b5e138..64ec0fee6 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -837,6 +837,7 @@ extern int ls_main(int argc, char **argv)
 		switch (opt) {
 		case '1':
 			style_fmt = STYLE_SINGLE;
+			list_fmt = LIST_SHORT;
 			break;
 		case 'A':
 			disp_opts |= DISP_HIDDEN;
@@ -846,6 +847,7 @@ extern int ls_main(int argc, char **argv)
 			break;
 		case 'C':
 			style_fmt = STYLE_COLUMNS;
+			list_fmt = LIST_SHORT;
 			break;
 		case 'd':
 			disp_opts |= DISP_NOLIST;
@@ -956,8 +958,8 @@ extern int ls_main(int argc, char **argv)
 	if (time_fmt & TIME_ACCESS)
 		sort_opts = SORT_ATIME;
 #endif
-	if (style_fmt != STYLE_LONG)
-		list_fmt &= ~LIST_ID_NUMERIC;	/* numeric uid only for long list */
+	if (style_fmt != STYLE_LONG) /* only for long list */
+		list_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC);
 #ifdef CONFIG_FEATURE_LS_USERNAME
 	if (style_fmt == STYLE_LONG && (list_fmt & LIST_ID_NUMERIC))
 		list_fmt &= ~LIST_ID_NAME;	/* don't list names if numeric uid */