From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 19 Jan 2017 11:41:22 +0000 (+0700)
Subject: color.c: trim leading spaces in color_parse_mem()
X-Git-Tag: v2.12.0-rc0~10^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bc4075653e3f704f0440ec54e16f88fbc39a682d

color.c: trim leading spaces in color_parse_mem()

Normally color_parse_mem() is called from config parser which trims the
leading spaces already. The new caller in the next patch won't. Let's be
tidy and trim leading spaces too (we already trim trailing spaces
after a word).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/color.c b/color.c
index a9eadd190a..7bb4a96f8c 100644
--- a/color.c
+++ b/color.c
@@ -207,10 +207,15 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 	struct color fg = { COLOR_UNSPECIFIED };
 	struct color bg = { COLOR_UNSPECIFIED };
 
+	while (len > 0 && isspace(*ptr)) {
+		ptr++;
+		len--;
+	}
+
 	if (!len)
 		return -1;
 
-	if (!strncasecmp(value, "reset", len)) {
+	if (!strncasecmp(ptr, "reset", len)) {
 		xsnprintf(dst, end - dst, GIT_COLOR_RESET);
 		return 0;
 	}