summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen2003-01-14 18:13:13 +0000
committerEric Andersen2003-01-14 18:13:13 +0000
commitfc4a0fd82eb89ad07cffcd0f4a764eb3c7db66c2 (patch)
tree61631150fa2171dd554f54c2442066c7f1bf14c5 /coreutils
parent85d9d80db89a14d7f5aa4912fbd1e690c3d7262f (diff)
downloadbusybox-fc4a0fd82eb89ad07cffcd0f4a764eb3c7db66c2.zip
busybox-fc4a0fd82eb89ad07cffcd0f4a764eb3c7db66c2.tar.gz
last_patch75_2 from vodz,
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/ls.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 8a2b5e1..64ec0fe 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 */