GUACAMOLE-470: Merge support named colors in color-scheme configuration.
diff --git a/src/terminal/named-colors.c b/src/terminal/named-colors.c
index b0e579b..ab94153 100644
--- a/src/terminal/named-colors.c
+++ b/src/terminal/named-colors.c
@@ -761,8 +761,13 @@
/* Skip any spaces in key (name will never have spaces) */
while (*key && isspace(*key)) key++;
+ /* Treat semi-colon as string terminator, to support parsing color
+ names within a larger string (e.g. within the terminal color-scheme
+ configuration string). */
+ const int keyChar = (*key == ';') ? '\0' : tolower(*key);
+
/* Compare, ignoring case (name is already known to be lowercase) */
- int difference = tolower(*key) - *name;
+ int difference = keyChar - *name;
if (difference)
return difference;
