Commit 8085c7a4 authored by Yang Tse's avatar Yang Tse
Browse files

rearrange to allow internal/private use of ares_strcasecmp to any system that 

lacks the strcasecmp function.
parent 842de911

ares/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ ares_timeout.c ares_destroy.c ares_mkquery.c ares_version.c \ 
ares_expand_name.c ares_parse_a_reply.c windows_port.c ares_strdup.c	\

ares_expand_string.c ares_parse_ptr_reply.c ares_parse_aaaa_reply.c	\

ares_getnameinfo.c inet_net_pton.c bitncmp.c inet_ntop.c		\

ares_parse_ns_reply.c ares_llist.c ares__timeval.c

ares_parse_ns_reply.c ares_llist.c ares__timeval.c ares_strcasecmp.c



HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h          \

           nameser.h inet_net_pton.h inet_ntop.h ares_ipv6.h bitncmp.h      \

           setup_once.h ares_llist.h ares_strdup.h

           setup_once.h ares_llist.h ares_strdup.h ares_strcasecmp.h



MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3 \

 ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3		    \

ares/Makefile.vc6

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ OBJECTS = $(OBJ_DIR)\ares_fds.obj \ 
          $(OBJ_DIR)\ares__read_line.obj       \

          $(OBJ_DIR)\ares_gethostbyname.obj    \

          $(OBJ_DIR)\ares_getnameinfo.obj      \

          $(OBJ_DIR)\ares_strcasecmp.obj       \

          $(OBJ_DIR)\ares_strerror.obj         \

          $(OBJ_DIR)\ares_cancel.obj           \

          $(OBJ_DIR)\ares_init.obj             \
@@ -184,6 +185,8 @@ $(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h setup_once.h ares.h \ 
$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.h   \

  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h



$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c setup.h setup_once.h ares.h



$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h setup_once.h ares.h



$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \

ares/acountry.c

+15 −0
Original line number Diff line number Diff line
@@ -60,6 +60,21 @@ 
#include "inet_net_pton.h"

#include "inet_ntop.h"



#ifndef HAVE_STRDUP

#  include "ares_strdup.h"

#  define strdup(ptr) ares_strdup(ptr)

#endif



#ifndef HAVE_STRCASECMP

#  include "ares_strcasecmp.h"

#  define strcasecmp(p1,p2) ares_strcasecmp(p1,p2)

#endif



#ifndef HAVE_STRNCASECMP

#  include "ares_strcasecmp.h"

#  define strncasecmp(p1,p2,n) ares_strncasecmp(p1,p2,n)

#endif



#ifndef INADDR_NONE

#define INADDR_NONE 0xffffffff

#endif

ares/adig.c

+15 −0
Original line number Diff line number Diff line
@@ -50,6 +50,21 @@ 
#include "inet_ntop.h"

#include "ares_getopt.h"



#ifndef HAVE_STRDUP

#  include "ares_strdup.h"

#  define strdup(ptr) ares_strdup(ptr)

#endif



#ifndef HAVE_STRCASECMP

#  include "ares_strcasecmp.h"

#  define strcasecmp(p1,p2) ares_strcasecmp(p1,p2)

#endif



#ifndef HAVE_STRNCASECMP

#  include "ares_strcasecmp.h"

#  define strncasecmp(p1,p2,n) ares_strncasecmp(p1,p2,n)

#endif



#ifdef WATT32

#undef WIN32  /* Redefined in MingW headers */

#endif

ares/ahost.c

+15 −0
Original line number Diff line number Diff line
@@ -43,6 +43,21 @@ 
#include "inet_net_pton.h"

#include "ares_getopt.h"



#ifndef HAVE_STRDUP

#  include "ares_strdup.h"

#  define strdup(ptr) ares_strdup(ptr)

#endif



#ifndef HAVE_STRCASECMP

#  include "ares_strcasecmp.h"

#  define strcasecmp(p1,p2) ares_strcasecmp(p1,p2)

#endif



#ifndef HAVE_STRNCASECMP

#  include "ares_strcasecmp.h"

#  define strncasecmp(p1,p2,n) ares_strncasecmp(p1,p2,n)

#endif



static void callback(void *arg, int status, int timeouts, struct hostent *host);

static void usage(void);