aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-08 10:54:29 +0000
committermjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-08 10:54:29 +0000
commit6e83119cf4042478b3a901363812029229313d67 (patch)
tree0825c940ee56e5bdc95cf65795bb8424b790d75d
parent3699e127019e4d68778076f01f4ef84ee3e34328 (diff)
downloadbusybox-w32-6e83119cf4042478b3a901363812029229313d67.tar.gz
busybox-w32-6e83119cf4042478b3a901363812029229313d67.tar.bz2
busybox-w32-6e83119cf4042478b3a901363812029229313d67.zip
Fix broken sort order flags.
git-svn-id: svn://busybox.net/trunk/busybox@8601 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--coreutils/ls.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 46fe39d6c..2605ab12d 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -920,10 +920,10 @@ static const unsigned opt_flags[] = {
920# endif 920# endif
921#endif 921#endif
922#ifdef CONFIG_FEATURE_LS_SORTFILES 922#ifdef CONFIG_FEATURE_LS_SORTFILES
923 SORT_ORDER_REVERSE, /* r */
924 SORT_SIZE, /* S */ 923 SORT_SIZE, /* S */
924 SORT_EXT, /* X */
925 SORT_ORDER_REVERSE, /* r */
925 SORT_VERSION, /* v */ 926 SORT_VERSION, /* v */
926 SORT_EXT, /* v */
927#endif 927#endif
928#ifdef CONFIG_FEATURE_LS_FILETYPES 928#ifdef CONFIG_FEATURE_LS_FILETYPES
929 LIST_FILETYPE | LIST_EXEC, /* F */ 929 LIST_FILETYPE | LIST_EXEC, /* F */
@@ -1110,7 +1110,6 @@ extern int ls_main(int argc, char **argv)
1110 cur = cur->next; 1110 cur = cur->next;
1111 } 1111 }
1112 1112
1113
1114 if (all_fmt & DISP_NOLIST) { 1113 if (all_fmt & DISP_NOLIST) {
1115#ifdef CONFIG_FEATURE_LS_SORTFILES 1114#ifdef CONFIG_FEATURE_LS_SORTFILES
1116 shellsort(dnp, nfiles); 1115 shellsort(dnp, nfiles);