X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fnmemsdup.c;h=3126aac1bbecc93afaa2146b375dc9201160d2d1;hp=fcfb074566bf704fbca7c343a39ae53fa0d4e6c1;hb=94b1547e5951e1e01bf5180159e74095cd0527f4;hpb=cfb1b8ff4632b51bec4e5eab18137081efdfb02d

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index fcfb074..3126aac 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 
@@ -15,10 +15,10 @@
 #include <string.h>
 #include <yaz/nmem_xml.h>
 
-char *nmem_strdup (NMEM mem, const char *src)
+char *nmem_strdup(NMEM mem, const char *src)
 {
-    char *dst = (char *)nmem_malloc (mem, strlen(src)+1);
-    strcpy (dst, src);
+    char *dst = (char *) nmem_malloc(mem, strlen(src)+1);
+    strcpy(dst, src);
     return dst;
 }
 
@@ -30,24 +30,24 @@ char *nmem_strdup_null(NMEM mem, const char *src)
         return nmem_strdup(mem, src);
 }
 
-char *nmem_strdupn (NMEM mem, const char *src, size_t n)
+char *nmem_strdupn(NMEM mem, const char *src, size_t n)
 {
-    char *dst = (char *)nmem_malloc (mem, n+1);
-    memcpy (dst, src, n);
+    char *dst = (char *) nmem_malloc(mem, n+1);
+    memcpy(dst, src, n);
     dst[n] = '\0';
     return dst;
 }
 
 nmem_int_t *nmem_intdup(NMEM mem, nmem_int_t v)
 {
-    nmem_int_t *dst = (nmem_int_t*) nmem_malloc (mem, sizeof(*dst));
+    nmem_int_t *dst = (nmem_int_t*) nmem_malloc(mem, sizeof(*dst));
     *dst = v;
     return dst;
 }
 
 nmem_bool_t *nmem_booldup(NMEM mem, nmem_bool_t v)
 {
-    nmem_bool_t *dst = (nmem_bool_t*) nmem_malloc (mem, sizeof(*dst));
+    nmem_bool_t *dst = (nmem_bool_t*) nmem_malloc(mem, sizeof(*dst));
     *dst = v;
     return dst;
 }
@@ -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)
@@ -91,29 +99,34 @@ void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
                     cp++;
                 if (!*cp)
                     break;
-                cp0 = cp;
-                while (*cp && !strchr(delim, *cp))
-                {
-                    if (*cp == escape_char)
-                        cp++;
+            }
+
+            cp0 = cp;
+            while (*cp && !strchr(delim, *cp))
+            {
+                if (*cp == escape_char)
                     cp++;
-                }
-                if (*darray)
-                    (*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
-                i++;
+                cp++;
             }
-            else
+            if (*darray)
             {
-                cp0 = cp;
-                while (*cp && !strchr(delim, *cp))
+                (*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
+                if (subst_escape)
                 {
-                    if (*cp == escape_char)
-                        cp++;
-                    cp++;
+                    char *dst = (*darray)[i];
+                    const char *src = dst;
+                    while (*src != '\0')
+                    {
+                        if (*src == escape_char && src[1])
+                            src++;
+                        *dst++ = *src++;
+                    }
+                    *dst = '\0';
                 }
-                if (*darray)
-                    (*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
-                i++;
+            }
+            i++;
+            if (!collapse)
+            {
                 if (!*cp)
                     break;
                 cp++;