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


git-svn-id: svn://busybox.net/trunk/busybox@7056 69ca8d6d-28ef-0310-b511-8ec308f3f277

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)
                         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;
                         }