X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcharray.c;h=768c167fd53c43c72da28424f3f29fbb298cafb0;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=e972d22ec426f8f2c5ec8f618b77c8e29bbbb5e3;hpb=73276e84ae32e9e148197971d1d6729739980353;p=openldap

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index e972d22ec4..768c167fd5 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,4 +1,9 @@
 /* charray.c - routines for dealing with char * arrays */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -12,7 +17,7 @@
 void
 charray_add(
     char	***a,
-    char	*s
+    const char	*s
 )
 {
 	int	n;
@@ -33,6 +38,33 @@ charray_add(
 	(*a)[n] = NULL;
 }
 
+void
+charray_add_n(
+    char	***a,
+    const char	*s,
+    int         l
+)
+{
+	int	n;
+
+	if ( *a == NULL ) {
+		*a = (char **) ch_malloc( 2 * sizeof(char *) );
+		n = 0;
+	} else {
+		for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
+			;	/* NULL */
+		}
+
+		*a = (char **) ch_realloc( (char *) *a,
+		    (n + 2) * sizeof(char *) );
+	}
+
+	(*a)[n] = (char *) ch_malloc( ( l + 1 ) * sizeof( char ) );
+	strncpy( (*a)[n], s, l );
+	(*a)[n][l] = '\0';
+	(*a)[++n] = NULL;
+}
+
 void
 charray_merge(
     char	***a,
@@ -76,11 +108,13 @@ charray_free( char **array )
 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 );
@@ -110,44 +144,17 @@ charray_dup( char **a )
 }
 
 
-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++ ) {
@@ -171,3 +178,71 @@ str2charray( char *str, char *brkstr )
 	free( str );
 	return( res );
 }
+
+int
+charray_strcmp( const char **a1, const char **a2 )
+{
+	for ( ; a1[0] && a2[0]; a1++, a2++ ) {
+		if ( strcmp( a1[0], a2[0] ) ) {
+			return( !0 );
+		}
+	}
+
+	if ( ! ( a1[0] && a2[0] ) ) {
+		return( !0 );
+	}
+
+	return 0;
+}
+
+
+int
+charray_strcasecmp( const char **a1, const char **a2 )
+{
+	for ( ; a1[0] && a2[0]; a1++, a2++ ) {
+		if ( strcasecmp( a1[0], a2[0] ) ) {
+			return( !0 );
+		}
+	}
+
+	if ( ! ( a1[0] && a2[0] ) ) {
+		return( !0 );
+	}
+
+	return 0;
+}
+
+/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
+ * the result string. This allows fast construction of catenated strings
+ * without the overhead of strlen/strcat.
+ */
+char *
+slap_strcopy(
+	char *a,
+	const char *b
+)
+{
+	if (!a || !b)
+		return a;
+	
+	while (*a++ = *b++) ;
+	return a-1;
+}
+
+/* strncopy is like strcpy except it returns a pointer to the trailing NUL of
+ * the result string. This allows fast construction of catenated strings
+ * without the overhead of strlen/strcat.
+ */
+char *
+slap_strncopy(
+	char *a,
+	const char *b,
+	size_t n
+)
+{
+	if (!a || !b || n == 0)
+		return a;
+	
+	while ((*a++ = *b++) && n-- > 0) ;
+	return a-1;
+}