X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fnmemsdup.c;h=95f182c461d9b45c3e40b6d6cfcc7f2d426ce89b;hp=e680a98af89c57531aae588ea4cb90f7963e9181;hb=fe507b6b15788a3a8e58063d9dae52532a5229a5;hpb=e627986266d8fcda1b273c1ecab36400494bf76c

diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index e680a98..95f182c 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: nmemsdup.c,v 1.4 2005-05-02 19:14:33 adam Exp $
+ * $Id: nmemsdup.c,v 1.11 2007-05-06 20:12:20 adam Exp $
  */
 
 /**
@@ -15,7 +15,7 @@
 #endif
 
 #include <string.h>
-#include <yaz/nmem.h>
+#include <yaz/nmem_xml.h>
 
 char *nmem_strdup (NMEM mem, const char *src)
 {
@@ -24,6 +24,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);
@@ -45,36 +53,63 @@ void nmem_strsplit_blank(NMEM nmem, const char *dstr, char ***darray, int *num)
 }
 
 void nmem_strsplit(NMEM nmem, const char *delim, const char *dstr,
-		   char ***darray, int *num)
+                   char ***darray, int *num)
 {
     const char *cp = dstr;
     for (*num = 0; *cp; (*num)++)
     {
-	while (*cp && strchr(delim, *cp))
-	    cp++;
-	if (!*cp)
-	    break;
-	while (*cp && !strchr(delim, *cp))
-	    cp++;
+        while (*cp && strchr(delim, *cp))
+            cp++;
+        if (!*cp)
+            break;
+        while (*cp && !strchr(delim, *cp))
+            cp++;
     }
     if (!*num)
-	*darray = 0;
+        *darray = 0;
     else
     {
-	size_t i = 0;
-	*darray = nmem_malloc(nmem, *num * sizeof(**darray));
-	for (cp = dstr; *cp; )
-	{
-	    const char *cp0;
-	    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);
-	}
+        size_t i = 0;
+        *darray = (char **) nmem_malloc(nmem, *num * sizeof(**darray));
+        for (cp = dstr; *cp; )
+        {
+            const char *cp0;
+            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);
+        }
     }
 }
 
+#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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+