summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2003-07-14 19:20:46 +0000
committerEric Andersen2003-07-14 19:20:46 +0000
commitb7ebc61b54ff542935ff4216f80ea53103e8dcf2 (patch)
tree120feb01428f671ae1d9ab79f996687f29069b33
parentfb0c6af286013929a89a2ba37f1d74cc05cdd5e7 (diff)
downloadbusybox-b7ebc61b54ff542935ff4216f80ea53103e8dcf2.zip
busybox-b7ebc61b54ff542935ff4216f80ea53103e8dcf2.tar.gz
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 6245361..a7f036b 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -967,15 +967,19 @@ extern int ls_main(int argc, char **argv)
if (flags & STYLE_MASK_TRIGGER) {
all_fmt &= ~STYLE_MASK;
}
+#ifdef CONFIG_FEATURE_LS_SORTFILES
if (flags & SORT_MASK_TRIGGER) {
all_fmt &= ~SORT_MASK;
}
+#endif
if (flags & DISP_MASK_TRIGGER) {
all_fmt &= ~DISP_MASK;
}
+#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
if (flags & TIME_MASK_TRIGGER) {
all_fmt &= ~TIME_MASK;
}
+#endif
if (flags & LIST_CONTEXT) {
all_fmt |= STYLE_SINGLE;
}