Avoid locale specific ctype routines.

diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 4ee6870222cb51e07129fdf0f5f359cda5e47e14..3bf03ce2f8dd1e41429453c757198efe6ae4d0bb 100644 (file)
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.c
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c
index 82dcfe8f3d9a8303fefda3834b6ce562d01313a5..f1cf4117ce83b6844b895e7f8aec6ec22df7586c 100644 (file)
--- a/libraries/libldap/disptmpl.c
+++ b/libraries/libldap/disptmpl.c
@@ -24,7 +24,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>

diff --git a/libraries/libldap/dn.c b/libraries/libldap/dn.c
index d0ba92f886f5752d06d12fcb594465b0412ccd3a..f05166b58dc3aabbb2d5d263d1f2e3a5af8f0ef1 100644 (file)
--- a/libraries/libldap/dn.c
+++ b/libraries/libldap/dn.c
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c
index 8ec7116fd9f2af43b18bb7d7d116c27cc3742ef0..57d80a541cf11410dfb73cedacb91f6b66a8a2e4 100644 (file)
--- a/libraries/libldap/dsparse.c
+++ b/libraries/libldap/dsparse.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -155,7 +154,7 @@ next_token( char **sp )
 
     p = *sp;
 
-    while ( isspace( (unsigned char) *p )) {   /* skip leading white space */
+    while ( LDAP_SPACE( (unsigned char) *p )) {        /* skip leading white space */
        ++p;
     }
 
@@ -170,7 +169,7 @@ next_token( char **sp )
     t = tokstart = p;
 
     for ( ;; ) {
-       if ( *p == '\0' || ( isspace( (unsigned char) *p ) && !in_quote )) {
+       if ( *p == '\0' || ( LDAP_SPACE( (unsigned char) *p ) && !in_quote )) {
            if ( *p != '\0' ) {
                ++p;
            }

diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index e20ffbd24dbaa30ed0027936656aad9aa1599bb2..8d871ef241e755fb60b385f07461060997ca07d0 100644 (file)
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index 3078fee69335b0f69063480bc5d9d1995db871ef..5d4abdabbe22cd60700352bcbbd3ca7b11095c03 100644 (file)
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 9a511ee2eae23d2571b4ede57c0d55268e44edca..79fe0a4ad03a3ef2c77616a1e82c0ff294e3ae5f 100644 (file)
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index dee482cfec8d11e623c87b4ce61213a0c4daa731..ccdca5ea402e074b3feec2515a125a9ae4beb243 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index 2d8b89c8a8d68672e17d8bc39e2c817f556153f0..c837631e6d65f3acd36ea3b4dfca7f73a62cc223 100644 (file)
--- a/libraries/libldap/getfilter.c
+++ b/libraries/libldap/getfilter.c
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/regex.h>
 #include <ac/string.h>
@@ -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 ) {

diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index 57cd4dbd43a411d8598d611c19426ccd465e3240..f829ca7e14016c32736ceb207aef2ae4d7172bf3 100644 (file)
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.c
@@ -13,7 +13,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index c42f652057cc9ce4ceb773ac92964bcf19df2c95..9336aa94174d7620fade24ab14e60fb0f07dbcfc 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -13,7 +13,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index cae5dfc660c2050dd091e8097809f3342a3c3c2f..a8f85951baf67c7647756cd37bfdc2625cc829ac 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -131,7 +130,7 @@ append_to_safe_string(safe_string * ss, char * s)
        }
        strncpy(&ss->val[ss->pos], s, l);
        ss->pos += l;
-       if ( ss->pos > 0 && isspace(ss->val[ss->pos-1]) )
+       if ( ss->pos > 0 && LDAP_SPACE(ss->val[ss->pos-1]) )
                ss->at_whsp = 1;
        else
                ss->at_whsp = 0;
@@ -637,7 +636,7 @@ get_token(const char ** sp, char ** token_val)
        default:
                kind = TK_BAREWORD;
                p = *sp;
-               while ( !isspace(**sp) &&
+               while ( !LDAP_SPACE(**sp) &&
                        **sp != '(' &&
                        **sp != ')' &&
                        **sp != '$' &&
@@ -665,7 +664,7 @@ get_token(const char ** sp, char ** token_val)
 static void
 parse_whsp(const char **sp)
 {
-       while (isspace(**sp))
+       while (LDAP_SPACE(**sp))
                (*sp)++;
 }
 
@@ -694,7 +693,7 @@ parse_numericoid(const char **sp, int *code, const int flags)
        }
        /* Each iteration of this loop gets one decimal string */
        while (**sp) {
-               if ( !isdigit(**sp) ) {
+               if ( !LDAP_DIGIT(**sp) ) {
                        /*
                         * Initial char is not a digit or char after dot is
                         * not a digit
@@ -703,7 +702,7 @@ parse_numericoid(const char **sp, int *code, const int flags)
                        return NULL;
                }
                (*sp)++;
-               while ( isdigit(**sp) )
+               while ( LDAP_DIGIT(**sp) )
                        (*sp)++;
                if ( **sp != '.' )
                        break;
@@ -838,7 +837,7 @@ parse_noidlen(const char **sp, int *code, int *len, int allow_quoted)
        if ( **sp == '{' /*}*/ ) {
                (*sp)++;
                *len = atoi(*sp);
-               while ( isdigit(**sp) )
+               while ( LDAP_DIGIT(**sp) )
                        (*sp)++;
                if ( **sp != /*{*/ '}' ) {
                        *code = LDAP_SCHERR_UNEXPTOKEN;

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index b57ac9730c9587a0224c5acce32fa5d3cf9aeece..9587adc4a8ff0d56d40a8804f8b7a16e574de8ae 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -578,7 +577,7 @@ put_filter( BerElement *ber, char *str )
                        parens++;
 
                        /* skip spaces */
-                       while( isspace( *str ) ) str++;
+                       while( LDAP_SPACE( *str ) ) str++;
 
                        switch ( *str ) {
                        case '&':
@@ -690,7 +689,7 @@ put_filter_list( BerElement *ber, char *str )
        Debug( LDAP_DEBUG_TRACE, "put_filter_list \"%s\"\n", str, 0, 0 );
 
        while ( *str ) {
-               while ( *str && isspace( (unsigned char) *str ) )
+               while ( *str && LDAP_SPACE( (unsigned char) *str ) )
                        str++;
                if ( *str == '\0' )
                        break;

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index 5d6afb98983bc6aa512b7a072368d1f9fd1d2920..c1374a2c4c7256e0ea9cf3c7272e0f29493efb5c 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -23,7 +23,6 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
-#include <ac/ctype.h>
 
 #include "ldap-int.h"
 
@@ -48,7 +47,7 @@ static int countKeys(char *keyString)
 
        for (;;)
        {
-               while (isspace(*p))              /* Skip leading whitespace */
+               while (LDAP_SPACE(*p))           /* Skip leading whitespace */
                        p++;
 
                if (*p == '\0')                 /* End of string? */
@@ -56,7 +55,7 @@ static int countKeys(char *keyString)
 
                count++;                                /* Found start of a key */
 
-               while (!isspace(*p))    /* Skip till next space or end of string. */
+               while (!LDAP_SPACE(*p)) /* Skip till next space or end of string. */
                        if (*p++ == '\0')
                                return count;
        }
@@ -92,7 +91,7 @@ static int readNextKey( char **pNextKey, LDAPSortKey **key)
        int oidLen = 0;
 
        /* Skip leading white space. */
-       while (isspace(*p))
+       while (LDAP_SPACE(*p))
                p++;
 
        if (*p == '-')           /* Check if the reverse flag is present. */

diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index d5e1a5206b470e20f6260a72c6af6eeb9f136dad..db21748c8db8d0fe6d3441902b648d8f1a32d52f 100644 (file)
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 468ad4d29502903e19da9b95d4371dacd2f20423..e6cf9e07532cf7798a6ad2f0675c6c5768df8e3c 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -28,7 +28,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index b4f01e133a728d61042acd4bb6fc555c0e0a5634..889de2f4110d856508bdedfed8b54124ec42b242 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -22,7 +22,6 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
-#include <ac/ctype.h>
 
 #include "ldap-int.h"