moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Albert Chin's improved gethostbyname_r() tests

Browse Source
This commit is contained in:
Daniel Stenberg 2001-10-04 14:05:12 +00:00
parent 47def8091c
commit c3363f833c
2 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
acinclude.m4
View File

@ -246,7 +246,6 @@ AC_DEFUN(CURL_CHECK_INET_NTOA_R,
AC_DEFINE(NEED_REENTRANT) AC_DEFINE(NEED_REENTRANT)
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))])]) AC_MSG_RESULT(no))])])
]) ])
AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R, AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
@ -324,8 +323,6 @@ rc = gethostbyaddr_r(address, length, type, &h,
ac_cv_gethostbyaddr_args=8],[ ac_cv_gethostbyaddr_args=8],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])]) have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
]) ])
AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R, AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
@ -333,28 +330,21 @@ AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
dnl check for number of arguments to gethostbyname_r. it might take dnl check for number of arguments to gethostbyname_r. it might take
dnl either 3, 5, or 6 arguments. dnl either 3, 5, or 6 arguments.
AC_CHECK_FUNCS(gethostbyname_r,[ AC_CHECK_FUNCS(gethostbyname_r,[
AC_MSG_CHECKING(if gethostbyname_r takes 3 arguments) AC_MSG_CHECKING([if gethostbyname_r takes 3 arguments])
AC_TRY_RUN([ AC_TRY_COMPILE([
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
int int
main () { gethostbyname_r(const char *, struct hostent *, struct hostent_data *);],[
struct hostent h; gethostbyname_r(NULL, NULL, NULL);],[
struct hostent_data hdata;
char *name = "localhost";
int rc;
memset(&h, 0, sizeof(struct hostent));
memset(&hdata, 0, sizeof(struct hostent_data));
rc = gethostbyname_r(name, &h, &hdata);
exit (rc != 0 ? 1 : 0); }],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETHOSTBYNAME_R_3) AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
ac_cv_gethostbyname_args=3],[ ac_cv_gethostbyname_args=3],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_CHECKING(if gethostbyname_r with -D_REENTRANT takes 3 arguments) AC_MSG_CHECKING([if gethostbyname_r with -D_REENTRANT takes 3 arguments])
AC_TRY_RUN([ AC_TRY_COMPILE([
#define _REENTRANT #define _REENTRANT
#include <string.h> #include <string.h>
@ -362,53 +352,34 @@ exit (rc != 0 ? 1 : 0); }],[
#include <netdb.h> #include <netdb.h>
int int
main () { gethostbyname_r(const char *,struct hostent *, struct hostent_data *);],[
struct hostent h; gethostbyname_r(NULL, NULL, NULL);],[
struct hostent_data hdata;
char *name = "localhost";
int rc;
memset(&h, 0, sizeof(struct hostent));
memset(&hdata, 0, sizeof(struct hostent_data));
rc = gethostbyname_r(name, &h, &hdata);
exit (rc != 0 ? 1 : 0); }],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETHOSTBYNAME_R_3) AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
AC_DEFINE(NEED_REENTRANT) AC_DEFINE(NEED_REENTRANT)
ac_cv_gethostbyname_args=3],[ ac_cv_gethostbyname_args=3],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_CHECKING(if gethostbyname_r takes 5 arguments) AC_MSG_CHECKING([if gethostbyname_r takes 5 arguments])
AC_TRY_RUN([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
int struct hostent *
main () { gethostbyname_r(const char *, struct hostent *, char *, int, int *);],[
struct hostent *hp; gethostbyname_r(NULL, NULL, NULL, 0, NULL);],[
struct hostent h;
char *name = "localhost";
char buffer[8192];
int h_errno;
hp = gethostbyname_r(name, &h, buffer, 8192, &h_errno);
exit (hp == NULL ? 1 : 0); }],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETHOSTBYNAME_R_5) AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
ac_cv_gethostbyname_args=5],[ ac_cv_gethostbyname_args=5],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_CHECKING(if gethostbyname_r takes 6 arguments) AC_MSG_CHECKING([if gethostbyname_r takes 6 arguments])
AC_TRY_RUN([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
int int
main () { gethostbyname_r(const char *, struct hostent *, char *, size_t,
struct hostent h; struct hostent **, int *);],[
struct hostent *hp; gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);],[
char *name = "localhost";
char buf[8192];
int rc;
int h_errno;
rc = gethostbyname_r(name, &h, buf, 8192, &hp, &h_errno);
exit (rc != 0 ? 1 : 0); }],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETHOSTBYNAME_R_6) AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
ac_cv_gethostbyname_args=6],[ ac_cv_gethostbyname_args=6],[

3
configure.in
View File

@ -446,9 +446,6 @@ then
Set to explicitly specify we don't want to use thread-safe functions) Set to explicitly specify we don't want to use thread-safe functions)
else else
dnl check that 'localhost' resolves first
CURL_CHECK_WORKING_RESOLVER
dnl dig around for gethostbyname_r() dnl dig around for gethostbyname_r()
CURL_CHECK_GETHOSTBYNAME_R() CURL_CHECK_GETHOSTBYNAME_R()