Add comments to UTF-8 declarations.

[openldap] / libraries / libldap / util-int.c

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index f40082c64dec28107c3063f60df5b2d2c73e389c..158f23472f27eaa5748f3117e1a651a957140e6a 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,11 +1,12 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * util-int.c  Various functions to replace missing threadsafe ones.
- *                               Without the real *_r funcs, things will work, but won't be
- *                               threadsafe. 
+ *                               Without the real *_r funcs, things will
+ *                               work, but might not be threadsafe. 
  * 
  * Written by Bart Hartgers.
  *
@@ -19,9 +20,10 @@
  * in file LICENSE in the top-level directory of the distribution.
  */ 
 
+
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>
@@ -41,6 +43,17 @@
 #      define USE_CTIME_R
 #endif
 
+#if defined(HAVE_GETHOSTBYNAME_R) && \
+    (GETHOSTBYNAME_R_NARGS > 6 || GETHOSTBYNAME_R_NARGS < 5)
+       /* Don't know how to handle this version, pretend it's not there */
+#      undef HAVE_GETHOSTBYNAME_R
+#endif
+#if defined(HAVE_GETHOSTBYADDR_R) && \
+    (GETHOSTBYADDR_R_NARGS > 8 || GETHOSTBYADDR_R_NARGS < 7)
+       /* Don't know how to handle this version, pretend it's not there */
+#      undef HAVE_GETHOSTBYADDR_R
+#endif
+
 #ifdef LDAP_R_COMPILE
 # ifndef USE_CTIME_R
        static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
@@ -51,13 +64,18 @@
 # ifndef HAVE_GETHOSTBYADDR_R
        static ldap_pvt_thread_mutex_t ldap_int_gethostbyaddr_mutex;
 # endif
+# ifdef HAVE_RES_SEARCH
+       ldap_pvt_thread_mutex_t ldap_int_resolv_mutex;
+# endif
 #endif /* LDAP_R_COMPILE */
 
 char *ldap_pvt_ctime( const time_t *tp, char *buf )
 {
 #ifdef USE_CTIME_R
 # if (CTIME_R_NARGS > 3) || (CTIME_R_NARGS < 2)
-       choke me!  nargs should have 2 or 3
+#      error "CTIME_R_NARGS should be 2 or 3"
+# elif CTIME_R_NARGS > 2 && defined(CTIME_R_RETURNS_INT)
+       return( ctime_r(tp,buf,26) < 0 ? 0 : buf );
 # elif CTIME_R_NARGS > 2
        return ctime_r(tp,buf,26);
 # else
@@ -90,6 +108,7 @@ int ldap_pvt_gethostbyname_a(
        int *herrno_ptr )
 {
 #if defined( HAVE_GETHOSTBYNAME_R )
+
 # define NEED_SAFE_REALLOC 1   
        int r=-1;
        int buflen=BUFSTART;
@@ -97,8 +116,19 @@ int ldap_pvt_gethostbyname_a(
        for(;buflen<BUFMAX;) {
                if (safe_realloc( buf, buflen )==NULL)
                        return r;
+
+#if (GETHOSTBYNAME_R_NARGS < 6)
+               r = ((*result=gethostbyname_r( name, resbuf, *buf,
+                                              buflen, herrno_ptr ))== NULL) ?
+                   -1 : 0;
+#else
                r = gethostbyname_r( name, resbuf, *buf,
                        buflen, result, herrno_ptr );
+#endif
+
+               Debug( LDAP_DEBUG_TRACE, "ldap_pvt_gethostbyname_a: host=%s, r=%d\n",
+                      name, r, 0 );
+
 #ifdef NETDB_INTERNAL
                if ((r<0) &&
                        (*herrno_ptr==NETDB_INTERNAL) &&
@@ -157,6 +187,7 @@ int ldap_pvt_gethostbyaddr_a(
        int *herrno_ptr )
 {
 #if defined( HAVE_GETHOSTBYADDR_R )
+
 # undef NEED_SAFE_REALLOC
 # define NEED_SAFE_REALLOC   
        int r=-1;
@@ -165,9 +196,17 @@ int ldap_pvt_gethostbyaddr_a(
        for(;buflen<BUFMAX;) {
                if (safe_realloc( buf, buflen )==NULL)
                        return r;
+#if (GETHOSTBYADDR_R_NARGS < 8)
+               r = ((*result=gethostbyaddr_r( addr, len, type,
+                                              resbuf, *buf, buflen, 
+                                              herrno_ptr )) == NULL) ?
+                   -1 : 0;
+#else
                r = gethostbyaddr_r( addr, len, type,
                        resbuf, *buf, buflen, 
                        result, herrno_ptr );
+#endif
+
 #ifdef NETDB_INTERNAL
                if ((r<0) &&
                        (*herrno_ptr==NETDB_INTERNAL) &&
@@ -214,10 +253,10 @@ int ldap_pvt_gethostbyaddr_a(
 #endif 
 }
 /* 
- * ldap_pvt_init_utils() should be called before any other function.
+ * ldap_int_utils_init() should be called before any other function.
  */
 
-void ldap_pvt_init_utils( void )
+void ldap_int_utils_init( void )
 {
        static int done=0;
        if (done)
@@ -238,6 +277,10 @@ void ldap_pvt_init_utils( void )
        ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex );
 #endif
 
+#ifdef HAVE_RES_SEARCH
+       ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
+#endif
+
        /* call other module init functions here... */
 #endif
 }
@@ -289,7 +332,7 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
        
        for( n_alias=total_alias_len=0, p=src->h_aliases; (*p) ; p++ ) {
                total_alias_len += strlen( *p ) + 1;
-               n_alias++;
+               n_alias++; 
        }
 
        for( n_addr=0, p=src->h_addr_list; (*p) ; p++ ) {
@@ -325,7 +368,7 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
 static char *safe_realloc( char **buf, int len )
 {
        char *tmpbuf;
-       tmpbuf = realloc( *buf, len );
+       tmpbuf = LDAP_REALLOC( *buf, len );
        if (tmpbuf) {
                *buf=tmpbuf;
        }