summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2002-04-27 09:19:39 +0000
committerEric Andersen2002-04-27 09:19:39 +0000
commitd598d411106499e411b48cbc85f7e0a28251ec95 (patch)
tree0982d4c4a3059bef9e1404704aa8af02a3b15707
parent1372780662c2aa07e38f5ed131488533f79c1c58 (diff)
downloadbusybox-d598d411106499e411b48cbc85f7e0a28251ec95.zip
busybox-d598d411106499e411b48cbc85f7e0a28251ec95.tar.gz
Fix silly combinitorial oversight
-rw-r--r--coreutils/ls.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 661f9a2..0c2cea1 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -142,7 +142,7 @@ static const int SPLIT_SUBDIR = 2;
#define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
#define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
-#ifdef CONFIG_FEATURE_LS_FILETYPES
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
#define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
#endif
/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
@@ -255,7 +255,7 @@ static char bgcolor(mode_t mode)
#endif
/*----------------------------------------------------------------------*/
-#ifdef CONFIG_FEATURE_LS_FILETYPES
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
static char append_char(mode_t mode)
{
if ( !(list_fmt & LIST_FILETYPE))
@@ -616,10 +616,8 @@ static int list_single(struct dnode *dn)
char *filetime;
time_t ttime, age;
#endif
-#if defined (CONFIG_FEATURE_LS_FILETYPES)
+#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
struct stat info;
-#endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
char append;
#endif