From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 26 May 2019 11:53:41 +0000 (+0200)
Subject: ls: fix SEGV when --color is used and ENABLE_LS_COLOR=n
X-Git-Tag: 1_31_0~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9501bc7da5f560f3dae6f6a1d2b11efa9d5dfe47;p=oweals%2Fbusybox.git

ls: fix SEGV when --color is used and ENABLE_LS_COLOR=n

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/coreutils/ls.c b/coreutils/ls.c
index b2adb0c06..e5375a61a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1086,7 +1086,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 	static const char ls_longopts[] ALIGN1 =
 		"full-time\0" No_argument "\xff"
 		"group-directories-first\0" No_argument "\xfe"
-		"color\0" Optional_argument "\xfd"
+		IF_FEATURE_LS_COLOR("color\0" Optional_argument "\xfd")
 	;
 #endif