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

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index 741a0e1595..e972d22ec4 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -109,6 +109,35 @@ charray_dup( char **a )
 	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 )
 {
@@ -130,9 +159,9 @@ str2charray( char *str, char *brkstr )
 	res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 	i = 0;
 
-	for ( s = strtok_r( str, brkstr, &lasts );
+	for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
 		s != NULL;
-		s = strtok_r( NULL, brkstr, &lasts ) )
+		s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
 	{
 		res[i++] = ch_strdup( s );
 	}