X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnmemsdup.c;h=9584cff5d7ee44ecc464ad4cbdbe95749c65f637;hb=07ebfd1140984b5a36427dd5b0f3cb6a4b48684e;hp=a0fa637ddb45b39675c3e7bff463439458eeca45;hpb=1bef37cb158d2c33a7ddf138ff299e4f96a084ae;p=yaz-moved-to-github.git

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index a0fa637..9584cff 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -74,6 +74,14 @@ void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
                           char ***darray, int *num, int collapse,
                           int escape_char)
 {
+    nmem_strsplit_escape2(nmem, delim, dstr, darray, num, collapse,
+                          escape_char, 1);
+}
+
+void nmem_strsplit_escape2(NMEM nmem, const char *delim, const char *dstr,
+                           char ***darray, int *num, int collapse,
+                           int escape_char, int subst_escape)
+{
     *darray = 0;
     /* two passes over the input string.. */
     while (1)
@@ -102,13 +110,18 @@ void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
             }
             if (*darray)
             {
-                char *dst, *src;
                 (*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
-                dst = src = (*darray)[i];
-                for (; (*dst = *src) != '\0'; src++)                    
+                if (subst_escape)
                 {
-                    if (*src != escape_char)
-                        dst++;
+                    char *dst = (*darray)[i];
+                    const char *src = dst;
+                    while (*src != '\0')
+                    {
+                        if (*src == escape_char && src[1])
+                            src++;
+                        *dst++ = *src++;
+                    }
+                    *dst = '\0';
                 }
             }
             i++;