/* 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"
void
charray_add(
char ***a,
- char *s
+ const char *s
)
{
int n;
int
charray_inlist(
char **a,
- char *s
+ const char *s
)
{
int i;
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 );
+ str = ch_strdup( str_in );
i = 1;
for ( s = str; *s; s++ ) {
res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
i = 0;
- pthread_mutex_lock(&strtok_mutex);
-
- for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
- brkstr ) ) {
+ for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
+ s != NULL;
+ s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
+ {
res[i++] = ch_strdup( s );
}
- pthread_mutex_unlock(&strtok_mutex);
-
res[i] = NULL;
free( str );