X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fshell-backends%2Fshellutil.c;h=246e93bc3e2ce6d9aadf567b0b81b39632d3cfb2;hb=9fc4a749dcecda7176cea4859fa8f51bbc91feff;hp=4f7b4690433b21c92f4518ed1ddaeb245754204c;hpb=c0f5c884297aac7b930afad98f601912c83e9e72;p=openldap

diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c
index 4f7b469043..246e93bc3e 100644
--- a/servers/slapd/shell-backends/shellutil.c
+++ b/servers/slapd/shell-backends/shellutil.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  shellutil.c - common routines useful when building shell-based backends
 		 for the standalone ldap server
@@ -18,15 +19,12 @@
 
 #include <stdio.h>
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+#include <ac/stdlib.h>
+#include <ac/stdarg.h>
 
 #include <pwd.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 
 #include <lber.h>
@@ -91,7 +89,8 @@ write_entry( struct ldop *op, struct ldentry *entry, FILE *ofp )
 int
 test_filter( struct ldop *op, struct ldentry *entry )
 {
-    return (( random() & 0x07 ) == 0x07 );	/* XXX random for now */
+    return ((random() & 0x07 ) == 0x07) /* XXX random for now */
+		? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
 }
 
 
@@ -142,7 +141,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
     struct inputparams	*ip;
 
     if ( fgets( line, MAXLINELEN, ifp ) == NULL ) {
-	write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Empty Input" );
+	write_result( ofp, LDAP_OTHER, NULL, "Empty Input" );
     }
     line[ strlen( line ) - 1 ] = '\0';
     if ( strncasecmp( line, STR_OP_SEARCH, sizeof( STR_OP_SEARCH ) - 1 )
@@ -175,7 +174,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
 	    if (( op->ldop_srch.ldsp_scope = atoi( args )) != LDAP_SCOPE_BASE &&
 		    op->ldop_srch.ldsp_scope != LDAP_SCOPE_ONELEVEL &&
 		    op->ldop_srch.ldsp_scope != LDAP_SCOPE_SUBTREE ) {
-		write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Bad scope" );
+		write_result( ofp, LDAP_OTHER, NULL, "Bad scope" );
 		return( -1 );
 	    }
 	    break;
@@ -201,7 +200,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
 		while ( args != NULL ) {
 		    if (( p = strchr( args, ' ' )) != NULL ) {
 			*p++ = '\0';
-			while ( isspace( *p )) {
+			while ( isspace( (unsigned char) *p )) {
 			    ++p;
 			}
 		    }
@@ -215,7 +214,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
 
     if ( op->ldop_suffixes == NULL || op->ldop_dn == NULL ||
 		op->ldop_srch.ldsp_filter == NULL ) {
-	write_result( ofp, LDAP_OPERATIONS_ERROR, NULL,
+	write_result( ofp, LDAP_OTHER, NULL,
 		"Required suffix:, base:, or filter: missing" );
 	return( -1 );
     }
@@ -236,7 +235,7 @@ find_input_tag( char **linep )	/* linep is set to start of args */
 
     for ( i = 0; ips[ i ].ip_type != 0; ++i ) {
 	if ( strncasecmp( *linep, ips[ i ].ip_tag, p - *linep ) == 0 ) {
-	    while ( isspace( *(++p) )) {
+	    while ( isspace( (unsigned char) *(++p) )) {
 		;
 	    }
 	    *linep = p;
@@ -278,7 +277,7 @@ estrdup( char *s )
 
     if (( p = strdup( s )) == NULL ) {
 	debug_printf( "strdup failed\n" );
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -298,7 +297,7 @@ erealloc( void *s, unsigned size )
 
     if ( p == NULL ) {
 	debug_printf( "realloc( p, %d ) failed\n", size );
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -312,7 +311,7 @@ ecalloc( unsigned nelem, unsigned elsize )
 
     if (( p = calloc( nelem, elsize )) == NULL ) {
 	debug_printf( "calloc( %d, %d ) failed\n", nelem, elsize );
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -323,26 +322,12 @@ ecalloc( unsigned nelem, unsigned elsize )
 
 /* VARARGS */
 void
-debug_printf
-#ifdef STDC_HEADERS
-	( char *fmt, ... )
-#else
-	( va_alist )
-    va_dcl
-#endif
+debug_printf( const char *fmt, ... )
 {
     va_list	ap;
-#ifndef STDC_HEADERS
-    char	*fmt;
-#endif
 
 	if ( debugflg ) {
-#ifdef STDC_HEADERS
 		va_start( ap, fmt );
-#else
-		va_start( ap );
-		fmt = va_arg( ap, char * );
-#endif
 		fprintf( stderr, "%s: ", progname );
 		vfprintf( stderr, fmt, ap );
 		va_end( ap );