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

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 26d1b2f..f697e73 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1997-2004, Index Data.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
- *
- * $Id: nmemsdup.c,v 1.2 2004-10-15 00:19:00 adam Exp $
  */
 
 /**
@@ -15,7 +13,7 @@
 #endif
 
 #include <string.h>
-#include <yaz/nmem.h>
+#include <yaz/nmem_xml.h>
 
 char *nmem_strdup (NMEM mem, const char *src)
 {
@@ -24,6 +22,14 @@ char *nmem_strdup (NMEM mem, const char *src)
     return dst;
 }
 
+char *nmem_strdup_null(NMEM mem, const char *src)
+{
+    if (!src)
+        return 0;
+    else
+        return nmem_strdup(mem, src);
+}
+
 char *nmem_strdupn (NMEM mem, const char *src, size_t n)
 {
     char *dst = (char *)nmem_malloc (mem, n+1);
@@ -32,9 +38,124 @@ char *nmem_strdupn (NMEM mem, const char *src, size_t n)
     return dst;
 }
 
-int *nmem_intdup(NMEM mem, int v)
+nmem_int_t *nmem_intdup(NMEM mem, nmem_int_t v)
 {
-    int *dst = (int*) nmem_malloc (mem, sizeof(int));
+    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));
+    *dst = v;
+    return dst;
+}
+
+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;
+    *num = 0;
+
+    while (1)
+    {
+        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;
+    else
+    {
+        size_t i = 0;
+        *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
+        cp = dstr;
+        while (1)
+        {
+            const char *cp0;
+            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++;
+            }
+        }
+    }
+}
+
+#if YAZ_HAVE_XML2
+char *nmem_text_node_cdata(const xmlNode *ptr_cdata, NMEM nmem)
+{
+    char *cdata;
+    int len = 0;
+    const xmlNode *ptr;
+
+    for (ptr = ptr_cdata; ptr; ptr = ptr->next)
+        if (ptr->type == XML_TEXT_NODE)
+            len += xmlStrlen(ptr->content);
+    cdata = (char *) nmem_malloc(nmem, len+1);
+    *cdata = '\0';
+    for (ptr = ptr_cdata; ptr; ptr = ptr->next)
+        if (ptr->type == XML_TEXT_NODE)
+            strcat(cdata, (const char *) ptr->content);
+    return cdata;
+}
+#endif
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+