diff options
-rw-r--r-- | coreutils/ls.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 661f9a286..0c2cea199 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -142,7 +142,7 @@ static const int SPLIT_SUBDIR = 2; | |||
142 | 142 | ||
143 | #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f) | 143 | #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f) |
144 | #define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)]) | 144 | #define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)]) |
145 | #ifdef CONFIG_FEATURE_LS_FILETYPES | 145 | #if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR) |
146 | #define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)]) | 146 | #define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)]) |
147 | #endif | 147 | #endif |
148 | /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */ | 148 | /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */ |
@@ -255,7 +255,7 @@ static char bgcolor(mode_t mode) | |||
255 | #endif | 255 | #endif |
256 | 256 | ||
257 | /*----------------------------------------------------------------------*/ | 257 | /*----------------------------------------------------------------------*/ |
258 | #ifdef CONFIG_FEATURE_LS_FILETYPES | 258 | #if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR) |
259 | static char append_char(mode_t mode) | 259 | static char append_char(mode_t mode) |
260 | { | 260 | { |
261 | if ( !(list_fmt & LIST_FILETYPE)) | 261 | if ( !(list_fmt & LIST_FILETYPE)) |
@@ -616,10 +616,8 @@ static int list_single(struct dnode *dn) | |||
616 | char *filetime; | 616 | char *filetime; |
617 | time_t ttime, age; | 617 | time_t ttime, age; |
618 | #endif | 618 | #endif |
619 | #if defined (CONFIG_FEATURE_LS_FILETYPES) | 619 | #if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR) |
620 | struct stat info; | 620 | struct stat info; |
621 | #endif | ||
622 | #ifdef CONFIG_FEATURE_LS_FILETYPES | ||
623 | char append; | 621 | char append; |
624 | #endif | 622 | #endif |
625 | 623 | ||