mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 01:32:08 +00:00
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
This commit is contained in:
parent
fb0c6af286
commit
b7ebc61b54
@ -967,15 +967,19 @@ extern int ls_main(int argc, char **argv)
|
|||||||
if (flags & STYLE_MASK_TRIGGER) {
|
if (flags & STYLE_MASK_TRIGGER) {
|
||||||
all_fmt &= ~STYLE_MASK;
|
all_fmt &= ~STYLE_MASK;
|
||||||
}
|
}
|
||||||
|
#ifdef CONFIG_FEATURE_LS_SORTFILES
|
||||||
if (flags & SORT_MASK_TRIGGER) {
|
if (flags & SORT_MASK_TRIGGER) {
|
||||||
all_fmt &= ~SORT_MASK;
|
all_fmt &= ~SORT_MASK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (flags & DISP_MASK_TRIGGER) {
|
if (flags & DISP_MASK_TRIGGER) {
|
||||||
all_fmt &= ~DISP_MASK;
|
all_fmt &= ~DISP_MASK;
|
||||||
}
|
}
|
||||||
|
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
|
||||||
if (flags & TIME_MASK_TRIGGER) {
|
if (flags & TIME_MASK_TRIGGER) {
|
||||||
all_fmt &= ~TIME_MASK;
|
all_fmt &= ~TIME_MASK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (flags & LIST_CONTEXT) {
|
if (flags & LIST_CONTEXT) {
|
||||||
all_fmt |= STYLE_SINGLE;
|
all_fmt |= STYLE_SINGLE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user