sds.c single quotes support

diff --git a/src/sds.c b/src/sds.c
index 77052966ceb79e72355df042f400648d35131829..2104eb36b9b9fe9475f1a2b8165b24a8e769481a 100644 (file)
--- a/src/sds.c
+++ b/src/sds.c
@@ -477,7 +477,8 @@ sds *sdssplitargs(char *line, int *argc) {
         while(*p && isspace(*p)) p++;
         if (*p) {
             /* get a token */
         while(*p && isspace(*p)) p++;
         if (*p) {
             /* get a token */

-            int inq=0; /* set to 1 if we are in "quotes" */
+            int inq=0;  /* set to 1 if we are in "quotes" */
+            int insq=0; /* set to 1 if we are in 'single quotes' */

             int done=0;
 
             if (current == NULL) current = sdsempty();
             int done=0;
 
             if (current == NULL) current = sdsempty();


@@ -507,7 +508,23 @@ sds *sdssplitargs(char *line, int *argc) {
                         }
                         current = sdscatlen(current,&c,1);
                     } else if (*p == '"') {
                         }
                         current = sdscatlen(current,&c,1);
                     } else if (*p == '"') {

-                        /* closing quote must be followed by a space */
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else if (insq) {
+                    if (*p == '\\' && *(p+1) == '\'') {
+                        p++;
+                        current = sdscatlen(current,"'",1);
+                    } else if (*p == '\'') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */

                         if (*(p+1) && !isspace(*(p+1))) goto err;
                         done=1;
                     } else if (!*p) {
                         if (*(p+1) && !isspace(*(p+1))) goto err;
                         done=1;
                     } else if (!*p) {


@@ -528,6 +545,9 @@ sds *sdssplitargs(char *line, int *argc) {
                     case '"':
                         inq=1;
                         break;
                     case '"':
                         inq=1;
                         break;

+                    case '\'':
+                        insq=1;
+                        break;

                     default:
                         current = sdscatlen(current,p,1);
                         break;
                     default:
                         current = sdscatlen(current,p,1);
                         break;