Another fix for nmem_strsplit_escape

[yaz-moved-to-github.git] / src / nmemsdup.c

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 3c1c4e1..75b6e85 100644 (file)
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -57,37 +57,76 @@ void nmem_strsplit_blank(NMEM nmem, const char *dstr, char ***darray, int *num)
     nmem_strsplit(nmem, " ", dstr, darray, num);
 }
 
+
 void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
                    char ***darray, int *num)
 {
-    const char *cp = dstr;
-    for (*num = 0; *cp; (*num)++)
-    {
-        while (*cp && strchr(delim, *cp))
-            cp++;
-        if (!*cp)
-            break;
-        while (*cp && !strchr(delim, *cp))
-            cp++;
-    }
-    if (!*num)
-        *darray = 0;
-    else
+    nmem_strsplitx(nmem, delim, dstr, darray, num, 1);
+}
+
+void nmem_strsplitx(NMEM nmem, const char *delim, const char *dstr,
+                    char ***darray, int *num, int collapse)
+{
+    nmem_strsplit_escape(nmem, delim, dstr, darray, num, collapse, 0);
+}
+
+void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
+                          char ***darray, int *num, int collapse,
+                          int escape_char)
+{
+    *darray = 0;
+    /* two passes over the input string.. */
+    while (1)
     {
         size_t i = 0;
-        *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
-        for (cp = dstr; *cp; )
+        const char *cp = dstr;
+        while (1)
         {
             const char *cp0;
-            while (*cp && strchr(delim, *cp))
-                cp++;
-            if (!*cp)
-                break;
+            if (collapse)
+            {
+                if (!*cp)
+                    break;
+                while (*cp && strchr(delim, *cp) && *cp != escape_char)
+                    cp++;
+                if (!*cp)
+                    break;
+            }
+
             cp0 = cp;
             while (*cp && !strchr(delim, *cp))
+            {
+                if (*cp == escape_char)
+                    cp++;
+                cp++;
+            }
+            if (*darray)
+            {
+                char *dst, *src;
+                (*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
+                dst = src = (*darray)[i];
+                while (*src != '\0')
+                {
+                    if (*src == escape_char && src[1])
+                        src++;
+                    *dst++ = *src++;
+                }
+                *dst = '\0';
+            }
+            i++;
+            if (!collapse)
+            {
+                if (!*cp)
+                    break;
                 cp++;
-            (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+            }
         }
+        *num = i;
+        if (!*num)
+            break; /* no items, so stop, *darray=0 already */
+        else if (*darray)
+            break; /* second pass, stop */
+        *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
     }
 }