X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcharray.c;h=e972d22ec426f8f2c5ec8f618b77c8e29bbbb5e3;hb=5692be1fe4809dcb921067a0bbcef46974187e2e;hp=f3a888826ce4b922d99f0ca31102aade8f16fa59;hpb=6ffddf154a76c278a32fa277ce72435ec51ed177;p=openldap

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index f3a888826c..e972d22ec4 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,9 +1,12 @@
 /* charray.c - routines for dealing with char * arrays */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
 void
@@ -26,7 +29,7 @@ charray_add(
 		    (n + 2) * sizeof(char *) );
 	}
 
-	(*a)[n++] = s;
+	(*a)[n++] = ch_strdup(s);
 	(*a)[n] = NULL;
 }
 
@@ -48,7 +51,7 @@ charray_merge(
 	*a = (char **) ch_realloc( (char *) *a, (n + nn + 1) * sizeof(char *) );
 
 	for ( i = 0; i < nn; i++ ) {
-		(*a)[n + i] = s[i];
+		(*a)[n + i] = ch_strdup(s[i]);
 	}
 	(*a)[n + nn] = NULL;
 }
@@ -99,22 +102,52 @@ charray_dup( char **a )
 	new = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 
 	for ( i = 0; a[i] != NULL; i++ ) {
-		new[i] = strdup( a[i] );
+		new[i] = ch_strdup( a[i] );
 	}
 	new[i] = NULL;
 
 	return( new );
 }
 
+
+char *
+charray2str( char **a )
+{
+	char *s;
+	int i;
+	size_t cur, len = 0;
+
+	if( a == NULL ) return NULL;
+
+	for( i=0 ; a[i] != NULL ; i++ ) {
+		len += strlen( a[i] );
+	}
+
+	if( len == 0 ) return NULL;
+
+	s = ch_malloc( len + 1 );
+
+	cur = 0;
+	for( i=0 ; a[i] != NULL ; i++ ) {
+		len = strlen( a[i] );
+		strncpy( &s[cur], a[i], len );
+		cur += len;
+	}
+	s[len] = '\0';
+	return s;
+}
+
+
 char **
 str2charray( char *str, char *brkstr )
 {
 	char	**res;
 	char	*s;
+	char	*lasts;
 	int	i;
 
 	/* protect the input string from strtok */
-	str = strdup( str );
+	str = ch_strdup( str );
 
 	i = 1;
 	for ( s = str; *s; s++ ) {
@@ -125,10 +158,14 @@ str2charray( char *str, char *brkstr )
 
 	res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 	i = 0;
-	for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
-	    brkstr ) ) {
-		res[i++] = strdup( s );
+
+	for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
+		s != NULL;
+		s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
+	{
+		res[i++] = ch_strdup( s );
 	}
+
 	res[i] = NULL;
 
 	free( str );