From 2364066be0aa442feded4655735b792d9bcf3753 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 12 Apr 2007 19:01:19 +0000
Subject: use ares_getopt for all platforms
---
ares/Makefile.inc | 2 +-
ares/Makefile.vc6 | 6 +++++-
ares/adig.c | 5 +----
ares/ahost.c | 6 +-----
4 files changed, 8 insertions(+), 11 deletions(-)
(limited to 'ares')
diff --git a/ares/Makefile.inc b/ares/Makefile.inc
index 55735e2d6..332f8d57c 100644
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -6,7 +6,7 @@ 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_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_parse_ns_reply.c ares_getopt.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 \
diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6
index 20b12df8e..7a43b5453 100644
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -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_getopt.obj \
$(OBJ_DIR)\ares_strerror.obj \
$(OBJ_DIR)\ares_cancel.obj \
$(OBJ_DIR)\ares_init.obj \
@@ -121,6 +122,7 @@ $(DEF_FILE): $(OBJECTS) Makefile.VC6
@echo ares_inet_pton >> $@
@echo ares_writev >> $@
@echo ares_getnameinfo >> $@
+ @echo ares_getopt >> $@
@echo ares_gettimeofday >> $@
@echo ares_parse_aaaa_reply >> $@
@@ -216,7 +218,7 @@ $(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h \
setup_once.h nameser.h ares.h ares_dns.h inet_net_pton.h ares_private.h \
ares_ipv6.h
-$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c setup.h \
+$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c setup.h \
setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h setup_once.h \
@@ -229,3 +231,5 @@ $(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h
$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h setup_once.h nameser.h \
ares_ipv6.h inet_ntop.h
+
+$(OBJ_DIR)\ares_getopt.obj: ares_getopt.c setup.h setup_once.h ares.h
diff --git a/ares/adig.c b/ares/adig.c
index f42249606..446d55bc5 100644
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -32,9 +32,6 @@
#endif
#include <netdb.h>
#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
@@ -163,7 +160,7 @@ int main(int argc, char **argv)
options.flags = ARES_FLAG_NOCHECKRESP;
options.servers = NULL;
options.nservers = 0;
- while ((c = getopt(argc, argv, "df:s:c:t:T:U:")) != -1)
+ while ((c = ares_getopt(argc, argv, "df:s:c:t:T:U:")) != -1)
{
switch (c)
{
diff --git a/ares/ahost.c b/ares/ahost.c
index 10680d216..d6a227f67 100644
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -34,10 +34,6 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
#include "ares.h"
#include "ares_dns.h"
#include "inet_ntop.h"
@@ -73,7 +69,7 @@ int main(int argc, char **argv)
WSAStartup(wVersionRequested, &wsaData);
#endif
- while ((c = getopt(argc,argv,"dt:h")) != -1)
+ while ((c = ares_getopt(argc,argv,"dt:h")) != -1)
{
switch (c)
{
--
cgit v1.2.3