From e1917e4fd19491bdcf25b753f40da783ecccda20 Mon Sep 17 00:00:00 2001
From: Michael Schupikov <michael@schupikov.de>
Date: Mon, 9 Jan 2017 19:16:56 +0100
Subject: [PATCH] strip_whitespace(): Handle quotes correctly

---
 common/stringop.c | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/common/stringop.c b/common/stringop.c
index dba66a326..d0b64ce77 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -10,24 +10,35 @@
 
 const char whitespace[] = " \f\n\r\t\v";
 
-/**************************************************************************//**
- *
- * \brief		Strips the whitespace in front and rear of the string. If whitespace
- *					is found in the middle of the string, all but one space is removed
- *					between words.
- *
- * \param		str	Pointer to the char string that should be stripped. The string
- *							is modified. If NULL is passed, no operation is performed.
- *
- ******************************************************************************/
-void strip_whitespace(char * restrict const str) {
+void strip_whitespace(char *str)
+{
 	if (str) {
 		size_t count = 0;
+		char quote = ' ';
 		for (size_t index = 0; str[index]; ++index) {
-			if (' ' != str[index] && '\t' != str[index]) {
+			if (quote != '\'' && quote != '\"') {
+				if (' ' != str[index] && '\t' != str[index]) {
+					str[count++] = str[index];
+					if (str[index] == '\'') {
+						quote = '\'';
+					} else if (str[index] == '\"') {
+						quote = '\"';
+					}
+				} else if(0 < count && ' ' != str[count - 1] && '\t' != str[count - 1]) {
+					str[count++] = ' ';
+				}
+			} else if (quote == '\'') {
 				str[count++] = str[index];
-			} else if(0 < count && ' ' != str[count - 1] && '\t' != str[count - 1]) {
-				str[count++] = ' ';
+				if (str[index] == '\'') {
+					quote = ' ';
+				}
+			} else if (quote == '\"') {
+				str[count++] = str[index];
+				if (str[index] == '\"') {
+					quote = ' ';
+				}
+			} else {
+				/* Unexpected value for quote. */
 			}
 		}
 		str[count] = '\0';
@@ -37,6 +48,7 @@ void strip_whitespace(char * restrict const str) {
 	}
 }
 
+
 void strip_quotes(char *str) {
 	bool in_str = false;
 	bool in_chr = false;