X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fnmemsdup.c;h=f697e73f45935bf2ad820d0e45d28e2ec955bc06;hp=36dc823200dc1494b113f6b72d532634d3600067;hb=7d7e192def2fef342d235ea894eddb1e89edd714;hpb=6b76baf0fb5d0d437caedd8076f77f372d775758

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 36dc823..f697e73 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 
@@ -38,16 +38,16 @@ char *nmem_strdupn (NMEM mem, const char *src, size_t n)
     return dst;
 }
 
-long long int *nmem_longintdup(NMEM mem, long long int v)
+nmem_int_t *nmem_intdup(NMEM mem, nmem_int_t v)
 {
-    long long int *dst = (long long int*) nmem_malloc (mem, sizeof(*dst));
+    nmem_int_t *dst = (nmem_int_t*) nmem_malloc (mem, sizeof(*dst));
     *dst = v;
     return dst;
 }
 
-int *nmem_intdup(NMEM mem, int v)
+nmem_bool_t *nmem_booldup(NMEM mem, nmem_bool_t v)
 {
-    int *dst = (int*) nmem_malloc (mem, sizeof(*dst));
+    nmem_bool_t *dst = (nmem_bool_t*) nmem_malloc (mem, sizeof(*dst));
     *dst = v;
     return dst;
 }
@@ -57,18 +57,42 @@ 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)
 {
+    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)
+{
     const char *cp = dstr;
-    for (*num = 0; *cp; (*num)++)
+    *num = 0;
+
+    while (1)
     {
-        while (*cp && strchr(delim, *cp))
-            cp++;
-        if (!*cp)
-            break;
-        while (*cp && !strchr(delim, *cp))
+        if (collapse)
+        {
+            if (!*cp)
+                break;
+            while (*cp && strchr(delim, *cp))
+                cp++;
+            if (!*cp)
+                break;
+            while (*cp && !strchr(delim, *cp))
+                cp++;
+            (*num)++;
+        }
+        else
+        {
+            (*num)++;
+            while (*cp && !strchr(delim, *cp))
+                cp++;
+            if (!*cp)
+                break;
             cp++;
+        }
     }
     if (!*num)
         *darray = 0;
@@ -76,17 +100,33 @@ void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
     {
         size_t i = 0;
         *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
-        for (cp = dstr; *cp; )
+        cp = dstr;
+        while (1)
         {
             const char *cp0;
-            while (*cp && strchr(delim, *cp))
-                cp++;
-            if (!*cp)
-                break;
-            cp0 = cp;
-            while (*cp && !strchr(delim, *cp))
+            if (collapse)
+            {
+                if (!*cp)
+                    break;
+                while (*cp && strchr(delim, *cp))
+                    cp++;
+                if (!*cp)
+                    break;
+                cp0 = cp;
+                while (*cp && !strchr(delim, *cp))
+                    cp++;
+                (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+            }
+            else
+            {
+                cp0 = cp;
+                while (*cp && !strchr(delim, *cp))
+                    cp++;
+                (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+                if (!*cp)
+                    break;
                 cp++;
-            (*darray)[i++] = nmem_strdupn(nmem, cp0, cp - cp0);
+            }
         }
     }
 }