X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetfilter.c;h=9939ae88acd1dad6017747ad281a1200d344b2ed;hb=a113c3ca9bd5a894e2a9f6426c95cff7ec0d1b89;hp=efafeb5067658b1e2ff937a6fd4cb163a5a13542;hpb=183a03cc2bf3c383b50dad3e4dd831ab3a32df6e;p=openldap

diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index efafeb5067..9939ae88ac 100644
--- a/libraries/libldap/getfilter.c
+++ b/libraries/libldap/getfilter.c
@@ -1,6 +1,6 @@
 /* $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
  */
 /*  Portions
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/regex.h>
 #include <ac/string.h>
@@ -102,7 +101,7 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
     fip = NULL;
     tag = NULL;
 
-    while ( buflen > 0 && ( tokcnt = next_line_tokens( &buf, &buflen, &tok ))
+    while ( buflen > 0 && ( tokcnt = ldap_int_next_line_tokens( &buf, &buflen, &tok ))
 	    > 0 ) {
 
 	switch( tokcnt ) {
@@ -131,7 +130,7 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
 			nextflp->lfl_pattern, error );
 		errno = EINVAL;
 #endif /* LDAP_LIBUI */
-		free_strarray( tok );
+		LDAP_VFREE( tok );
 		return( NULL );
 	    }
 		regfree(&re);
@@ -157,7 +156,7 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
 		if (( nextfip = (LDAPFiltInfo *)LDAP_CALLOC( 1,
 			sizeof( LDAPFiltInfo ))) == NULL ) {
 		    ldap_getfilter_free( lfdp );
-		    free_strarray( tok );
+		    LDAP_VFREE( tok );
 		    return( NULL );
 		}
 		if ( fip == NULL ) {	/* first one */
@@ -177,7 +176,7 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
 		    } else if ( strcasecmp( tok[ 2 ], "base" ) == 0 ) {
 			nextfip->lfi_scope = LDAP_SCOPE_BASE;
 		    } else {
-			free_strarray( tok );
+			LDAP_VFREE( tok );
 			ldap_getfilter_free( lfdp );
 			errno = EINVAL;
 			return( NULL );
@@ -194,7 +193,7 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
 	    break;
 
 	default:
-	    free_strarray( tok );
+	    LDAP_VFREE( tok );
 	    ldap_getfilter_free( lfdp );
 	    errno = EINVAL;
 	    return( NULL );
@@ -347,12 +346,12 @@ ldap_build_filter(
 	    if ( *p == '%' ) {
 		++p;
 		if ( *p == 'v' ) {
-		    if ( isdigit( (unsigned char) p[1] )) {
+		    if ( LDAP_DIGIT( (unsigned char) p[1] )) {
 			++p;
 			wordnum = *p - '1';
 			if ( *(p+1) == '-' ) {
 			    ++p;
-			    if ( isdigit( (unsigned char) p[1] )) {
+			    if ( LDAP_DIGIT( (unsigned char) p[1] )) {
 				++p;
 				endwordnum = *p - '1';	/* e.g., "%v2-4" */
 				if ( endwordnum > wordcount - 1 ) {
@@ -371,7 +370,7 @@ ldap_build_filter(
 				    *f++ = ' ';
 				}
 				slen = strlen( valwords[ i ] );
-				SAFEMEMCPY( f, valwords[ i ], slen );
+				AC_MEMCPY( f, valwords[ i ], slen );
 				f += slen;
 			    }
 			}
@@ -380,17 +379,17 @@ ldap_build_filter(
 			if ( wordcount > 0 ) {
 			    wordnum = wordcount - 1;
 			    slen = strlen( valwords[ wordnum ] );
-			    SAFEMEMCPY( f, valwords[ wordnum ], slen );
+			    AC_MEMCPY( f, valwords[ wordnum ], slen );
 			    f += slen;
 			}
 		    } else if ( value != NULL ) {
 			slen = strlen( value );
-			SAFEMEMCPY( f, value, slen );
+			AC_MEMCPY( f, value, slen );
 			f += slen;
 		    }
 		} else if ( *p == 'a' && attr != NULL ) {
 		    slen = strlen( attr );
-		    SAFEMEMCPY( f, attr, slen );
+		    AC_MEMCPY( f, attr, slen );
 		    f += slen;
 		} else {
 		    *f++ = *p;