From 07ebfd1140984b5a36427dd5b0f3cb6a4b48684e Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 27 Sep 2011 16:09:46 +0200
Subject: [PATCH] New utility: nmem_strsplit_escape2

---
 include/yaz/nmem.h |   15 +++++++++++++++
 src/nmemsdup.c     |   25 ++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 192f362..4ef5bbc 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -149,6 +149,21 @@ YAZ_EXPORT void nmem_strsplit_escape(NMEM nmem, const char *delim,
                                      char ***darray, int *num, int collapse,
                                      int escape_char);
 
+/** \brief allocates sub strings out of string using certain delimitors
+    \param nmem NMEM handle
+    \param delim delimitor chars (splits on each char in there) 
+    \param dstr string to be split
+    \param darray result string array for each sub string
+    \param num number of result strings
+    \param collapse 1=collapse multiple delims to one; 0=no collapse
+    \param escape_char != 0, an escape char (could be \)
+    \param subst_escape, 1=substitute escapes, 0 leave as is
+*/
+YAZ_EXPORT void nmem_strsplit_escape2(NMEM nmem, const char *delim,
+                                      const char *dstr,
+                                      char ***darray, int *num, int collapse,
+                                      int escape_char, int subst_escape);
+
 /** \brief allocates and sets integer for NMEM
     \param nmem NMEM handle
     \param v integer value
diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 75b6e85..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,16 +110,19 @@ 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];
-                while (*src != '\0')
+                if (subst_escape)
                 {
-                    if (*src == escape_char && src[1])
-                        src++;
-                    *dst++ = *src++;
+                    char *dst = (*darray)[i];
+                    const char *src = dst;
+                    while (*src != '\0')
+                    {
+                        if (*src == escape_char && src[1])
+                            src++;
+                        *dst++ = *src++;
+                    }
+                    *dst = '\0';
                 }
-                *dst = '\0';
             }
             i++;
             if (!collapse)
-- 
1.7.10.4