[BusyBox-cvs] busybox/coreutils ls.c,1.98,1.99

Erik Andersen andersen at busybox.net
Mon Jul 14 19:20:49 UTC 2003


Update of /var/cvs/busybox/coreutils
In directory winder:/tmp/cvs-serv16297/coreutils

Modified Files:
	ls.c 
Log Message:
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



Index: ls.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/ls.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ls.c	3 Jul 2003 10:06:58 -0000	1.98
+++ ls.c	14 Jul 2003 19:20:46 -0000	1.99
@@ -967,15 +967,19 @@
 			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;
 			}




More information about the busybox-cvs mailing list