Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / charray.c

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index b731cf1e9021fe81d93ee6cc3b79e2dffdcdacfe..60c212e509042940ba3cf8d3539516f9f5838ef0 100644 (file)
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,15 +1,23 @@
 /* charray.c - routines for dealing with char * arrays */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#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
 charray_add(
     char       ***a,
-    char       *s
+    const char *s
 )
 {
        int     n;
@@ -26,7 +34,7 @@ charray_add(
                    (n + 2) * sizeof(char *) );
        }
 
-       (*a)[n++] = s;
+       (*a)[n++] = ch_strdup(s);
        (*a)[n] = NULL;
 }
 
@@ -48,7 +56,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;
 }
@@ -73,7 +81,7 @@ charray_free( char **array )
 int
 charray_inlist(
     char       **a,
-    char       *s
+    const char *s
 )
 {
        int     i;
@@ -99,20 +107,54 @@ 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 )
+str2charray( const char *str_in, const char *brkstr )
 {
+       char    *str;
        char    **res;
        char    *s;
+       char    *lasts;
        int     i;
 
+       /* protect the input string from strtok */
+       str = ch_strdup( str_in );
+
        i = 1;
        for ( s = str; *s; s++ ) {
                if ( strchr( brkstr, *s ) != NULL ) {
@@ -122,11 +164,16 @@ 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 );
        return( res );
 }