From: Christophe CURIS <christophe.curis@free.fr>
Date: Tue, 17 Jul 2012 22:19:55 +0000 (+0200)
Subject: Menu parser: remove d-quotes around title of entry
X-Git-Tag: wmaker-0.95.4~125
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/b2e7620868aa18cebb8f6d1e653f8c46dc959a34

Menu parser: remove d-quotes around title of entry

When a menu entry contains a space, it is necessary to enclose it
in simple or double quotes; these were not removed and so would
appear in the menu.
---

diff --git a/WINGs/menuparser.c b/WINGs/menuparser.c
index 881c4e80..97c67285 100644
--- a/WINGs/menuparser.c
+++ b/WINGs/menuparser.c
@@ -222,6 +222,21 @@ Bool WMenuParserGetLine(WMenuParser top_parser, char **title, char **command, ch
 		}
 	}
 
+	if (title != NULL) {
+		char eot, *src, *dst;
+
+		src = *title;
+		eot = *src++;
+		if ((eot == '"') || (eot == '\'')) {
+			dst = *title;
+			while (*src != '\0')
+				*dst++ = *src++;
+			if ((dst > *title) && (dst[-1] == eot))
+				dst--;
+			*dst = '\0';
+		}
+	}
+
 	if (params != NULL) {
 		lineparam[sizeof(lineparam) - 1] = '\0';
 		*parameter = wstrdup(lineparam);