[BusyBox] [BUG+PATCH] ls.c does not compile with certain configs

[Stewart Brodie]

Package: busybox
Version: 0.61pre, latest from unstable CVS branch, May 7th 2003

[Mail to submit at bugs.busybox.net is bouncing at the moment - user unknown]

ls.c fails to compile when datestamps and sorting are disabled in the config.

If you disable the busybox configuration options CONFIG_FEATURE_LS_SORTFILES
and/or CONFIG_FEATURE_LS_TIMESTAMPS, then coreutils/ls.c fails to compile.

Compilation of ls.c fails because the code uses SORT_MASK and TIME_MASK
unconditionally, but these macros are defined only if the two features are
enabled respectively.

The attached patch protects the use of SORT_MASK and TIME_MASK such that they
are used only if the relevent configuration option is enabled.

Applying this patch will allow ls.c to compile successfully regardless of the
combination of features of ls which are enabled or disabled.


-- 
Stewart Brodie, Senior Software Engineer, available from the end of June

begin 644 ls.patch,fff
M26YD97 at Z(&-O<F5U=&EL<R]L<RYC"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T*
M4D-3(&9I;&4Z("]V87(O8W9S+V)U<WEB;W at O8V]R975T:6QS+VQS+F,L=@IR
M971R:65V:6YG(')E=FES:6]N(#$N.3<*9&EF9B`M=R`M8B`M=R`M=2`M<C$N
M.3<@;',N8PHM+2T at 8V]R975T:6QS+VQS+F,),3D at 36%R(#(P,#,@,#DZ,3$Z
M,S, at +3`P,#`),2XY-PHK*RL at 8V]R975T:6QS+VQS+F,)-R!-87D@,C`P,R`P
M.#HT,SHQ-B`M,#`P,`I`0"`M.3`R+#$U("LY,#(L,3D at 0$`*(`D)"6EF("AF
M;&%G<R`F(%-464Q%7TU!4TM?5%))1T=%4BD@>PH@"0D)"6%L;%]F;70@)CT@
M?E-464Q%7TU!4TL["B`)"0E]"BLC:69D968 at 0T].1DE'7T9%05154D5?3%-?
M4T]25$9)3$53"B`)"0EI9B`H9FQA9W,@)B!33U)47TU!4TM?5%))1T=%4BD@
M>PH@"0D)"6%L;%]F;70@)CT@?E-/4E1?34%32SL*(`D)"7T**R-E;F1I9 at H@
M"0D):68@*&9L86=S("8 at 1$E34%]-05-+7U1224='15(I('L*(`D)"0EA;&Q?
M9FUT("8]('Y$25-07TU!4TL["B`)"0E]"BLC:69D968 at 0T].1DE'7T9%0515
M4D5?3%-?5$E-15-404U04PH@"0D):68@*&9L86=S("8 at 5$E-15]-05-+7U12
M24='15(I('L*(`D)"0EA;&Q?9FUT("8]('Y424U%7TU!4TL["B`)"0E]"BLC
M96YD:68*("-I9F1E9B!#3TY&24=?1D5!5%5215](54U!3E]214%$04),10H@
M"0D):68@*&]P="`]/2`G;"<I('L*(`D)"0EA;&Q?9FUT("8]('Y,4U]$25-0
%7TA2.PH@
`
end