* Improve trimming of quotation marks.

1 files changed, 24 insertions, 8 deletions

diff --git a/utils.c b/utils.c
index 4156e6e..3c684d5 100644
--- a/utils.c
+++ b/utils.c
@@ -69,16 +69,32 @@ ends_with(const char * haystack, const char * needle)
 char *
 trim(char *str)
 {
-        if (!str)
-                return(NULL);
-        int i;
-        for (i=0; i <= strlen(str) && (isspace(str[i]) || str[i] == '"'); i++) {
+	int i;
+	int len;
+
+	if (!str)
+		return(NULL);
+
+	len = strlen(str);
+	for (i=len-1; i >= 0 && isspace(str[i]); i--)
+	{
+		str[i] = '\0';
+		len--;
+	}
+	while (isspace(*str))
+	{
 		str++;
+		len--;
 	}
-        for (i=(strlen(str)-1); i >= 0 && (isspace(str[i]) || str[i] == '"'); i--) {
-                str[i] = '\0';
-        }
-        return str;
+
+	if (str[0] == '"' && str[len-1] == '"')
+	{
+		str[0] = '\0';
+		str[len-1] = '\0';
+		str++;
+	}
+
+	return str;
 }
 
 /* Find the first occurrence of p in s, where s is terminated by t */