[BusyBox-cvs] busybox/fileutils ls.c,1.95,1.96

[Erik Andersen]

Update of /var/cvs/busybox/fileutils
In directory winder:/tmp/cvs-serv19105/fileutils

Modified Files:
	ls.c 
Log Message:
last_patch75_2 from vodz,


Index: ls.c
===================================================================
RCS file: /var/cvs/busybox/fileutils/ls.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- ls.c	6 Jan 2003 01:11:49 -0000	1.95
+++ ls.c	14 Jan 2003 18:13:13 -0000	1.96
@@ -837,6 +837,7 @@
 		switch (opt) {
 		case '1':
 			style_fmt = STYLE_SINGLE;
+			list_fmt = LIST_SHORT;
 			break;
 		case 'A':
 			disp_opts |= DISP_HIDDEN;
@@ -846,6 +847,7 @@
 			break;
 		case 'C':
 			style_fmt = STYLE_COLUMNS;
+			list_fmt = LIST_SHORT;
 			break;
 		case 'd':
 			disp_opts |= DISP_NOLIST;
@@ -956,8 +958,8 @@
 	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 */