/* charray.c - routines for dealing with char * arrays */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 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;
(n + 2) * sizeof(char *) );
}
- (*a)[n++] = s;
+ (*a)[n++] = ch_strdup(s);
(*a)[n] = NULL;
}
*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;
}
int
charray_inlist(
char **a,
- char *s
+ const char *s
)
{
int i;
+ if( a == NULL ) return 0;
+
for ( i = 0; a[i] != NULL; i++ ) {
if ( strcasecmp( s, a[i] ) == 0 ) {
return( 1 );
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 **
-str2charray( char *str_in, 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 */
- char *str = strdup( str_in );
+ str = ch_strdup( str_in );
i = 1;
for ( s = str; *s; s++ ) {
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 );