Modified to use libtool's ltdl instead of gmodule

[openldap] / servers / slapd / shell-backends / shellutil.c

diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c
index 68266efd37d446b29877b96316b768be4ec23185..4ba1213fa2fa11e833df5abb1671ce401de9b4d4 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.c
+++ b/servers/slapd/shell-backends/shellutil.c
@@ -18,18 +18,13 @@
 
 #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/string.h>
 #include <ac/ctype.h>
-extern long int random (void);
+#include <ac/string.h>
 
 #include <lber.h>
 #include <ldap.h>
@@ -203,7 +198,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;
                        }
                    }
@@ -238,7 +233,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;
@@ -280,7 +275,7 @@ estrdup( char *s )
 
     if (( p = strdup( s )) == NULL ) {
        debug_printf( "strdup failed\n" );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -300,7 +295,7 @@ erealloc( void *s, unsigned size )
 
     if ( p == NULL ) {
        debug_printf( "realloc( p, %d ) failed\n", size );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -314,7 +309,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 );
@@ -326,7 +321,7 @@ ecalloc( unsigned nelem, unsigned elsize )
 /* VARARGS */
 void
 debug_printf
-#ifdef STDC_HEADERS
+#if HAVE_STDARG
        ( char *fmt, ... )
 #else
        ( va_alist )
@@ -334,12 +329,12 @@ debug_printf
 #endif
 {
     va_list    ap;
-#ifndef STDC_HEADERS
+#if !HAVE_STDARG
     char       *fmt;
 #endif
 
        if ( debugflg ) {
-#ifdef STDC_HEADERS
+#if HAVE_STDARG
                va_start( ap, fmt );
 #else
                va_start( ap );