+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* charray.c - routines for dealing with char * arrays */
if ( *a == NULL ) {
*a = (char **) LDAP_MALLOC( 2 * sizeof(char *) );
n = 0;
+
+ if( *a == NULL ) {
+ return -1;
+ }
+
} else {
+ char **new;
+
for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
; /* NULL */
}
- *a = (char **) LDAP_REALLOC( (char *) *a,
+ new = (char **) LDAP_REALLOC( (char *) *a,
(n + 2) * sizeof(char *) );
- }
- if( *a == NULL ) {
- return -1;
+ if( new == NULL ) {
+ /* caller is required to call ldap_charray_free(*a) */
+ return -1;
+ }
+
+ *a = new;
}
(*a)[n] = LDAP_STRDUP(s);
aa = (char **) LDAP_REALLOC( (char *) *a, (n + nn + 1) * sizeof(char *) );
- if( aa == NULL )
+ if( aa == NULL ) {
return -1;
+ }
*a = aa;
}
char **
-ldap_str2charray( char *str, char *brkstr )
+ldap_str2charray( const char *str_in, const char *brkstr )
{
char **res;
- char *s;
+ char *str, *s;
char *lasts;
int i;
/* protect the input string from strtok */
- str = LDAP_STRDUP( str );
+ str = LDAP_STRDUP( str_in );
if( str == NULL ) {
return NULL;
}
i = 1;
for ( s = str; *s; s++ ) {
- if ( strchr( brkstr, *s ) != NULL ) {
+ if ( ldap_utf8_strchr( brkstr, s ) != NULL ) {
i++;
}
}
i = 0;
- for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
+ for ( s = ldap_utf8_strtok( str, brkstr, &lasts );
s != NULL;
- s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
+ s = ldap_utf8_strtok( NULL, brkstr, &lasts ) )
{
res[i] = LDAP_STRDUP( s );
LDAP_FREE( str );
return( res );
}
+
+char * ldap_charray2str( char **a, const char *sep )
+{
+ char *s, **v, *p;
+ int len;
+ int slen;
+
+ if( sep == NULL ) sep = " ";
+
+ slen = strlen( sep );
+ len = 0;
+
+ for ( v = a; *v != NULL; v++ ) {
+ len += strlen( *v ) + slen;
+ }
+
+ if ( len == 0 ) {
+ return NULL;
+ }
+
+ /* trim extra sep len */
+ len -= slen;
+
+ s = LDAP_MALLOC ( len + 1 );
+
+ if ( s == NULL ) {
+ return NULL;
+ }
+
+ p = s;
+ for ( v = a; *v != NULL; v++ ) {
+ if ( v != a ) {
+ strncpy( p, sep, slen );
+ p += slen;
+ }
+
+ len = strlen( *v );
+ strncpy( p, *v, len );
+ p += len;
+ }
+
+ *p = '\0';
+ return s;
+}