emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last_patch75_2 from vodz,

Browse Source
This commit is contained in:
Eric Andersen 2003-01-14 18:13:13 +00:00
parent 85d9d80db8
commit fc4a0fd82e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/ls.c
View File

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