diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-07-14 19:20:46 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-07-14 19:20:46 +0000 |
commit | b7ebc61b54ff542935ff4216f80ea53103e8dcf2 (patch) | |
tree | 120feb01428f671ae1d9ab79f996687f29069b33 | |
parent | fb0c6af286013929a89a2ba37f1d74cc05cdd5e7 (diff) | |
download | busybox-w32-b7ebc61b54ff542935ff4216f80ea53103e8dcf2.tar.gz busybox-w32-b7ebc61b54ff542935ff4216f80ea53103e8dcf2.tar.bz2 busybox-w32-b7ebc61b54ff542935ff4216f80ea53103e8dcf2.zip |
Michael Sternberg writes:
Latest BusyBox from CVS (Jul 7 2003).
File coreutils/ls.c
"if" at line 970 should be enclosed in #ifdef CONFIG_FEATURE_LS_SORTFILES
"if" at line 976 should be enclosed in #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-rw-r--r-- | coreutils/ls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 6245361e9..a7f036b61 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -967,15 +967,19 @@ extern int ls_main(int argc, char **argv) | |||
967 | if (flags & STYLE_MASK_TRIGGER) { | 967 | if (flags & STYLE_MASK_TRIGGER) { |
968 | all_fmt &= ~STYLE_MASK; | 968 | all_fmt &= ~STYLE_MASK; |
969 | } | 969 | } |
970 | #ifdef CONFIG_FEATURE_LS_SORTFILES | ||
970 | if (flags & SORT_MASK_TRIGGER) { | 971 | if (flags & SORT_MASK_TRIGGER) { |
971 | all_fmt &= ~SORT_MASK; | 972 | all_fmt &= ~SORT_MASK; |
972 | } | 973 | } |
974 | #endif | ||
973 | if (flags & DISP_MASK_TRIGGER) { | 975 | if (flags & DISP_MASK_TRIGGER) { |
974 | all_fmt &= ~DISP_MASK; | 976 | all_fmt &= ~DISP_MASK; |
975 | } | 977 | } |
978 | #ifdef CONFIG_FEATURE_LS_TIMESTAMPS | ||
976 | if (flags & TIME_MASK_TRIGGER) { | 979 | if (flags & TIME_MASK_TRIGGER) { |
977 | all_fmt &= ~TIME_MASK; | 980 | all_fmt &= ~TIME_MASK; |
978 | } | 981 | } |
982 | #endif | ||
979 | if (flags & LIST_CONTEXT) { | 983 | if (flags & LIST_CONTEXT) { |
980 | all_fmt |= STYLE_SINGLE; | 984 | all_fmt |= STYLE_SINGLE; |
981 | } | 985 | } |