7.10.8!

before we use it

.cvsignore

@@ -9,3 +9,6 @@ config.status
 curl-config
 autom4te.cache
 depcomp
+config.guess
+config.sub
+ltmain.sh

CVS-INFO

@@ -16,8 +16,8 @@ Compile and build instructions follow below.
   CHANGES.$year contains changes for the particular year.
 
   tests/memanalyze.pl
-                is for analyzing the output generated by curl if -DMALLOCDEBUG
-                is used when compiling
+                is for analyzing the output generated by curl if -DCURLDEBUG
+                is used when compiling (run configure with --enable-debug)
 
   buildconf     builds the makefiles and configure stuff
 
@@ -40,9 +40,9 @@ REQUIREMENTS
 
  You need the following software installed:
 
- o autoconf 2.50 (or later)
- o automake 1.5 (or later)
- o libtool  1.4 (or later)
+ o autoconf 2.57  (or later)
+ o automake 1.7   (or later)
+ o libtool  1.4.2 (or later)
  o GNU m4 (required by autoconf)
 
  o nroff + perl

Makefile.am

@@ -4,17 +4,23 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = CHANGES COPYING maketgz SSLCERTS reconf Makefile.dist	\
-  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh
+EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist	\
+  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh \
+  RELEASE-NOTES
 
 bin_SCRIPTS = curl-config
 
-SUBDIRS = docs lib src include tests packages
+SUBDIRS = lib src
+DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
 
-# create a root makefile in the distribution:
 dist-hook:
 	rm -rf $(top_builddir)/tests/log
-	cp $(srcdir)/Makefile.dist $(distdir)/Makefile
+	find $(distdir) -name "*.dist" -exec rm {} \;
+	(distit=`find $(srcdir) -name "*.dist"`; \
+	for file in $$distit; do \
+	  strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \
+	  cp $$file $(distdir)$$strip; \
+	done)
 
 html:
 	cd docs; make html
@@ -25,10 +31,10 @@ pdf:
 check: test
 
 test:
-	@(cd tests; $(MAKE) quiet-test)
+	@(cd tests; $(MAKE) all quiet-test)
 
 test-full:
-	@(cd tests; $(MAKE) full-test)
+	@(cd tests; $(MAKE) all full-test)
 
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
@@ -77,3 +83,13 @@ pkgadd:
 # resulting .tar.bz2 file will end up at packages/Win32/cygwin
 cygwinbin:
 	$(MAKE) -C packages/Win32/cygwin cygwinbin
+
+# We extend the standard install with a custom hook:
+install-data-hook:
+	cd include && $(MAKE) install
+	cd docs && $(MAKE) install
+
+# We extend the standard uninstall with a custom hook:
+uninstall-hook:
+	cd include && $(MAKE) uninstall
+	cd docs && $(MAKE) uninstall

Makefile.dist

@@ -59,6 +59,16 @@ vc-ssl-dll:
 	cd ..\src
 	nmake -f Makefile.vc6
 
+vc-libcurl-ssl-dll:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release-libcurl-ssl-dll
+	cd ..\src
+	nmake -f Makefile.vc6
+
+djgpp:
+	make -C lib -f Makefile.dj
+	make -C src -f Makefile.dj
+
 cygwin:
 	./configure
 	make

README

@@ -31,6 +31,7 @@ WEB SITE
   Visit the curl web site or mirrors for the latest news:
 
         Sweden    -- http://curl.haxx.se/
+        Russia    -- http://curl.tsuren.net/
         US        -- http://curl.sf.net/
         Australia -- http://curl.planetmirror.com/
 
@@ -44,20 +45,21 @@ DOWNLOAD
         Australia -- http://curl.planetmirror.com/download/
         US        -- http://curl.sourceforge.net/download/
         Hongkong  -- http://www.execve.net/curl/
+        Russia    -- http://curl.tsuren.net/download/
 
 CVS
 
   To download the very latest source off the CVS server do this:
 
-    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl login
+    cvs -d :pserver:cvsread@cvs.php.net:/repository login
 
-  (just press enter when asked for password)
+  (enter "phpfi" when asked for password)
 
-    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co curl 
+    cvs -d :pserver:cvsread@cvs.php.net:/repository co curl 
 
   (you'll get a directory named curl created, filled with the source code)
 
-    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl logout
+    cvs -d :pserver:cvsread@cvs.php.net:/repository logout
         
   (you're off the hook!)
 

RELEASE-NOTES

@@ -0,0 +1,94 @@
+Curl and libcurl 7.10.8. A bugfix release.
+
+The 77th public curl release. Release number 104 counted from the very
+beginning.
+
+This release includes the following changes:
+
+ o --head now works on file:// URLs too
+ o file: URLs with only one initial slash now works too
+ o RELEASE-NOTES document added to the release archive to summarize the big
+   and visible changes and bugfixes
+ o CURLOPT_MAXFILESIZE was added, and --max-filesize
+ o CURLOPT_PASSWDFUNCTION and CURLOPT_PASSWDDATA are no longer supported
+ o IPv6 is now supported on Windows builds too
+ o CURLOPT_IPRESOLVE lets you select pure IPv6 or IPv4 resolved addresses
+   (curl offers the command line options -4/--ipv4 and -6/--ipv6)
+ o GSS-Negotiate works fine with the MIT kerberos library
+ o SPNEGO support added, if libcurl is built with the FBopenssl libraries,
+   curl_version_info() can return a feature bit for it and curl -V displays
+   SPNEGO as a feature if libcurl is built with it enabled
+ o easy handles added to a multi handle now share DNS cache automaticly
+ o CURLINFO_HTTPAUTH_AVAIL and CURLINFO_PROXYAUTH_AVAIL were added
+ o CURLOPT_FTP_RESPONSE_TIMEOUT was added
+ o NTLM, Digest and GSS-Negotiate authentications also work for HTTPS over
+   proxies
+ o curl supports multiple -T flags to allow serveral uploaded files using
+   a single command line
+ o CURLINFO_RESPONSE_CODE can return the last FTP response code
+
+This release includes the following bugfixes:
+
+ o added work-around for a name resolve problem on some glibc versions
+ o a rare ERRORBUFFER single-byte overflow was fixed
+ o HTTP-resuming an already downloaded file works better
+ o builds better on Solaris 8+ with gcc
+ o --disable-eprt works now
+ o improved CA cert verification
+ o --anyauth could bug when the first response had no body contents
+ o double password prompting when doing NTLM fixed
+ o improved performance when used multi-threaded on windows
+ o share-locking during DNS lookups was modified
+ o resume was not possible to switch off properly once enabled
+ o fixed the ipv4 connect code when a DNS entry has multiple IPs
+ o now checks subjectAltNames when matching certs
+ o HTTP POST using read callback works again
+ o builds fine on BeOS now
+ o CURLOPT_COOKIE set to NULL no longer sends the previously set cookie
+ o if an FTP transfer used a bad path, the next transfer could fail too
+ o ares-built libcurl resolves IP-only names properly
+ o changed the curl_lock_function proto to prevent warnings on some compilers
+ o builds fine on QNX 6.2.x now
+ o PUT with --digest works now 
+ o --anyauth that picks NTLM and then follows a redirect (and does NTLM again)
+   works now
+ o asynch resolves now work on NT4 too
+ o a DNS cache trash (possible segfault) was fixed
+ o runtests.pl clears all proxy environment variables before the test is run
+ o Microsoft's "Negotiate" authentication is now supported by the existing
+   GSSNEGOTIATE option
+ o A set zero-length proxy name confused libcurl
+ o Digest authentication works again without OpenSSL on 64bit architectures
+ o configure --enable-thread works now
+ o buffer problems in the test suite's web server were fixed
+ o improved proxy password handling
+ o LDAP is again working nicely with the current OpenLDAP
+ o asynch name lookup for non-resolving hosts now return a proper error message
+ o CURLOPT_SSL_VERIFYHOST set to 1 no longer aborts if no CN field is
+   obtainable, it will merely warn about it
+ o name resolve segfault with uClibc fixed
+ o multi interface and multi-part/formpost could end in segfault
+ o curl_multi_info_read() sets the msgs_in_queue to 0 when returning NULL
+ o multi interface, ares and non-resolving host caused a segfault
+ o minor single SSL memory leak fixed
+ o Setting CURLOPT_WRITEFUNCTION or CURLOPT_READFUNCTION to NULL resets them
+   to default
+
+Other curl-related news since the previous public release:
+
+ o TclCurl 0.10.7 was released.
+
+This release would not have looked like this without help, code, reports and
+advice from friends like these:
+
+ Loren Kirkby, Jeff Pohlmeyer, Antoine Calando, Gerd v. Egidy, Vincent
+ Sanders, John McGowan, Henrik Storner, J<>rg Mueller-Tolk, Peter Pentchev,
+ Early Ehlinger, Kevin Fisk, Jurij Smakov, Bjorn Reese, Tim Bartley, David
+ Kimdon, Dominick Meglio, Markus Moeller, Giuseppe Attardi, James MacMillan,
+ Neil Spring, Siddhartha Prakash Jain, Jon Turner, Vincent Bronner, Shard,
+ Jeremy Friesner, Florian Schoppmann, Neil Dunbar, Frank Ticheler, Lachlan
+ O'Dea, Dirk Manske, Domenico Andreoli, Gisle Vanem, Kimmo Kinnunen, Andrew
+ Fuller, Georg Horn, Andr<64>s Garc<72>a, Dylan Ellicott, Kevin Roth, David Hull,
+ James Bursa, Dan C
+ 
+        Thanks! (and sorry if I forgot to mention someone)

acinclude.m4

@@ -30,7 +30,7 @@ AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
 # define PLATFORM_AIX_V3
 #endif
 
-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
 #error "O_NONBLOCK does not work on this platform"
 #endif
   int socket;
@@ -47,7 +47,8 @@ dnl the code was bad, try a different program now, test 2
 #include <unistd.h>
 #include <stropts.h>
 ],[
-/* FIONBIO source test */
+/* FIONBIO source test (old-style unix) */
+ int socket;
  int flags = ioctl(socket, FIONBIO, &flags);
 ],[
 dnl FIONBIO test was good
@@ -62,28 +63,49 @@ dnl the code was bad, try a different program now, test 3
 #include <windows.h>
 ],[
 /* ioctlsocket source code */
+ int socket;
  int flags = ioctlsocket(socket, FIONBIO, &flags);
 ],[
 dnl ioctlsocket test was good
 nonblock="ioctlsocket"
 AC_DEFINE(HAVE_IOCTLSOCKET, 1, [use ioctlsocket() for non-blocking sockets])
 ],[
-dnl ioctlsocket didnt compile!
+dnl ioctlsocket didnt compile!, go to test 4
 
-  AC_TRY_COMPILE([
+  AC_TRY_LINK([
 /* headers for IoctlSocket test (Amiga?) */
 #include <sys/ioctl.h>
 ],[
 /* IoctlSocket source code */
+ int socket;
  int flags = IoctlSocket(socket, FIONBIO, (long)1);
 ],[
 dnl ioctlsocket test was good
 nonblock="IoctlSocket"
 AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets])
 ],[
-dnl ioctlsocket didnt compile!
+dnl Ioctlsocket didnt compile, do test 5!
+  AC_TRY_COMPILE([
+/* headers for SO_NONBLOCK test (BeOS) */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+],[
+/* SO_NONBLOCK source code */
+ long b = 1;
+ int socket;
+ int flags = setsockopt(socket, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
+],[
+dnl the SO_NONBLOCK test was good
+nonblock="SO_NONBLOCK"
+AC_DEFINE(HAVE_SO_NONBLOCK, 1, [use SO_NONBLOCK for non-blocking sockets])
+],[
+dnl test 5 didnt compile!
 nonblock="nada"
 AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1, [disabled non-blocking sockets])
+])
+dnl end of fifth test
+
 ])
 dnl end of forth test
 
@@ -118,8 +140,12 @@ AC_DEFUN([TYPE_SOCKLEN_T],
          for arg2 in "struct sockaddr" void; do
             for t in int size_t unsigned long "unsigned long"; do
                AC_TRY_COMPILE([
+                  #ifdef HAVE_SYS_TYPES_H
                   #include <sys/types.h>
+                  #endif
+                  #ifdef HAVE_SYS_SOCKET_H
                   #include <sys/socket.h>
+                  #endif
 
                   int getpeername (int, $arg2 *, $t *);
                ],[
@@ -152,14 +178,18 @@ AC_DEFUN([TYPE_IN_ADDR_T],
       AC_MSG_CHECKING([for in_addr_t equivalent])
       AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
       [
-         # Systems have either "struct sockaddr *" or
-         # "void *" as the second argument to getpeername
          curl_cv_in_addr_t_equiv=
-         for t in int size_t unsigned long "unsigned long"; do
+         for t in "unsigned long" int size_t unsigned long; do
             AC_TRY_COMPILE([
+               #ifdef HAVE_SYS_TYPES_H
                #include <sys/types.h>
+               #endif
+               #ifdef HAVE_SYS_SOCKET_H
                #include <sys/socket.h>
+               #endif
+               #ifdef HAVE_ARPA_INET_H
                #include <arpa/inet.h>
+               #endif
             ],[
                $t data = inet_addr ("1.2.3.4");
             ],[

ares/.cvsignore

@@ -0,0 +1,7 @@
+configure
+autom4te.cache
+Makefile
+adig
+ahost
+config.log
+config.status

ares/CHANGES

@@ -0,0 +1,22 @@
+This package is built on ares 1.1.1 (written by Greg Hudson). I've decided to
+put together and release my own ares archives since the ares maintainer
+doesn't want these improvements.
+
+The package is called 'c-ares' for now since I (Daniel Stenberg) want this for
+use within the curl project (hence the letter C) and it makes a nice pun.
+
+* October 24, 2003. Daniel Stenberg:
+
+  Added ares_version().
+
+Version 1.0-pre1 (8 October 2003)
+
+- James Bursa made it run on RISC OS
+
+- Dominick Meglio made it run fine on NT4
+
+- Duncan Wilcox made it work fine on Mac OS X
+
+- Daniel Stenberg adjusted the windows port
+
+- liren at vivisimo.com made the initial windows port

ares/FILES

@@ -0,0 +1,31 @@
+*.c
+*.h
+*.3
+NEWS
+README
+CHANGES
+FILES
+maketgz
+aclocal.m4
+Makefile.in
+install-sh
+mkinstalldirs
+configure
+configure.in
+config.guess
+config.sub
+vc/adig/adig.dep
+vc/adig/adig.dsp
+vc/adig/adig.mak
+vc/adig/adig.plg
+vc/vc.dsw
+vc/vc.ncb
+vc/vc.opt
+vc/ahost/ahost.dep
+vc/ahost/ahost.dsp
+vc/ahost/ahost.mak
+vc/ahost/ahost.plg
+vc/areslib/areslib.dep
+vc/areslib/areslib.dsp
+vc/areslib/areslib.mak
+vc/areslib/areslib.plg

ares/Makefile.in

@@ -0,0 +1,87 @@
+# $Id$
+
+SHELL=/bin/sh
+INSTALL=@INSTALL@
+RANLIB=@RANLIB@
+VPATH=@srcdir@
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+mandir=@mandir@
+
+CC=@CC@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@ ${WARN_CFLAGS} ${ERROR_CFLAGS}
+DEFS=@DEFS@
+LDFLAGS=@LDFLAGS@
+LIBS=@LIBS@
+ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
+OBJS=	ares__close_sockets.o ares__get_hostent.o ares__read_line.o \
+	ares_destroy.o ares_expand_name.o ares_fds.o ares_free_errmem.o \
+	ares_free_hostent.o ares_free_string.o ares_gethostbyaddr.o \
+	ares_gethostbyname.o ares_init.o ares_mkquery.o ares_parse_a_reply.o \
+	ares_parse_ptr_reply.o ares_process.o ares_query.o ares_search.o \
+	ares_send.o ares_strerror.o ares_timeout.o ares_version.o
+
+all: libares.a adig ahost
+
+libares.a: ${OBJS}
+	ar cru $@ ${OBJS}
+	${RANLIB} $@
+
+adig: adig.o libares.a
+	${CC} ${LDFLAGS} -o $@ adig.o libares.a ${LIBS}
+
+ahost: ahost.o libares.a
+	${CC} ${LDFLAGS} -o $@ ahost.o libares.a ${LIBS}
+
+${OBJS}: ares.h ares_dns.h ares_private.h
+
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
+check:
+
+install:
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 644 libares.a ${DESTDIR}${libdir}
+	${RANLIB} ${DESTDIR}${libdir}/libares.a
+	chmod u-w ${DESTDIR}${libdir}/libares.a
+	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_destroy.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_expand_name.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_fds.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_free_errmem.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_free_hostent.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_free_string.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_gethostbyaddr.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_gethostbyname.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_init.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_init_options.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_mkquery.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_parse_a_reply.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_parse_ptr_reply.3 \
+		${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_process.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_query.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_search.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_send.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_strerror.3 ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 444 ${srcdir}/ares_timeout.3 ${DESTDIR}${mandir}/man3
+
+clean:
+	rm -f ${OBJS} libares.a adig.o adig ahost.o ahost
+
+distclean: clean
+	rm -f config.cache config.log config.status Makefile

ares/NEWS

@@ -0,0 +1,18 @@
+Major changes in release 1.1.1:
+* ares should now compile as C++ code (no longer uses reserved word
+  "class").
+* Added SRV support to adig test program.
+* Fixed a few error handling bugs in query processing.
+
+Major changes in release 1.1.0:
+* Added ares_free_string() function so that memory can be freed in the
+  same layer as it is allocated, a desirable feature in some
+  environments.
+* A few of the ares_dns.h macros are fixed to use the proper bitwise
+  operator.
+* Fixed a couple of fenceposts fixed in ares_expand_name()'s
+  bounds-checking.
+* In process_timeouts(), extract query->next before calling
+  next_server() and possibly freeing the query structure.
+* Casted arguments to ctype macros casted to unsigned char, since not
+  all char values are valid inputs to those macros according to ANSI.

ares/README

@@ -0,0 +1,41 @@
+This is ares, an asynchronous resolver library.  It is intended for
+applications which need to perform DNS queries without blocking, or
+need to perform multiple DNS queries in parallel.  The primary
+examples of such applications are servers which communicate with
+multiple clients and programs with graphical user interfaces.
+
+This library implementation is not especially portable to crufty old
+systems like SunOS 4.  It assumes a compiler which can handle ANSI C
+syntax, a system malloc which properly handles realloc(NULL, foo) and
+free(NULL), and a reasonably up-to-date <arpa/nameser.h>.
+
+I have attempted to preserve the externally visible behavior of the
+BIND resolver in nearly all respects.  The API of the library is, of
+course, very different from the synchronous BIND API; instead of
+invoking a function like res_send() and getting a return value back
+indicating the number of bytes in the response, you invoke a function
+like ares_send() and give it a callback function to invoke when the
+response arrives.  You then have to select() on the file descriptors
+indicated by ares_fds(), with a timeout given by ares_timeout().  You
+call ares_process() when select() returns.
+
+Some features are missing from the current version of ares, relative
+to the BIND resolver:
+
+	* There is no IPV6 support.
+	* There is no hostname verification.
+	* There is no logging of unexpected events.
+	* There is no debugging-oriented logging.
+	* There is no YP support.
+
+libares requires an ANSI compiler to compile and use.  To build the
+library, just run "./configure" and "make".  To install it, run "make
+install".  Run "./configure --help" to see a list of options you can
+provide to configure to change how the library builds.  libares has no
+data files, so you can move the include file and library around freely
+without leaving behind any dependencies on old paths.  Building the
+library will also build the "adig" program, a little toy for trying
+out the library.  It doesn't get installed.
+
+libares is distributed at athena-dist.mit.edu:pub/ATHENA/ares.  Please
+send bug reports and comments to ghudson@mit.edu.

ares/aclocal.m4

@@ -0,0 +1,358 @@
+dnl $Id$
+
+dnl Copyright 1996 by the Massachusetts Institute of Technology.
+dnl
+dnl Permission to use, copy, modify, and distribute this
+dnl software and its documentation for any purpose and without
+dnl fee is hereby granted, provided that the above copyright
+dnl notice appear in all copies and that both that copyright
+dnl notice and this permission notice appear in supporting
+dnl documentation, and that the name of M.I.T. not be used in
+dnl advertising or publicity pertaining to distribution of the
+dnl software without specific, written prior permission.
+dnl M.I.T. makes no representations about the suitability of
+dnl this software for any purpose.  It is provided "as is"
+dnl without express or implied warranty.
+
+dnl This file provides local macros for packages which use specific
+dnl external libraries.  The public macros are:
+dnl
+dnl	ATHENA_UTIL_COM_ERR
+dnl		Generates error if com_err not found.
+dnl	ATHENA_UTIL_SS
+dnl		Generates error if ss not found.
+dnl	ATHENA_REGEXP
+dnl		Sets REGEX_LIBS if rx library used; ensures POSIX
+dnl		regexp support.
+dnl	ATHENA_MOTIF
+dnl		Sets MOTIF_LIBS and defines HAVE_MOTIF if Motif used.
+dnl	ATHENA_MOTIF_REQUIRED
+dnl		Generates error if Motif not found.
+dnl	ATHENA_AFS
+dnl		Sets AFS_LIBS and defines HAVE_AFS if AFS used.  Pass
+dnl		in an argument giving the desired AFS libraries;
+dnl		AFS_LIBS will be set to that value if AFS is found.
+dnl		AFS_DIR will be set to the prefix given.
+dnl	ATHENA_AFS_REQUIRED
+dnl		Generates error if AFS libraries not found.  AFS_DIR
+dnl		will be set to the prefix given.
+dnl	ATHENA_KRB4
+dnl		Sets KRB4_LIBS and defines HAVE_KRB4 if krb4 used.
+dnl	ATHENA_KRB4_REQUIRED
+dnl		Generates error if krb4 not found.  Sets KRB4_LIBS
+dnl		otherwise.  (Special behavior because krb4 libraries
+dnl		may be different if using krb4 compatibility libraries
+dnl		from krb5.)
+dnl	ATHENA_KRB5
+dnl		Sets KRB5_LIBS and defines HAVE_KRB5 if krb5 used.
+dnl	ATHENA_KRB5_REQUIRED
+dnl		Generates error if krb5 not found.
+dnl	ATHENA_HESIOD
+dnl		Sets HESIOD_LIBS and defines HAVE_HESIOD if Hesiod
+dnl		used.
+dnl	ATHENA_HESIOD_REQUIRED
+dnl		Generates error if Hesiod not found.
+dnl	ATHENA_ARES
+dnl		Sets ARES_LIBS and defines HAVE_ARES if libares
+dnl		used.
+dnl	ATHENA_ARES_REQUIRED
+dnl		Generates error if libares not found.
+dnl	ATHENA_ZEPHYR
+dnl		Sets ZEPHYR_LIBS and defines HAVE_ZEPHYR if zephyr
+dnl		used.
+dnl	ATHENA_ZEPHYR_REQUIRED
+dnl		Generates error if zephyr not found.
+dnl
+dnl All of the macros may extend CPPFLAGS and LDFLAGS to let the
+dnl compiler find the requested libraries.  Put ATHENA_UTIL_COM_ERR
+dnl and ATHENA_UTIL_SS before ATHENA_AFS or ATHENA_AFS_REQUIRED; there
+dnl is a com_err library in the AFS libraries which requires -lutil.
+
+dnl ----- com_err -----
+
+AC_DEFUN(ATHENA_UTIL_COM_ERR,
+[AC_ARG_WITH(com_err,
+	[  --with-com_err=PREFIX   Specify location of com_err],
+	[com_err="$withval"], [com_err=yes])
+if test "$com_err" != no; then
+	if test "$com_err" != yes; then
+		CPPFLAGS="$CPPFLAGS -I$com_err/include"
+		LDFLAGS="$LDFLAGS -L$com_err/lib"
+	fi
+	AC_CHECK_LIB(com_err, com_err, :,
+		     [AC_MSG_ERROR(com_err library not found)])
+else
+	AC_MSG_ERROR(This package requires com_err.)
+fi])
+
+dnl ----- ss -----
+
+AC_DEFUN(ATHENA_UTIL_SS,
+[AC_ARG_WITH(ss,
+	[  --with-ss=PREFIX        Specify location of ss (requires com_err)],
+	[ss="$withval"], [ss=yes])
+if test "$ss" != no; then
+	if test "$ss" != yes; then
+		CPPFLAGS="$CPPFLAGS -I$ss/include"
+		LDFLAGS="$LDFLAGS -L$ss/lib"
+	fi
+	AC_CHECK_LIB(ss, ss_perror, :,
+		     [AC_MSG_ERROR(ss library not found)], -lcom_err)
+else
+	AC_MSG_ERROR(This package requires ss.)
+fi])
+
+dnl ----- Regular expressions -----
+
+AC_DEFUN(ATHENA_REGEXP,
+[AC_ARG_WITH(regex,
+	[  --with-regex=PREFIX     Use installed regex library],
+	[regex="$withval"], [regex=no])
+if test "$regex" != no; then
+	if test "$regex" != yes; then
+		CPPFLAGS="$CPPFLAGS -I$regex/include"
+		LDFLAGS="$LDFLAGS -L$regex/lib"
+	fi
+	AC_CHECK_LIB(regex, regcomp, REGEX_LIBS=-lregex,
+		     [AC_MSG_ERROR(regex library not found)])
+else
+	AC_CHECK_FUNC(regcomp, :,
+		      [AC_MSG_ERROR(can't find POSIX regexp support)])
+fi
+AC_SUBST(REGEX_LIBS)])
+
+dnl ----- Motif -----
+
+AC_DEFUN(ATHENA_MOTIF_CHECK,
+[if test "$motif" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$motif/include"
+	LDFLAGS="$LDFLAGS -L$motif/lib"
+fi
+AC_CHECK_LIB(Xm, XmStringFree, :, [AC_MSG_ERROR(Motif library not found)])])
+
+AC_DEFUN(ATHENA_MOTIF,
+[AC_ARG_WITH(motif,
+	[  --with-motif=PREFIX     Use Motif],
+	[motif="$withval"], [motif=no])
+if test "$motif" != no; then
+	ATHENA_MOTIF_CHECK
+	MOTIF_LIBS=-lXm
+	AC_DEFINE(HAVE_MOTIF)
+fi
+AC_SUBST(MOTIF_LIBS)])
+
+AC_DEFUN(ATHENA_MOTIF_REQUIRED,
+[AC_ARG_WITH(motif,
+	[  --with-motif=PREFIX     Specify location of Motif],
+	[motif="$withval"], [motif=yes])
+if test "$motif" != no; then
+	ATHENA_MOTIF_CHECK
+else
+	AC_MSG_ERROR(This package requires Motif.)
+fi])
+
+dnl ----- AFS -----
+
+AC_DEFUN(ATHENA_AFS_CHECK,
+[AC_CHECK_FUNC(insque, :, AC_CHECK_LIB(compat, insque))
+AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
+AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
+if test "$afs" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$afs/include"
+	LDFLAGS="$LDFLAGS -L$afs/lib -L$afs/lib/afs"
+fi
+AC_CHECK_LIB(sys, pioctl, :, [AC_MSG_ERROR(AFS libraries not found)],
+	     -lrx -llwp -lsys)
+AFS_DIR=$afs
+AC_SUBST(AFS_DIR)])
+
+dnl Specify desired AFS libraries as a parameter.
+AC_DEFUN(ATHENA_AFS,
+[AC_ARG_WITH(afs,
+	[  --with-afs=PREFIX       Use AFS libraries],
+	[afs="$withval"], [afs=no])
+if test "$afs" != no; then
+	ATHENA_AFS_CHECK
+	AFS_LIBS=$1
+	AC_DEFINE(HAVE_AFS)
+fi
+AC_SUBST(AFS_LIBS)])
+
+AC_DEFUN(ATHENA_AFS_REQUIRED,
+[AC_ARG_WITH(afs,
+	[  --with-afs=PREFIX       Specify location of AFS libraries],
+	[afs="$withval"], [afs=/usr/afsws])
+if test "$afs" != no; then
+	ATHENA_AFS_CHECK
+else
+	AC_MSG_ERROR(This package requires AFS libraries.)
+fi])
+
+dnl ----- Kerberos 4 -----
+
+AC_DEFUN(ATHENA_KRB4_CHECK,
+[AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
+AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
+AC_CHECK_LIB(gen, compile)
+if test "$krb4" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$krb4/include"
+	if test -d "$krb4/include/kerberosIV"; then
+		CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV"
+	fi
+	LDFLAGS="$LDFLAGS -L$krb4/lib"
+fi
+AC_CHECK_LIB(krb4, krb_rd_req,
+	     [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
+	     [AC_CHECK_LIB(krb, krb_rd_req,
+			   [KRB4_LIBS="-lkrb -ldes"],
+			   [AC_MSG_ERROR(Kerberos 4 libraries not found)],
+			   -ldes)],
+	     -ldes425 -lkrb5 -lk5crypto -lcom_err)])
+
+AC_DEFUN(ATHENA_KRB4,
+[AC_ARG_WITH(krb4,
+	[  --with-krb4=PREFIX      Use Kerberos 4],
+	[krb4="$withval"], [krb4=no])
+if test "$krb4" != no; then
+	ATHENA_KRB4_CHECK
+	AC_DEFINE(HAVE_KRB4)
+fi
+AC_SUBST(KRB4_LIBS)])
+
+AC_DEFUN(ATHENA_KRB4_REQUIRED,
+[AC_ARG_WITH(krb4,
+	[  --with-krb4=PREFIX      Specify location of Kerberos 4],
+	[krb4="$withval"], [krb4=yes])
+if test "$krb4" != no; then
+	ATHENA_KRB4_CHECK
+	AC_SUBST(KRB4_LIBS)
+else
+	AC_MSG_ERROR(This package requires Kerberos 4.)
+fi])
+
+dnl ----- Kerberos 5 -----
+
+AC_DEFUN(ATHENA_KRB5_CHECK,
+[AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS(socket, socket)
+AC_CHECK_LIB(gen, compile)
+if test "$krb5" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$krb5/include"
+	LDFLAGS="$LDFLAGS -L$krb5/lib"
+fi
+AC_CHECK_LIB(krb5, krb5_init_context, :,
+	     [AC_MSG_ERROR(Kerberos 5 libraries not found)],
+	     -lk5crypto -lcom_err)])
+
+AC_DEFUN(ATHENA_KRB5,
+[AC_ARG_WITH(krb5,
+	[  --with-krb5=PREFIX      Use Kerberos 5],
+	[krb5="$withval"], [krb5=no])
+if test "$krb5" != no; then
+	ATHENA_KRB5_CHECK
+	KRB5_LIBS="-lkrb5 -lk5crypto -lcom_err"
+	AC_DEFINE(HAVE_KRB5)
+fi
+AC_SUBST(KRB5_LIBS)])
+
+AC_DEFUN(ATHENA_KRB5_REQUIRED,
+[AC_ARG_WITH(krb5,
+	[  --with-krb5=PREFIX      Specify location of Kerberos 5],
+	[krb5="$withval"], [krb5=yes])
+if test "$krb5" != no; then
+	ATHENA_KRB5_CHECK
+else
+	AC_MSG_ERROR(This package requires Kerberos 5.)
+fi])
+
+dnl ----- Hesiod -----
+
+AC_DEFUN(ATHENA_HESIOD_CHECK,
+[AC_CHECK_FUNC(res_send, :, AC_CHECK_LIB(resolv, res_send))
+if test "$hesiod" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$hesiod/include"
+	LDFLAGS="$LDFLAGS -L$hesiod/lib"
+fi
+AC_CHECK_LIB(hesiod, hes_resolve, :,
+	     [AC_MSG_ERROR(Hesiod library not found)])])
+
+AC_DEFUN(ATHENA_HESIOD,
+[AC_ARG_WITH(hesiod,
+	[  --with-hesiod=PREFIX    Use Hesiod],
+	[hesiod="$withval"], [hesiod=no])
+if test "$hesiod" != no; then
+	ATHENA_HESIOD_CHECK
+	HESIOD_LIBS="-lhesiod"
+	AC_DEFINE(HAVE_HESIOD)
+fi
+AC_SUBST(HESIOD_LIBS)])
+
+AC_DEFUN(ATHENA_HESIOD_REQUIRED,
+[AC_ARG_WITH(hesiod,
+	[  --with-hesiod=PREFIX    Specify location of Hesiod],
+	[hesiod="$withval"], [hesiod=yes])
+if test "$hesiod" != no; then
+	ATHENA_HESIOD_CHECK
+else
+	AC_MSG_ERROR(This package requires Hesiod.)
+fi])
+
+dnl ----- libares -----
+
+AC_DEFUN(ATHENA_ARES_CHECK,
+[AC_CHECK_FUNC(res_send, :, AC_CHECK_LIB(resolv, res_send))
+if test "$ares" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$ares/include"
+	LDFLAGS="$LDFLAGS -L$ares/lib"
+fi
+AC_CHECK_LIB(ares, ares_init, :, [AC_MSG_ERROR(libares not found)])])
+
+AC_DEFUN(ATHENA_ARES,
+[AC_ARG_WITH(ares,
+	[  --with-ares=PREFIX      Use libares],
+	[ares="$withval"], [ares=no])
+if test "$ares" != no; then
+	ATHENA_ARES_CHECK
+	ARES_LIBS="-lares"
+	AC_DEFINE(HAVE_ARES)
+fi
+AC_SUBST(ARES_LIBS)])
+
+AC_DEFUN(ATHENA_ARES_REQUIRED,
+[AC_ARG_WITH(ares,
+	[  --with-ares=PREFIX      Specify location of libares],
+	[ares="$withval"], [ares=yes])
+if test "$ares" != no; then
+	ATHENA_ARES_CHECK
+else
+	AC_MSG_ERROR(This package requires libares.)
+fi])
+dnl ----- zephyr -----
+
+AC_DEFUN(ATHENA_ZEPHYR_CHECK,
+[if test "$zephyr" != yes; then
+	CPPFLAGS="$CPPFLAGS -I$zephyr/include"
+	LDFLAGS="$LDFLAGS -L$zephyr/lib"
+fi
+AC_CHECK_LIB(zephyr, ZFreeNotice, :, [AC_MSG_ERROR(zephyr not found)])])
+
+AC_DEFUN(ATHENA_ZEPHYR,
+[AC_ARG_WITH(zephyr,
+	[  --with-zephyr=PREFIX      Use zephyr],
+	[zephyr="$withval"], [zephyr=no])
+if test "$zephyr" != no; then
+	ATHENA_ZEPHYR_CHECK
+	ZEPHYR_LIBS="-lzephyr"
+	AC_DEFINE(HAVE_ZEPHYR)
+fi
+AC_SUBST(ZEPHYR_LIBS)])
+
+AC_DEFUN(ATHENA_ZEPHYR_REQUIRED,
+[AC_ARG_WITH(zephyr,
+	[  --with-zephyr=PREFIX      Specify location of zephyr],
+	[zephyr="$withval"], [zephyr=yes])
+if test "$zephyr" != no; then
+	ATHENA_ZEPHYR_CHECK
+else
+	AC_MSG_ERROR(This package requires zephyr.)
+fi])

ares/adig.c

@@ -0,0 +1,623 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <unistd.h>
+#include <netdb.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include "ares.h"
+#include "ares_dns.h"
+
+#ifndef INADDR_NONE
+#define	INADDR_NONE 0xffffffff
+#endif
+
+/* Mac OS X portability check */
+#ifndef T_SRV
+#define T_SRV 33 /* server selection */
+#endif
+
+extern int optind;
+extern char *optarg;
+
+struct nv {
+  const char *name;
+  int value;
+};
+
+static const struct nv flags[] = {
+  { "usevc",		ARES_FLAG_USEVC },
+  { "primary",		ARES_FLAG_PRIMARY },
+  { "igntc",		ARES_FLAG_IGNTC },
+  { "norecurse",	ARES_FLAG_NORECURSE },
+  { "stayopen",		ARES_FLAG_STAYOPEN },
+  { "noaliases",	ARES_FLAG_NOALIASES }
+};
+static const int nflags = sizeof(flags) / sizeof(flags[0]);
+
+static const struct nv classes[] = {
+  { "IN",	C_IN },
+  { "CHAOS",	C_CHAOS },
+  { "HS",	C_HS },
+  { "ANY",	C_ANY }
+};
+static const int nclasses = sizeof(classes) / sizeof(classes[0]);
+
+static const struct nv types[] = {
+  { "A",	T_A },
+  { "NS",	T_NS },
+  { "MD",	T_MD },
+  { "MF",	T_MF },
+  { "CNAME",	T_CNAME },
+  { "SOA",	T_SOA },
+  { "MB",	T_MB },
+  { "MG",	T_MG },
+  { "MR",	T_MR },
+  { "NULL",	T_NULL },
+  { "WKS",	T_WKS },
+  { "PTR",	T_PTR },
+  { "HINFO",	T_HINFO },
+  { "MINFO",	T_MINFO },
+  { "MX",	T_MX },
+  { "TXT",	T_TXT },
+  { "RP",	T_RP },
+  { "AFSDB",	T_AFSDB },
+  { "X25",	T_X25 },
+  { "ISDN",	T_ISDN },
+  { "RT",	T_RT },
+  { "NSAP",	T_NSAP },
+  { "NSAP_PTR",	T_NSAP_PTR },
+  { "SIG",	T_SIG },
+  { "KEY",	T_KEY },
+  { "PX",	T_PX },
+  { "GPOS",	T_GPOS },
+  { "AAAA",	T_AAAA },
+  { "LOC",	T_LOC },
+  { "SRV",	T_SRV },
+  { "AXFR",	T_AXFR },
+  { "MAILB",	T_MAILB },
+  { "MAILA",	T_MAILA },
+  { "ANY",	T_ANY }
+};
+static const int ntypes = sizeof(types) / sizeof(types[0]);
+
+static const char *opcodes[] = {
+  "QUERY", "IQUERY", "STATUS", "(reserved)", "NOTIFY",
+  "(unknown)", "(unknown)", "(unknown)", "(unknown)",
+  "UPDATEA", "UPDATED", "UPDATEDA", "UPDATEM", "UPDATEMA",
+  "ZONEINIT", "ZONEREF"
+};
+
+static const char *rcodes[] = {
+  "NOERROR", "FORMERR", "SERVFAIL", "NXDOMAIN", "NOTIMP", "REFUSED",
+  "(unknown)", "(unknown)", "(unknown)", "(unknown)", "(unknown)",
+  "(unknown)", "(unknown)", "(unknown)", "(unknown)", "NOCHANGE"
+};
+
+static void callback(void *arg, int status, unsigned char *abuf, int alen);
+static const unsigned char *display_question(const unsigned char *aptr,
+					     const unsigned char *abuf,
+					     int alen);
+static const unsigned char *display_rr(const unsigned char *aptr,
+				       const unsigned char *abuf, int alen);
+static const char *type_name(int type);
+static const char *class_name(int dnsclass);
+static void usage(void);
+
+int main(int argc, char **argv)
+{
+  ares_channel channel;
+  int c, i, optmask = ARES_OPT_FLAGS, dnsclass = C_IN, type = T_A;
+  int status, nfds, count;
+  struct ares_options options;
+  struct hostent *hostent;
+  fd_set read_fds, write_fds;
+  struct timeval *tvp, tv;
+  char *errmem;
+
+#ifdef WIN32
+  WORD wVersionRequested = MAKEWORD(1,1);
+  WSADATA wsaData;
+  WSAStartup(wVersionRequested, &wsaData);
+#endif  
+
+  options.flags = ARES_FLAG_NOCHECKRESP;
+  options.servers = NULL;
+  options.nservers = 0;
+  while ((c = getopt(argc, argv, "f:s:c:t:T:U:")) != -1)
+    {
+      switch (c)
+	{
+	case 'f':
+	  /* Add a flag. */
+	  for (i = 0; i < nflags; i++)
+	    {
+	      if (strcmp(flags[i].name, optarg) == 0)
+		break;
+	    }
+	  if (i == nflags)
+	    usage();
+	  options.flags |= flags[i].value;
+	  break;
+
+	case 's':
+	  /* Add a server, and specify servers in the option mask. */
+	  hostent = gethostbyname(optarg);
+	  if (!hostent || hostent->h_addrtype != AF_INET)
+	    {
+	      fprintf(stderr, "adig: server %s not found.\n", optarg);
+	      return 1;
+	    }
+	  options.servers = realloc(options.servers, (options.nservers + 1)
+				    * sizeof(struct in_addr));
+	  if (!options.servers)
+	    {
+	      fprintf(stderr, "Out of memory!\n");
+	      return 1;
+	    }
+	  memcpy(&options.servers[options.nservers], hostent->h_addr,
+		 sizeof(struct in_addr));
+	  options.nservers++;
+	  optmask |= ARES_OPT_SERVERS;
+	  break;
+
+	case 'c':
+	  /* Set the query class. */
+	  for (i = 0; i < nclasses; i++)
+	    {
+	      if (strcasecmp(classes[i].name, optarg) == 0)
+		break;
+	    }
+	  if (i == nclasses)
+	    usage();
+	  dnsclass = classes[i].value;
+	  break;
+
+	case 't':
+	  /* Set the query type. */
+	  for (i = 0; i < ntypes; i++)
+	    {
+	      if (strcasecmp(types[i].name, optarg) == 0)
+		break;
+	    }
+	  if (i == ntypes)
+	    usage();
+	  type = types[i].value;
+	  break;
+
+	case 'T':
+	  /* Set the TCP port number. */
+	  if (!isdigit((unsigned char)*optarg))
+	    usage();
+	  options.tcp_port = strtol(optarg, NULL, 0);
+	  optmask |= ARES_OPT_TCP_PORT;
+	  break;
+
+	case 'U':
+	  /* Set the UDP port number. */
+	  if (!isdigit((unsigned char)*optarg))
+	    usage();
+	  options.udp_port = strtol(optarg, NULL, 0);
+	  optmask |= ARES_OPT_UDP_PORT;
+	  break;
+	}
+    }
+  argc -= optind;
+  argv += optind;
+  if (argc == 0)
+    usage();
+
+  status = ares_init_options(&channel, &options, optmask);
+
+  if (status != ARES_SUCCESS)
+    {
+      fprintf(stderr, "ares_init_options: %s\n",
+	      ares_strerror(status, &errmem));
+      ares_free_errmem(errmem);
+      return 1;
+    }
+
+  /* Initiate the queries, one per command-line argument.  If there is
+   * only one query to do, supply NULL as the callback argument;
+   * otherwise, supply the query name as an argument so we can
+   * distinguish responses for the user when printing them out.
+   */
+  if (argc == 1)
+    ares_query(channel, *argv, dnsclass, type, callback, (char *) NULL);
+  else
+    {
+      for (; *argv; argv++)
+	ares_query(channel, *argv, dnsclass, type, callback, *argv);
+    }
+
+  /* Wait for all queries to complete. */
+  while (1)
+    {
+      FD_ZERO(&read_fds);
+      FD_ZERO(&write_fds);
+      nfds = ares_fds(channel, &read_fds, &write_fds);
+      if (nfds == 0)
+	break;
+      tvp = ares_timeout(channel, NULL, &tv);
+      count = select(nfds, &read_fds, &write_fds, NULL, tvp);
+      if (count < 0 && errno != EINVAL)
+	{
+	  perror("select");
+	  return 1;
+	}
+      ares_process(channel, &read_fds, &write_fds);
+    }
+
+  ares_destroy(channel);
+  return 0;
+}
+
+static void callback(void *arg, int status, unsigned char *abuf, int alen)
+{
+  char *name = (char *) arg, *errmem;
+  int id, qr, opcode, aa, tc, rd, ra, rcode, i;
+  unsigned int qdcount, ancount, nscount, arcount;
+  const unsigned char *aptr;
+
+  /* Display the query name if given. */
+  if (name)
+    printf("Answer for query %s:\n", name);
+
+  /* Display an error message if there was an error, but only stop if
+   * we actually didn't get an answer buffer.
+   */
+  if (status != ARES_SUCCESS)
+    {
+      printf("%s\n", ares_strerror(status, &errmem));
+      ares_free_errmem(errmem);
+      if (!abuf)
+	return;
+    }
+
+  /* Won't happen, but check anyway, for safety. */
+  if (alen < HFIXEDSZ)
+    return;
+
+  /* Parse the answer header. */
+  id = DNS_HEADER_QID(abuf);
+  qr = DNS_HEADER_QR(abuf);
+  opcode = DNS_HEADER_OPCODE(abuf);
+  aa = DNS_HEADER_AA(abuf);
+  tc = DNS_HEADER_TC(abuf);
+  rd = DNS_HEADER_RD(abuf);
+  ra = DNS_HEADER_RA(abuf);
+  rcode = DNS_HEADER_RCODE(abuf);
+  qdcount = DNS_HEADER_QDCOUNT(abuf);
+  ancount = DNS_HEADER_ANCOUNT(abuf);
+  nscount = DNS_HEADER_NSCOUNT(abuf);
+  arcount = DNS_HEADER_ARCOUNT(abuf);
+
+  /* Display the answer header. */
+  printf("id: %d\n", id);
+  printf("flags: %s%s%s%s%s\n",
+	 qr ? "qr " : "",
+	 aa ? "aa " : "",
+	 tc ? "tc " : "",
+	 rd ? "rd " : "",
+	 ra ? "ra " : "");
+  printf("opcode: %s\n", opcodes[opcode]);
+  printf("rcode: %s\n", rcodes[rcode]);
+
+  /* Display the questions. */
+  printf("Questions:\n");
+  aptr = abuf + HFIXEDSZ;
+  for (i = 0; i < qdcount; i++)
+    {
+      aptr = display_question(aptr, abuf, alen);
+      if (aptr == NULL)
+	return;
+    }
+
+  /* Display the answers. */
+  printf("Answers:\n");
+  for (i = 0; i < ancount; i++)
+    {
+      aptr = display_rr(aptr, abuf, alen);
+      if (aptr == NULL)
+	return;
+    }
+
+  /* Display the NS records. */
+  printf("NS records:\n");
+  for (i = 0; i < nscount; i++)
+    {
+      aptr = display_rr(aptr, abuf, alen);
+      if (aptr == NULL)
+	return;
+    }
+
+  /* Display the additional records. */
+  printf("Additional records:\n");
+  for (i = 0; i < arcount; i++)
+    {
+      aptr = display_rr(aptr, abuf, alen);
+      if (aptr == NULL)
+	return;
+    }
+}
+
+static const unsigned char *display_question(const unsigned char *aptr,
+					     const unsigned char *abuf,
+					     int alen)
+{
+  char *name;
+  int type, dnsclass, status, len;
+
+  /* Parse the question name. */
+  status = ares_expand_name(aptr, abuf, alen, &name, &len);
+  if (status != ARES_SUCCESS)
+    return NULL;
+  aptr += len;
+
+  /* Make sure there's enough data after the name for the fixed part
+   * of the question.
+   */
+  if (aptr + QFIXEDSZ > abuf + alen)
+    {
+      free(name);
+      return NULL;
+    }
+
+  /* Parse the question type and class. */
+  type = DNS_QUESTION_TYPE(aptr);
+  dnsclass = DNS_QUESTION_CLASS(aptr);
+  aptr += QFIXEDSZ;
+
+  /* Display the question, in a format sort of similar to how we will
+   * display RRs.
+   */
+  printf("\t%-15s.\t", name);
+  if (dnsclass != C_IN)
+    printf("\t%s", class_name(dnsclass));
+  printf("\t%s\n", type_name(type));
+  free(name);
+  return aptr;
+}
+
+static const unsigned char *display_rr(const unsigned char *aptr,
+				       const unsigned char *abuf, int alen)
+{
+  const unsigned char *p;
+  char *name;
+  int type, dnsclass, ttl, dlen, status, len;
+  struct in_addr addr;
+
+  /* Parse the RR name. */
+  status = ares_expand_name(aptr, abuf, alen, &name, &len);
+  if (status != ARES_SUCCESS)
+    return NULL;
+  aptr += len;
+
+  /* Make sure there is enough data after the RR name for the fixed
+   * part of the RR.
+   */
+  if (aptr + RRFIXEDSZ > abuf + alen)
+    {
+      free(name);
+      return NULL;
+    }
+
+  /* Parse the fixed part of the RR, and advance to the RR data
+   * field. */
+  type = DNS_RR_TYPE(aptr);
+  dnsclass = DNS_RR_CLASS(aptr);
+  ttl = DNS_RR_TTL(aptr);
+  dlen = DNS_RR_LEN(aptr);
+  aptr += RRFIXEDSZ;
+  if (aptr + dlen > abuf + alen)
+    {
+      free(name);
+      return NULL;
+    }
+
+  /* Display the RR name, class, and type. */
+  printf("\t%-15s.\t%d", name, ttl);
+  if (dnsclass != C_IN)
+    printf("\t%s", class_name(dnsclass));
+  printf("\t%s", type_name(type));
+  free(name);
+
+  /* Display the RR data.  Don't touch aptr. */
+  switch (type)
+    {
+    case T_CNAME:
+    case T_MB:
+    case T_MD:
+    case T_MF:
+    case T_MG:
+    case T_MR:
+    case T_NS:
+    case T_PTR:
+      /* For these types, the RR data is just a domain name. */
+      status = ares_expand_name(aptr, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t%s.", name);
+      free(name);
+      break;
+
+    case T_HINFO:
+      /* The RR data is two length-counted character strings. */
+      p = aptr;
+      len = *p;
+      if (p + len + 1 > aptr + dlen)
+	return NULL;
+      printf("\t%.*s", len, p + 1);
+      p += len + 1;
+      len = *p;
+      if (p + len + 1 > aptr + dlen)
+	return NULL;
+      printf("\t%.*s", len, p + 1);
+      break;
+
+    case T_MINFO:
+      /* The RR data is two domain names. */
+      p = aptr;
+      status = ares_expand_name(p, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t%s.", name);
+      free(name);
+      p += len;
+      status = ares_expand_name(p, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t%s.", name);
+      free(name);
+      break;
+
+    case T_MX:
+      /* The RR data is two bytes giving a preference ordering, and
+       * then a domain name.
+       */
+      if (dlen < 2)
+	return NULL;
+      printf("\t%d", (aptr[0] << 8) | aptr[1]);
+      status = ares_expand_name(aptr + 2, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t%s.", name);
+      free(name);
+      break;
+
+    case T_SOA:
+      /* The RR data is two domain names and then five four-byte
+       * numbers giving the serial number and some timeouts.
+       */
+      p = aptr;
+      status = ares_expand_name(p, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t%s.\n", name);
+      free(name);
+      p += len;
+      status = ares_expand_name(p, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+	return NULL;
+      printf("\t\t\t\t\t\t%s.\n", name);
+      free(name);
+      p += len;
+      if (p + 20 > aptr + dlen)
+	return NULL;
+      printf("\t\t\t\t\t\t( %d %d %d %d %d )",
+	     (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3],
+	     (p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7],
+	     (p[8] << 24) | (p[9] << 16) | (p[10] << 8) | p[11],
+	     (p[12] << 24) | (p[13] << 16) | (p[14] << 8) | p[15],
+	     (p[16] << 24) | (p[17] << 16) | (p[18] << 8) | p[19]);
+      break;
+
+    case T_TXT:
+      /* The RR data is one or more length-counted character
+       * strings. */
+      p = aptr;
+      while (p < aptr + dlen)
+	{
+	  len = *p;
+	  if (p + len + 1 > aptr + dlen)
+	    return NULL;
+	  printf("\t%.*s", len, p + 1);
+	  p += len + 1;
+	}
+      break;
+
+    case T_A:
+      /* The RR data is a four-byte Internet address. */
+      if (dlen != 4)
+	return NULL;
+      memcpy(&addr, aptr, sizeof(struct in_addr));
+      printf("\t%s", inet_ntoa(addr));
+      break;
+
+    case T_WKS:
+      /* Not implemented yet */
+      break;
+
+    case T_SRV:
+      /* The RR data is three two-byte numbers representing the
+       * priority, weight, and port, followed by a domain name.
+       */
+      
+      printf("\t%d", DNS__16BIT(aptr));
+      printf(" %d", DNS__16BIT(aptr + 2));
+      printf(" %d", DNS__16BIT(aptr + 4));
+      
+      status = ares_expand_name(aptr + 6, abuf, alen, &name, &len);
+      if (status != ARES_SUCCESS)
+        return NULL;
+      printf("\t%s.", name);
+      free(name);
+      break;
+      
+    default:
+      printf("\t[Unknown RR; cannot parse]");
+    }
+  printf("\n");
+
+  return aptr + dlen;
+}
+
+static const char *type_name(int type)
+{
+  int i;
+
+  for (i = 0; i < ntypes; i++)
+    {
+      if (types[i].value == type)
+	return types[i].name;
+    }
+  return "(unknown)";
+}
+
+static const char *class_name(int dnsclass)
+{
+  int i;
+
+  for (i = 0; i < nclasses; i++)
+    {
+      if (classes[i].value == dnsclass)
+	return classes[i].name;
+    }
+  return "(unknown)";
+}
+
+static void usage(void)
+{
+  fprintf(stderr, "usage: adig [-f flag] [-s server] [-c class] "
+	  "[-t type] [-p port] name ...\n");
+  exit(1);
+}

ares/ahost.c

@@ -0,0 +1,122 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#else
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+
+#ifndef INADDR_NONE
+#define	INADDR_NONE 0xffffffff
+#endif
+
+static void callback(void *arg, int status, struct hostent *host);
+static void usage(void);
+
+int main(int argc, char **argv)
+{
+  ares_channel channel;
+  int status, nfds;
+  fd_set read_fds, write_fds;
+  struct timeval *tvp, tv;
+  char *errmem;
+  struct in_addr addr;
+
+#ifdef WIN32
+  WORD wVersionRequested = MAKEWORD(1,1);
+  WSADATA wsaData;
+  WSAStartup(wVersionRequested, &wsaData);
+#endif  
+
+  if (argc == 0)
+    usage();
+
+  status = ares_init(&channel);
+  if (status != ARES_SUCCESS)
+    {
+      fprintf(stderr, "ares_init: %s\n", ares_strerror(status, &errmem));
+      ares_free_errmem(errmem);
+      return 1;
+    }
+
+  /* Initiate the queries, one per command-line argument. */
+  for (argv++; *argv; argv++)
+    {
+      addr.s_addr = inet_addr(*argv);
+      if (addr.s_addr == INADDR_NONE)
+	ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
+      else
+	{
+	  ares_gethostbyaddr(channel, &addr, sizeof(addr), AF_INET, callback,
+			     *argv);
+	}
+    }
+
+  /* Wait for all queries to complete. */
+  while (1)
+    {
+      FD_ZERO(&read_fds);
+      FD_ZERO(&write_fds);
+      nfds = ares_fds(channel, &read_fds, &write_fds);
+      if (nfds == 0)
+	break;
+      tvp = ares_timeout(channel, NULL, &tv);
+      select(nfds, &read_fds, &write_fds, NULL, tvp);
+      ares_process(channel, &read_fds, &write_fds);
+    }
+
+  ares_destroy(channel);
+  return 0;
+}
+
+static void callback(void *arg, int status, struct hostent *host)
+{
+  struct in_addr addr;
+  char *mem, **p;
+
+  if (status != ARES_SUCCESS)
+    {
+      fprintf(stderr, "%s: %s\n", (char *) arg, ares_strerror(status, &mem));
+      ares_free_errmem(mem);
+      return;
+    }
+
+  for (p = host->h_addr_list; *p; p++)
+    {
+      memcpy(&addr, *p, sizeof(struct in_addr));
+      printf("%-32s\t%s\n", host->h_name, inet_ntoa(addr));
+    }
+}
+
+static void usage(void)
+{
+  fprintf(stderr, "usage: ahost {host|addr} ...\n");
+  exit(1);
+}

ares/ares.h

@@ -0,0 +1,130 @@
+/* $Id$ */
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef ARES__H
+#define ARES__H
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include <winsock.h>
+#include <windows.h>
+#else
+#include <netinet/in.h>
+#endif
+
+#define ARES_SUCCESS		0
+
+/* Server error codes (ARES_ENODATA indicates no relevant answer) */
+#define ARES_ENODATA		1
+#define ARES_EFORMERR		2
+#define ARES_ESERVFAIL		3
+#define ARES_ENOTFOUND		4
+#define ARES_ENOTIMP		5
+#define ARES_EREFUSED		6
+
+/* Locally generated error codes */
+#define ARES_EBADQUERY		7
+#define ARES_EBADNAME		8
+#define ARES_EBADFAMILY		9
+#define ARES_EBADRESP		10
+#define ARES_ECONNREFUSED	11
+#define ARES_ETIMEOUT		12
+#define ARES_EOF		13
+#define ARES_EFILE		14
+#define ARES_ENOMEM		15
+#define ARES_EDESTRUCTION	16
+
+/* Flag values */
+#define ARES_FLAG_USEVC		(1 << 0)
+#define ARES_FLAG_PRIMARY	(1 << 1)
+#define ARES_FLAG_IGNTC		(1 << 2)
+#define ARES_FLAG_NORECURSE	(1 << 3)
+#define ARES_FLAG_STAYOPEN	(1 << 4)
+#define ARES_FLAG_NOSEARCH	(1 << 5)
+#define ARES_FLAG_NOALIASES	(1 << 6)
+#define ARES_FLAG_NOCHECKRESP	(1 << 7)
+
+/* Option mask values */
+#define ARES_OPT_FLAGS		(1 << 0)
+#define ARES_OPT_TIMEOUT	(1 << 1)
+#define ARES_OPT_TRIES		(1 << 2)
+#define ARES_OPT_NDOTS		(1 << 3)
+#define ARES_OPT_UDP_PORT	(1 << 4)
+#define ARES_OPT_TCP_PORT	(1 << 5)
+#define ARES_OPT_SERVERS	(1 << 6)
+#define ARES_OPT_DOMAINS	(1 << 7)
+#define ARES_OPT_LOOKUPS	(1 << 8)
+
+struct ares_options {
+  int flags;
+  int timeout;
+  int tries;
+  int ndots;
+  unsigned short udp_port;
+  unsigned short tcp_port;
+  struct in_addr *servers;
+  int nservers;
+  char **domains;
+  int ndomains;
+  char *lookups;
+};
+
+struct hostent;
+struct timeval;
+struct ares_channeldata;
+typedef struct ares_channeldata *ares_channel;
+typedef void (*ares_callback)(void *arg, int status, unsigned char *abuf,
+			      int alen);
+typedef void (*ares_host_callback)(void *arg, int status,
+				   struct hostent *hostent);
+
+int ares_init(ares_channel *channelptr);
+int ares_init_options(ares_channel *channelptr, struct ares_options *options,
+		      int optmask);
+void ares_destroy(ares_channel channel);
+
+void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
+	       ares_callback callback, void *arg);
+void ares_query(ares_channel channel, const char *name, int dnsclass,
+		int type, ares_callback callback, void *arg);
+void ares_search(ares_channel channel, const char *name, int dnsclass,
+		 int type, ares_callback callback, void *arg);
+void ares_gethostbyname(ares_channel channel, const char *name, int family,
+			ares_host_callback callback, void *arg);
+void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
+			int family, ares_host_callback callback, void *arg);
+
+int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
+struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
+			     struct timeval *tv);
+void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
+
+int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
+		 int rd, unsigned char **buf, int *buflen);
+int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
+		     int alen, char **s, int *enclen);
+int ares_parse_a_reply(const unsigned char *abuf, int alen,
+		       struct hostent **host);
+int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
+			 int addrlen, int family, struct hostent **host);
+void ares_free_string(char *str);
+void ares_free_hostent(struct hostent *host);
+const char *ares_strerror(int code, char **memptr);
+void ares_free_errmem(char *mem);
+
+#endif /* ARES__H */

ares/ares__close_sockets.c

@@ -0,0 +1,57 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdlib.h>
+#ifdef WIN32
+#else
+#include <unistd.h>
+#endif
+#include "ares.h"
+#include "ares_private.h"
+
+void ares__close_sockets(struct server_state *server)
+{
+  struct send_request *sendreq;
+
+  /* Free all pending output buffers. */
+  while (server->qhead)
+    {
+      /* Advance server->qhead; pull out query as we go. */
+      sendreq = server->qhead;
+      server->qhead = sendreq->next;
+      free(sendreq);
+    }
+  server->qtail = NULL;
+
+  /* Reset any existing input buffer. */
+  if (server->tcp_buffer)
+    free(server->tcp_buffer);
+  server->tcp_buffer = NULL;
+  server->tcp_lenbuf_pos = 0;
+
+  /* Close the TCP and UDP sockets. */
+  if (server->tcp_socket != -1)
+    {
+      closesocket(server->tcp_socket);
+      server->tcp_socket = -1;
+    }
+  if (server->udp_socket != -1)
+    {
+      closesocket(server->udp_socket);
+      server->udp_socket = -1;
+    }
+}

ares/ares__get_hostent.c

@@ -0,0 +1,171 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "ares.h"
+#include "ares_private.h"
+
+int ares__get_hostent(FILE *fp, struct hostent **host)
+{
+  char *line = NULL, *p, *q, *canonical, **alias;
+  int status, linesize, end_at_hostname, naliases;
+  struct in_addr addr;
+  struct hostent *hostent = NULL;
+
+  while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+    {
+      /* Skip comment lines; terminate line at comment character. */
+      if (*line == '#' || !*line)
+	continue;
+      p = strchr(line, '#');
+      if (p)
+	*p = 0;
+
+      /* Get the address part. */
+      p = line;
+      while (*p && !isspace((unsigned char)*p))
+	p++;
+      if (!*p)
+	continue;
+      *p = 0;
+      addr.s_addr = inet_addr(line);
+      if (addr.s_addr == INADDR_NONE)
+	continue;
+
+      /* Get the canonical hostname. */
+      p++;
+      while (isspace((unsigned char)*p))
+	p++;
+      if (!*p)
+	continue;
+      q = p;
+      while (*q && !isspace((unsigned char)*q))
+	q++;
+      end_at_hostname = (*q == 0);
+      *q = 0;
+      canonical = p;
+
+      naliases = 0;
+      if (!end_at_hostname)
+	{
+	  /* Count the aliases. */
+	  p = q + 1;
+	  while (isspace((unsigned char)*p))
+	    p++;
+	  while (*p)
+	    {
+	      while (*p && !isspace((unsigned char)*p))
+		p++;
+	      while (isspace((unsigned char)*p))
+		p++;
+	      naliases++;
+	    }
+	}
+
+      /* Allocate memory for the host structure. */
+      hostent = malloc(sizeof(struct hostent));
+      if (!hostent)
+	break;
+      hostent->h_aliases = NULL;
+      hostent->h_addr_list = NULL;
+      hostent->h_name = strdup(canonical);
+      if (!hostent->h_name)
+	break;
+      hostent->h_addr_list = malloc(2 * sizeof(char *));
+      if (!hostent->h_addr_list)
+	break;
+      hostent->h_addr_list[0] = malloc(sizeof(struct in_addr));
+      if (!hostent->h_addr_list[0])
+	break;
+      hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
+      if (!hostent->h_aliases)
+	break;
+
+      /* Copy in aliases. */
+      naliases = 0;
+      if (!end_at_hostname)
+	{
+	  p = canonical + strlen(canonical) + 1;
+	  while (isspace((unsigned char)*p))
+	    p++;
+	  while (*p)
+	    {
+	      q = p;
+	      while (*q && !isspace((unsigned char)*q))
+		q++;
+	      hostent->h_aliases[naliases] = malloc(q - p + 1);
+	      if (hostent->h_aliases[naliases] == NULL)
+		break;
+	      memcpy(hostent->h_aliases[naliases], p, q - p);
+	      hostent->h_aliases[naliases][q - p] = 0;
+	      p = q;
+	      while (isspace((unsigned char)*p))
+		p++;
+	      naliases++;
+	    }
+	  if (*p)
+	    break;
+	}
+      hostent->h_aliases[naliases] = NULL;
+
+      hostent->h_addrtype = AF_INET;
+      hostent->h_length = sizeof(struct in_addr);
+      memcpy(hostent->h_addr_list[0], &addr, sizeof(struct in_addr));
+      hostent->h_addr_list[1] = NULL;
+      *host = hostent;
+      free(line);
+      return ARES_SUCCESS;
+    }
+  free(line);
+
+  if (status == ARES_SUCCESS)
+    {
+      /* Memory allocation failure; clean up. */
+      if (hostent)
+	{
+	  free((char *) hostent->h_name);
+	  if (hostent->h_aliases)
+	    {
+	      for (alias = hostent->h_aliases; *alias; alias++)
+		free(*alias);
+	    }
+	  free(hostent->h_aliases);
+	  if (hostent->h_addr_list)
+	    free(hostent->h_addr_list[0]);
+	  free(hostent->h_addr_list);
+	}
+      free(hostent);
+      return ARES_ENOMEM;
+    }
+
+  return status;
+}

ares/ares__read_line.c

@@ -0,0 +1,64 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_private.h"
+
+/* This is an internal function.  Its contract is to read a line from
+ * a file into a dynamically allocated buffer, zeroing the trailing
+ * newline if there is one.  The calling routine may call
+ * ares__read_line multiple times with the same buf and bufsize
+ * pointers; *buf will be reallocated and *bufsize adjusted as
+ * appropriate.  The initial value of *buf should be NULL.  After the
+ * calling routine is done reading lines, it should free *buf.
+ */
+int ares__read_line(FILE *fp, char **buf, int *bufsize)
+{
+  char *newbuf;
+  int offset = 0, len;
+
+  if (*buf == NULL)
+    {
+      *buf = malloc(128);
+      if (!*buf)
+	return ARES_ENOMEM;
+      *bufsize = 128;
+    }
+
+  while (1)
+    {
+      if (!fgets(*buf + offset, *bufsize - offset, fp))
+	return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
+      len = offset + strlen(*buf + offset);
+      if ((*buf)[len - 1] == '\n')
+	{
+	  (*buf)[len - 1] = 0;
+	  return ARES_SUCCESS;
+	}
+      offset = len;
+
+      /* Allocate more space. */
+      newbuf = realloc(*buf, *bufsize * 2);
+      if (!newbuf)
+	return ARES_ENOMEM;
+      *buf = newbuf;
+      *bufsize *= 2;
+    }
+}

ares/ares_destroy.3

@@ -0,0 +1,43 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_DESTROY 3 "23 July 1998"
+.SH NAME
+ares_destroy \- Destroy a resolver channel
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_destroy(ares_channel \fIchannel\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_destroy
+function destroys the name service channel identified by
+.IR channel ,
+freeing all memory and closing all sockets used by the channel.
+.B ares_destroy
+invokes the callbacks for each pending query on the channel, passing a
+status of
+.BR ARES_EDESTRUCTION .
+These calls give the callbacks a chance to clean up any state which
+might have been stored in their arguments.
+.SH SEE ALSO
+.BR ares_init (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_destroy.c

@@ -0,0 +1,45 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdlib.h>
+#include "ares.h"
+#include "ares_private.h"
+
+void ares_destroy(ares_channel channel)
+{
+  int i;
+  struct query *query;
+
+  for (i = 0; i < channel->nservers; i++)
+    ares__close_sockets(&channel->servers[i]);
+  free(channel->servers);
+  for (i = 0; i < channel->ndomains; i++)
+    free(channel->domains[i]);
+  free(channel->domains);
+  free(channel->sortlist);
+  free(channel->lookups);
+  while (channel->queries)
+    {
+      query = channel->queries;
+      channel->queries = query->next;
+      query->callback(query->arg, ARES_EDESTRUCTION, NULL, 0);
+      free(query->tcpbuf);
+      free(query->skip_server);
+      free(query);
+    }
+  free(channel);
+}

ares/ares_dns.h

@@ -0,0 +1,81 @@
+/* $Id$ */
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef ARES__DNS_H
+#define ARES__DNS_H
+
+#define DNS__16BIT(p)			(((p)[0] << 8) | (p)[1])
+#define DNS__32BIT(p)			(((p)[0] << 24) | ((p)[1] << 16) | \
+					 ((p)[2] << 8) | (p)[3])
+#define DNS__SET16BIT(p, v)		(((p)[0] = ((v) >> 8) & 0xff), \
+					 ((p)[1] = (v) & 0xff))
+#define DNS__SET32BIT(p, v)		(((p)[0] = ((v) >> 24) & 0xff), \
+					 ((p)[1] = ((v) >> 16) & 0xff), \
+					 ((p)[2] = ((v) >> 8) & 0xff), \
+					 ((p)[3] = (v) & 0xff))
+
+/* Macros for parsing a DNS header */
+#define DNS_HEADER_QID(h)		DNS__16BIT(h)
+#define DNS_HEADER_QR(h)		(((h)[2] >> 7) & 0x1)
+#define DNS_HEADER_OPCODE(h)		(((h)[2] >> 3) & 0xf)
+#define DNS_HEADER_AA(h)		(((h)[2] >> 2) & 0x1)
+#define DNS_HEADER_TC(h)		(((h)[2] >> 1) & 0x1)
+#define DNS_HEADER_RD(h)		((h)[2] & 0x1)
+#define DNS_HEADER_RA(h)		(((h)[3] >> 7) & 0x1)
+#define DNS_HEADER_Z(h)			(((h)[3] >> 4) & 0x7)
+#define DNS_HEADER_RCODE(h)		((h)[3] & 0xf)
+#define DNS_HEADER_QDCOUNT(h)		DNS__16BIT((h) + 4)
+#define DNS_HEADER_ANCOUNT(h)		DNS__16BIT((h) + 6)
+#define DNS_HEADER_NSCOUNT(h)		DNS__16BIT((h) + 8)
+#define DNS_HEADER_ARCOUNT(h)		DNS__16BIT((h) + 10)
+
+/* Macros for constructing a DNS header */
+#define DNS_HEADER_SET_QID(h, v)	DNS__SET16BIT(h, v)
+#define DNS_HEADER_SET_QR(h, v)		((h)[2] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_OPCODE(h, v)	((h)[2] |= (((v) & 0xf) << 3))
+#define DNS_HEADER_SET_AA(h, v)		((h)[2] |= (((v) & 0x1) << 2))
+#define DNS_HEADER_SET_TC(h, v)		((h)[2] |= (((v) & 0x1) << 1))
+#define DNS_HEADER_SET_RD(h, v)		((h)[2] |= (((v) & 0x1)))
+#define DNS_HEADER_SET_RA(h, v)		((h)[3] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_Z(h, v)		((h)[3] |= (((v) & 0x7) << 4))
+#define DNS_HEADER_SET_RCODE(h, v)	((h)[3] |= (((v) & 0xf)))
+#define DNS_HEADER_SET_QDCOUNT(h, v)	DNS__SET16BIT((h) + 4, v)
+#define DNS_HEADER_SET_ANCOUNT(h, v)	DNS__SET16BIT((h) + 6, v)
+#define DNS_HEADER_SET_NSCOUNT(h, v)	DNS__SET16BIT((h) + 8, v)
+#define DNS_HEADER_SET_ARCOUNT(h, v)	DNS__SET16BIT((h) + 10, v)
+
+/* Macros for parsing the fixed part of a DNS question */
+#define DNS_QUESTION_TYPE(q)		DNS__16BIT(q)
+#define DNS_QUESTION_CLASS(q)		DNS__16BIT((q) + 2)
+
+/* Macros for constructing the fixed part of a DNS question */
+#define DNS_QUESTION_SET_TYPE(q, v)	DNS__SET16BIT(q, v)
+#define DNS_QUESTION_SET_CLASS(q, v)	DNS__SET16BIT((q) + 2, v)
+
+/* Macros for parsing the fixed part of a DNS resource record */
+#define DNS_RR_TYPE(r)			DNS__16BIT(r)
+#define DNS_RR_CLASS(r)			DNS__16BIT((r) + 2)
+#define DNS_RR_TTL(r)			DNS__32BIT((r) + 4)
+#define DNS_RR_LEN(r)			DNS__16BIT((r) + 8)
+
+/* Macros for constructing the fixed part of a DNS resource record */
+#define DNS_RR_SET_TYPE(r)		DNS__SET16BIT(r, v)
+#define DNS_RR_SET_CLASS(r)		DNS__SET16BIT((r) + 2, v)
+#define DNS_RR_SET_TTL(r)		DNS__SET32BIT((r) + 4, v)
+#define DNS_RR_SET_LEN(r)		DNS__SET16BIT((r) + 8, v)
+
+#endif /* ARES__DNS_H */

ares/ares_expand_name.3

@@ -0,0 +1,65 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_EXPAND_NAME 3 "23 July 1998"
+.SH NAME
+ares_expand_name \- Expand a DNS-encoded domain name
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_expand_name(const unsigned char *\fIencoded\fP,
+.B
+	const unsigned char *\fIabuf\fP, int \fIalen\fP, char **\fIs\fP,
+.B 	int *\fIenclen\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_expand_name
+function converts a DNS-encoded domain name to a dot-separated C
+string.  The argument
+.I encoded
+gives the beginning of the encoded domain name, and the arguments
+.I abuf
+and
+.I alen
+give the containing message buffer (necessary for the processing of
+indirection pointers within the encoded domain name).  The result is
+placed in a NUL-terminated allocated buffer, a pointer to which is
+stored in the variable pointed to by
+.IR s .
+The length of the encoded name is stored in the variable pointed to by
+.I enclen
+so that the caller can advance past the encoded domain name to read
+further data in the message.
+.SH RETURN VALUES
+.B ares_expand_name
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+Expansion of the encoded name succeeded.
+.TP 15
+.B ARES_EBADNAME
+The encoded domain name was malformed and could not be expanded.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_mkquery (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_expand_name.c

@@ -0,0 +1,159 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include "ares.h"
+
+static int name_length(const unsigned char *encoded, const unsigned char *abuf,
+		       int alen);
+
+/* Expand an RFC1035-encoded domain name given by encoded.  The
+ * containing message is given by abuf and alen.  The result given by
+ * *s, which is set to a NUL-terminated allocated buffer.  *enclen is
+ * set to the length of the encoded name (not the length of the
+ * expanded name; the goal is to tell the caller how many bytes to
+ * move forward to get past the encoded name).
+ *
+ * In the simple case, an encoded name is a series of labels, each
+ * composed of a one-byte length (limited to values between 0 and 63
+ * inclusive) followed by the label contents.  The name is terminated
+ * by a zero-length label.
+ *
+ * In the more complicated case, a label may be terminated by an
+ * indirection pointer, specified by two bytes with the high bits of
+ * the first byte (corresponding to INDIR_MASK) set to 11.  With the
+ * two high bits of the first byte stripped off, the indirection
+ * pointer gives an offset from the beginning of the containing
+ * message with more labels to decode.  Indirection can happen an
+ * arbitrary number of times, so we have to detect loops.
+ *
+ * Since the expanded name uses '.' as a label separator, we use
+ * backslashes to escape periods or backslashes in the expanded name.
+ */
+
+int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
+		     int alen, char **s, int *enclen)
+{
+  int len, indir = 0;
+  char *q;
+  const unsigned char *p;
+
+  len = name_length(encoded, abuf, alen);
+  if (len == -1)
+    return ARES_EBADNAME;
+
+  *s = malloc(len + 1);
+  if (!*s)
+    return ARES_ENOMEM;
+  q = *s;
+
+  /* No error-checking necessary; it was all done by name_length(). */
+  p = encoded;
+  while (*p)
+    {
+      if ((*p & INDIR_MASK) == INDIR_MASK)
+	{
+	  if (!indir)
+	    {
+	      *enclen = p + 2 - encoded;
+	      indir = 1;
+	    }
+	  p = abuf + ((*p & ~INDIR_MASK) << 8 | *(p + 1));
+	}
+      else
+	{
+	  len = *p;
+	  p++;
+	  while (len--)
+	    {
+	      if (*p == '.' || *p == '\\')
+		*q++ = '\\';
+	      *q++ = *p;
+	      p++;
+	    }
+	  *q++ = '.';
+	}
+    }
+  if (!indir)
+    *enclen = p + 1 - encoded;
+
+  /* Nuke the trailing period if we wrote one. */
+  if (q > *s)
+    *(q - 1) = 0;
+
+  return ARES_SUCCESS;
+}
+
+/* Return the length of the expansion of an encoded domain name, or
+ * -1 if the encoding is invalid.
+ */
+static int name_length(const unsigned char *encoded, const unsigned char *abuf,
+		       int alen)
+{
+  int n = 0, offset, indir = 0;
+
+  /* Allow the caller to pass us abuf + alen and have us check for it. */
+  if (encoded == abuf + alen)
+    return -1;
+
+  while (*encoded)
+    {
+      if ((*encoded & INDIR_MASK) == INDIR_MASK)
+	{
+	  /* Check the offset and go there. */
+	  if (encoded + 1 >= abuf + alen)
+	    return -1;
+	  offset = (*encoded & ~INDIR_MASK) << 8 | *(encoded + 1);
+	  if (offset >= alen)
+	    return -1;
+	  encoded = abuf + offset;
+
+	  /* If we've seen more indirects than the message length,
+	   * then there's a loop.
+	   */
+	  if (++indir > alen)
+	    return -1;
+	}
+      else
+	{
+	  offset = *encoded;
+	  if (encoded + offset + 1 >= abuf + alen)
+	    return -1;
+	  encoded++;
+	  while (offset--)
+	    {
+	      n += (*encoded == '.' || *encoded == '\\') ? 2 : 1;
+	      encoded++;
+	    }
+	  n++;
+	}
+    }
+
+  /* If there were any labels at all, then the number of dots is one
+   * less than the number of labels, so subtract one.
+   */
+  return (n) ? n - 1 : n;
+}

ares/ares_fds.3

@@ -0,0 +1,62 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_FDS 3 "23 July 1998"
+.SH NAME
+ares_fds \- Get file descriptors to select on for name service
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_fds(ares_channel \fIchannel\fP, fd_set *\fIread_fds\fP,
+.B	fd_set *\fIwrite_fds\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_fds
+function retrieves the set of file descriptors which the calling
+application should select on for reading and writing for the
+processing of name service queries pending on the name service channel
+identified by
+.IR channel .
+File descriptors will be set in the file descriptor sets pointed to by
+.I read_fds
+and
+.I write_fds
+as appropriate.  File descriptors already set in
+.I read_fds
+and
+.I write_fds
+will remain set; initialization of the file descriptor sets
+(using
+.BR FD_ZERO )
+is the responsibility of the caller.
+.SH RETURN VALUES
+.B ares_fds
+returns one greater than the number of the highest socket set in either
+.I read_fds
+or
+.IR write_fds .
+If no queries are active,
+.B ares_fds
+will return 0.
+.SH SEE ALSO
+.BR ares_timeout (3),
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_fds.c

@@ -0,0 +1,58 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+
+#else
+#include <sys/time.h>
+#endif
+
+#include "ares.h"
+#include "ares_private.h"
+
+int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
+{
+  struct server_state *server;
+  int i, nfds;
+
+  /* No queries, no file descriptors. */
+  if (!channel->queries)
+    return 0;
+
+  nfds = 0;
+  for (i = 0; i < channel->nservers; i++)
+    {
+      server = &channel->servers[i];
+      if (server->udp_socket != -1)
+	{
+	  FD_SET(server->udp_socket, read_fds);
+	  if (server->udp_socket >= nfds)
+	    nfds = server->udp_socket + 1;
+	}
+      if (server->tcp_socket != -1)
+	{
+	  FD_SET(server->tcp_socket, read_fds);
+	  if (server->qhead)
+	    FD_SET(server->tcp_socket, write_fds);
+	  if (server->tcp_socket >= nfds)
+	    nfds = server->tcp_socket + 1;
+	}
+    }
+  return nfds;
+}

ares/ares_free_errmem.3

@@ -0,0 +1,42 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_FREE_ERRMEM 3 "23 July 1998"
+.SH NAME
+ares_free_errmem \- Free memory allocated by ares_strerror
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B void ares_free_errmem(char *\fIerrmem\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_free_errmem
+function frees any memory which might have been allocated by the
+.BR ares_strerror (3)
+function.  The parameter
+.I errmem
+should be set to the variable pointed to by the
+.I memptr
+argument previously passed to
+.IR ares_strerror .
+.SH SEE ALSO
+.BR ares_strerror (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_free_errmem.c

@@ -0,0 +1,26 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include "ares.h"
+
+/* Do nothing, for now.  A future implementation may want to deal with
+ * internationalization, in which case ares_strerror() might allocate
+ * memory which we would then have to free.
+ */
+void ares_free_errmem(char *mem)
+{
+}

ares/ares_free_hostent.3

@@ -0,0 +1,49 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_FREE_HOSTENT 3 "23 July 1998"
+.SH NAME
+ares_free_hostent \- Free host structure allocated by ares functions
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B void ares_free_hostent(struct hostent *\fIhost\fP)
+.fi
+.SH DESCRIPTION
+The
+.I ares_free_hostent
+function frees a
+.B struct hostent
+allocated by one of the functions
+.I ares_parse_a_reply
+or
+.IR ares_parse_ptr_reply .
+.SH SEE ALSO
+.BR ares_parse_a_reply (3),
+.BR ares_parse_ptr_reply (3)
+.SH NOTES
+It is not necessary (and is not correct) to free the host structure
+passed to the callback functions for
+.I ares_gethostbyname
+or
+.IR ares_gethostbyaddr .
+The ares library will automatically free such host structures when the
+callback returns.
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_free_hostent.c

@@ -0,0 +1,39 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdlib.h>
+
+#ifdef WIN32
+
+#else
+#include <netdb.h>
+#endif
+
+#include "ares.h"
+
+void ares_free_hostent(struct hostent *host)
+{
+  char **p;
+
+  free(host->h_name);
+  for (p = host->h_aliases; *p; p++)
+    free(*p);
+  free(host->h_aliases);
+  free(host->h_addr_list[0]);
+  free(host->h_addr_list);
+  free(host);
+}

ares/ares_free_string.3

@@ -0,0 +1,37 @@
+.\" $Id$
+.\"
+.\" Copyright 2000 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_FREE_STRING 3 "4 January 2000"
+.SH NAME
+ares_free_string \- Free strings allocated by ares functions
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B void ares_free_string(char *\fIstr\fP)
+.fi
+.SH DESCRIPTION
+The
+.I ares_free_string
+function frees a string allocated by the
+.I ares_mkquery
+function.
+.SH SEE ALSO
+.BR ares_mkquery (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 2000 by the Massachusetts Institute of Technology.

ares/ares_free_string.c

@@ -0,0 +1,24 @@
+/* Copyright 2000 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdlib.h>
+#include "ares.h"
+
+void ares_free_string(char *str)
+{
+  free(str);
+}

ares/ares_gethostbyaddr.3

@@ -0,0 +1,100 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_GETHOSTBYADDR 3 "24 July 1998"
+.SH NAME
+ares_gethostbyaddr \- Initiate a host query by address
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_host_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	struct hostent *\fIhostent\fP)
+.PP
+.B void ares_gethostbyaddr(ares_channel \fIchannel\fP, const void *\fIaddr\fP,
+.B 	int \fIaddrlen\fP, int \fIfamily\fP, ares_host_callback \fIcallback\fP,
+.B 	void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_gethostbyaddr
+function initiates a host query by address on the name service channel
+identified by
+.IR channel .
+The parameters
+.I addr
+and
+.I addrlen
+give the address as a series of bytes, and
+.I family
+gives the type of address.  When the query is complete or has failed,
+the ares library will invoke
+.IR callback .
+Completion or failure of the query may happen immediately, or may
+happen during a later call to
+.BR ares_process (3)
+or
+.BR ares_destroy (3).
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_gethostbyaddr
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query succeeded and, if not, how it failed.  It
+may have any of the following values:
+.TP 19
+.B ARES_SUCCESS
+The host lookup completed successfully.
+.TP 19
+.B ARES_ENOTIMP
+The ares library does not know how to look up addresses of type
+.IR family .
+.TP 19
+.B ARES_ENOTFOUND
+The address
+.I addr
+was not found.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.PP
+On successful completion of the query, the callback argument
+.I hostent
+points to a
+.B struct hostent
+containing the name of the host returned by the query.  The callback
+need not and should not attempt to free the memory pointed to by
+.IR hostent ;
+the ares library will free it when the callback returns.  If the query
+did not complete successfully,
+.I hostent
+will be
+.BR NULL .
+.SH SEE ALSO
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_gethostbyaddr.c

@@ -0,0 +1,174 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_private.h"
+
+struct addr_query {
+  /* Arguments passed to ares_gethostbyaddr() */
+  ares_channel channel;
+  struct in_addr addr;
+  ares_host_callback callback;
+  void *arg;
+
+  const char *remaining_lookups;
+};
+
+static void next_lookup(struct addr_query *aquery);
+static void addr_callback(void *arg, int status, unsigned char *abuf,
+			  int alen);
+static void end_aquery(struct addr_query *aquery, int status,
+		       struct hostent *host);
+static int file_lookup(struct in_addr *addr, struct hostent **host);
+
+void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
+			int family, ares_host_callback callback, void *arg)
+{
+  struct addr_query *aquery;
+
+  if (family != AF_INET || addrlen != sizeof(struct in_addr))
+    {
+      callback(arg, ARES_ENOTIMP, NULL);
+      return;
+    }
+
+  aquery = malloc(sizeof(struct addr_query));
+  if (!aquery)
+    {
+      callback(arg, ARES_ENOMEM, NULL);
+      return;
+    }
+  aquery->channel = channel;
+  memcpy(&aquery->addr, addr, sizeof(aquery->addr));
+  aquery->callback = callback;
+  aquery->arg = arg;
+  aquery->remaining_lookups = channel->lookups;
+
+  next_lookup(aquery);
+}
+
+static void next_lookup(struct addr_query *aquery)
+{
+  const char *p;
+  char name[64];
+  int a1, a2, a3, a4, status;
+  struct hostent *host;
+  unsigned long addr;
+
+  for (p = aquery->remaining_lookups; *p; p++)
+    {
+      switch (*p)
+	{
+	case 'b':
+	  addr = ntohl(aquery->addr.s_addr);
+	  a1 = addr >> 24;
+	  a2 = (addr >> 16) & 0xff;
+	  a3 = (addr >> 8) & 0xff;
+	  a4 = addr & 0xff;
+	  sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
+	  aquery->remaining_lookups = p + 1;
+	  ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
+		     aquery);
+	  return;
+	case 'f':
+	  status = file_lookup(&aquery->addr, &host);
+	  if (status != ARES_ENOTFOUND)
+	    {
+	      end_aquery(aquery, status, host);
+	      return;
+	    }
+	  break;
+	}
+    }
+  end_aquery(aquery, ARES_ENOTFOUND, NULL);
+}
+
+static void addr_callback(void *arg, int status, unsigned char *abuf, int alen)
+{
+  struct addr_query *aquery = (struct addr_query *) arg;
+  struct hostent *host;
+
+  if (status == ARES_SUCCESS)
+    {
+      status = ares_parse_ptr_reply(abuf, alen, &aquery->addr,
+				    sizeof(struct in_addr), AF_INET, &host);
+      end_aquery(aquery, status, host);
+    }
+  else if (status == ARES_EDESTRUCTION)
+    end_aquery(aquery, status, NULL);
+  else
+    next_lookup(aquery);
+}
+
+static void end_aquery(struct addr_query *aquery, int status,
+		       struct hostent *host)
+{
+  aquery->callback(aquery->arg, status, host);
+  if (host)
+    ares_free_hostent(host);
+  free(aquery);
+}
+
+static int file_lookup(struct in_addr *addr, struct hostent **host)
+{
+  FILE *fp;
+  int status;
+
+#ifdef WIN32
+
+  char PATH_HOSTS[MAX_PATH];
+  if (IsNT) {
+    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
+    strcat(PATH_HOSTS, PATH_HOSTS_NT);
+  } else {
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+    strcat(PATH_HOSTS, PATH_HOSTS_9X);
+  }
+
+#endif
+
+  fp = fopen(PATH_HOSTS, "r");
+  if (!fp)
+    return ARES_ENOTFOUND;
+
+  while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
+    {
+      if (memcmp((*host)->h_addr, addr, sizeof(struct in_addr)) == 0)
+	break;
+      ares_free_hostent(*host);
+    }
+  fclose(fp);
+  if (status == ARES_EOF)
+    status = ARES_ENOTFOUND;
+  if (status != ARES_SUCCESS)
+    *host = NULL;
+  return status;
+}

ares/ares_gethostbyname.3

@@ -0,0 +1,103 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_GETHOSTBYNAME 3 "25 July 1998"
+.SH NAME
+ares_gethostbyname \- Initiate a host query by name
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_host_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	struct hostent *\fIhostent\fP)
+.PP
+.B void ares_gethostbyname(ares_channel \fIchannel\fP, const char *\fIname\fP,
+.B 	int \fIfamily\fP, ares_host_callback \fIcallback\fP, void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_gethostbyname
+function initiates a host query by name on the name service channel
+identified by
+.IR channel .
+The parameter
+.I name
+gives the hostname as a NUL-terminated C string, and
+.I family
+gives the desired type of address for the resulting host entry.  When
+the query is complete or has failed, the ares library will invoke
+.IR callback .
+Completion or failure of the query may happen immediately, or may
+happen during a later call to
+.BR ares_process (3)
+or
+.BR ares_destroy (3).
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_gethostbyname
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query succeeded and, if not, how it failed.  It
+may have any of the following values:
+.TP 19
+.B ARES_SUCCESS
+The host lookup completed successfully.
+.TP 19
+.B ARES_ENOTIMP
+The ares library does not know how to find addresses of type
+.IR family .
+.TP 19
+.B ARES_EBADNAME
+The hostname
+.B name
+is composed entirely of numbers and periods, but is not a valid
+representation of an Internet address.
+.TP 19
+.B ARES_ENOTFOUND
+The address
+.I addr
+was not found.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.PP
+On successful completion of the query, the callback argument
+.I hostent
+points to a
+.B struct hostent
+containing the name of the host returned by the query.  The callback
+need not and should not attempt to free the memory pointed to by
+.IR hostent ;
+the ares library will free it when the callback returns.  If the query
+did not complete successfully,
+.I hostent
+will be
+.BR NULL .
+.SH SEE ALSO
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_gethostbyname.c

@@ -0,0 +1,297 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "ares.h"
+#include "ares_private.h"
+
+struct host_query {
+  /* Arguments passed to ares_gethostbyname() */
+  ares_channel channel;
+  char *name;
+  ares_host_callback callback;
+  void *arg;
+
+  const char *remaining_lookups;
+};
+
+static void next_lookup(struct host_query *hquery);
+static void host_callback(void *arg, int status, unsigned char *abuf,
+			  int alen);
+static void end_hquery(struct host_query *hquery, int status,
+		       struct hostent *host);
+static int fake_hostent(const char *name, ares_host_callback callback,
+			void *arg);
+static int file_lookup(const char *name, struct hostent **host);
+static void sort_addresses(struct hostent *host, struct apattern *sortlist,
+			   int nsort);
+static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
+			     int nsort);
+
+void ares_gethostbyname(ares_channel channel, const char *name, int family,
+			ares_host_callback callback, void *arg)
+{
+  struct host_query *hquery;
+
+  /* Right now we only know how to look up Internet addresses. */
+  if (family != AF_INET)
+    {
+      callback(arg, ARES_ENOTIMP, NULL);
+      return;
+    }
+
+  if (fake_hostent(name, callback, arg))
+    return;
+
+  /* Allocate and fill in the host query structure. */
+  hquery = malloc(sizeof(struct host_query));
+  if (!hquery)
+    {
+      callback(arg, ARES_ENOMEM, NULL);
+      return;
+    }
+  hquery->channel = channel;
+  hquery->name = strdup(name);
+  if (!hquery->name)
+    {
+      free(hquery);
+      callback(arg, ARES_ENOMEM, NULL);
+      return;
+    }
+  hquery->callback = callback;
+  hquery->arg = arg;
+  hquery->remaining_lookups = channel->lookups;
+
+  /* Start performing lookups according to channel->lookups. */
+  next_lookup(hquery);
+}
+
+static void next_lookup(struct host_query *hquery)
+{
+  int status;
+  const char *p;
+  struct hostent *host;
+
+  for (p = hquery->remaining_lookups; *p; p++)
+    { 
+      switch (*p)
+	{
+	case 'b':
+	  /* DNS lookup */
+	  hquery->remaining_lookups = p + 1;
+	  ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
+		      hquery);
+	  return;
+
+	case 'f':
+	  /* Host file lookup */
+	  status = file_lookup(hquery->name, &host);
+	  if (status != ARES_ENOTFOUND)
+	    {
+	      end_hquery(hquery, status, host);
+	      return;
+	    }
+	  break;
+	}
+    }
+  end_hquery(hquery, ARES_ENOTFOUND, NULL);
+}
+
+static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
+{
+  struct host_query *hquery = (struct host_query *) arg;
+  ares_channel channel = hquery->channel;
+  struct hostent *host;
+
+  if (status == ARES_SUCCESS)
+    {
+      status = ares_parse_a_reply(abuf, alen, &host);
+      if (host && channel->nsort)
+	sort_addresses(host, channel->sortlist, channel->nsort);
+      end_hquery(hquery, status, host);
+    }
+  else if (status == ARES_EDESTRUCTION)
+    end_hquery(hquery, status, NULL);
+  else
+    next_lookup(hquery);
+}
+
+static void end_hquery(struct host_query *hquery, int status,
+		       struct hostent *host)
+{
+  hquery->callback(hquery->arg, status, host);
+  if (host)
+    ares_free_hostent(host);
+  free(hquery->name);
+  free(hquery);
+}
+
+/* If the name looks like an IP address, fake up a host entry, end the
+ * query immediately, and return true.  Otherwise return false.
+ */
+static int fake_hostent(const char *name, ares_host_callback callback,
+			void *arg)
+{
+  struct in_addr addr;
+  struct hostent hostent;
+  const char *p;
+  char *aliases[1] = { NULL };
+  char *addrs[2];
+
+  /* It only looks like an IP address if it's all numbers and dots. */
+  for (p = name; *p; p++)
+    {
+      if (!isdigit((unsigned char)*p) && *p != '.')
+	return 0;
+    }
+
+  /* It also only looks like an IP address if it's non-zero-length and
+   * doesn't end with a dot.
+   */
+  if (p == name || *(p - 1) == '.')
+    return 0;
+
+  /* It looks like an IP address.  Figure out what IP address it is. */
+  addr.s_addr = inet_addr(name);
+  if (addr.s_addr == INADDR_NONE)
+    {
+      callback(arg, ARES_EBADNAME, NULL);
+      return 1;
+    }
+
+  /* Duplicate the name, to avoid a constness violation. */
+  hostent.h_name = strdup(name);
+  if (!hostent.h_name)
+    {
+      callback(arg, ARES_ENOMEM, NULL);
+      return 1;
+    }
+
+  /* Fill in the rest of the host structure and terminate the query. */
+  addrs[0] = (char *) &addr;
+  addrs[1] = NULL;
+  hostent.h_aliases = aliases;
+  hostent.h_addrtype = AF_INET;
+  hostent.h_length = sizeof(struct in_addr);
+  hostent.h_addr_list = addrs;
+  callback(arg, ARES_SUCCESS, &hostent);
+
+  free(hostent.h_name);
+  return 1;
+}
+
+static int file_lookup(const char *name, struct hostent **host)
+{
+  FILE *fp;
+  char **alias;
+  int status;
+
+#ifdef WIN32
+
+  char PATH_HOSTS[MAX_PATH];
+  if (IsNT) {
+    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
+    strcat(PATH_HOSTS, PATH_HOSTS_NT);
+  } else {
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+    strcat(PATH_HOSTS, PATH_HOSTS_9X);
+  }
+
+#endif
+
+  fp = fopen(PATH_HOSTS, "r");
+  if (!fp)
+    return ARES_ENOTFOUND;
+
+  while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
+    {
+      if (strcasecmp((*host)->h_name, name) == 0)
+	break;
+      for (alias = (*host)->h_aliases; *alias; alias++)
+	{
+	  if (strcasecmp(*alias, name) == 0)
+	    break;
+	}
+      if (*alias)
+	break;
+      ares_free_hostent(*host);
+    }
+  fclose(fp);
+  if (status == ARES_EOF)
+    status = ARES_ENOTFOUND;
+  if (status != ARES_SUCCESS)
+    *host = NULL;
+  return status;
+}
+
+static void sort_addresses(struct hostent *host, struct apattern *sortlist,
+			   int nsort)
+{
+  struct in_addr a1, a2;
+  int i1, i2, ind1, ind2;
+
+  /* This is a simple insertion sort, not optimized at all.  i1 walks
+   * through the address list, with the loop invariant that everything
+   * to the left of i1 is sorted.  In the loop body, the value at i1 is moved
+   * back through the list (via i2) until it is in sorted order.
+   */
+  for (i1 = 0; host->h_addr_list[i1]; i1++)
+    {
+      memcpy(&a1, host->h_addr_list[i1], sizeof(struct in_addr));
+      ind1 = get_address_index(&a1, sortlist, nsort);
+      for (i2 = i1 - 1; i2 >= 0; i2--)
+	{
+	  memcpy(&a2, host->h_addr_list[i2], sizeof(struct in_addr));
+	  ind2 = get_address_index(&a2, sortlist, nsort);
+	  if (ind2 <= ind1)
+	    break;
+	  memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in_addr));
+	}
+      memcpy(host->h_addr_list[i2 + 1], &a1, sizeof(struct in_addr));
+    }
+}
+
+/* Find the first entry in sortlist which matches addr.  Return nsort
+ * if none of them match.
+ */
+static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
+			     int nsort)
+{
+  int i;
+
+  for (i = 0; i < nsort; i++)
+    {
+      if ((addr->s_addr & sortlist[i].mask.s_addr) == sortlist[i].addr.s_addr)
+	break;
+    }
+  return i;
+}

ares/ares_init.3

@@ -0,0 +1,170 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_INIT 3 "21 July 1998"
+.SH NAME
+ares_init, ares_init_options \- Initialize a resolver channel
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_init(ares_channel *\fIchannel\fP)
+.B int ares_init_options(ares_channel *\fIchannel\fP,
+.B 	struct ares_options *\fIoptions\fP, int \fIoptmask\fP)
+.PP
+.B cc file.c -lares
+.fi
+.SH DESCRIPTION
+The
+.B ares_init
+function initializes a communications channel for name service
+lookups.  If it returns successfully,
+.B ares_init
+will set the variable pointed to by
+.I channel
+to a handle used to identify the name service channel.  The caller
+should invoke
+.BR ares_destroy (3)
+on the handle when the channel is no longer needed.
+.PP
+The
+.B ares_init_options
+function also initializes a name service channel, with additional
+options useful for applications requiring more control over name
+service configuration.  The
+.I optmask
+parameter specifies which fields in the structure pointed to by
+.I options
+are set, as follows:
+.PP
+.TP 18
+.B ARES_OPT_FLAGS
+.B int \fIflags\fP;
+.br
+Flags controlling the behavior of the resolver.  See below for a
+description of possible flag values.
+.TP 18
+.B ARES_OPT_TIMEOUT
+.B int \fItimeout\fP;
+.br
+The number of seconds each name server is given to respond to a query
+on the first try.  (After the first try, the timeout algorithm becomes
+more complicated, but scales linearly with the value of
+\fItimeout\fP.)  The default is five seconds.
+.TP 18
+.B ARES_OPT_TRIES
+.B int \fItries\fP;
+.br
+The number of tries the resolver will try contacting each name server
+before giving up.  The default is four tries.
+.TP 18
+.B ARES_OPT_NDOTS
+.B int \fIndots\fP;
+.br
+The number of dots which must be present in a domain name for it to be
+queried for "as is" prior to querying for it with the default domain
+extensions appended.  The default value is 1 unless set otherwise by
+resolv.conf or the RES_OPTIONS environment variable.
+.TP 18
+.B ARES_OPT_PORT
+.B unsigned short \fIport\fP;
+.br
+The port to use for queries (both TCP and UDP), in network byte order.
+The default value is 53 (in network byte order), the standard name
+service port.
+.TP 18
+.B ARES_OPT_SERVERS
+.B struct in_addr *\fIservers\fP;
+.br
+.B int \fInservers\fP;
+.br
+The list of servers to contact, instead of the servers specified in
+resolv.conf or the local named.
+.TP 18
+.B ARES_OPT_DOMAINS
+.B char **\fIdomains\fP;
+.br
+.B int \fIndomains\fP;
+.br
+The domains to search, instead of the domains specified in resolv.conf
+or the domain derived from the kernel hostname variable.
+.TP 18
+.B ARES_OPT_LOOKUPS
+.B char *\fIlookups\fP;
+.br
+The lookups to perform for host queries.  
+.I lookups
+should be set to a string of the characters "b" or "f", where "b"
+indicates a DNS lookup and "f" indicates a lookup in the hosts file.
+.PP
+The
+.I flags
+field should be the bitwise or of some subset of the following values:
+.TP 23
+.B ARES_FLAG_USEVC
+Always use TCP queries (the "virtual circuit") instead of UDP
+queries.  Normally, TCP is only used if a UDP query yields a truncated
+result.
+.TP 23
+.B ARES_FLAG_PRIMARY
+Only query the first server in the list of servers to query.
+.TP 23
+.B ARES_FLAG_IGNTC
+If a truncated response to a UDP query is received, do not fall back
+to TCP; simply continue on with the truncated response.
+.TP 23
+.B ARES_FLAG_NORECURSE
+Do not set the "recursion desired" bit on outgoing queries, so that
+the name server being contacted will not try to fetch the answer from
+other servers if it doesn't know the answer locally.
+.TP 23
+.B ARES_FLAG_STAYOPEN
+Do not close communciations sockets when the number of active queries
+drops to zero.
+.TP 23
+.B ARES_FLAG_NOSEARCH
+Do not use the default search domains; only query hostnames as-is or
+as aliases.
+.TP 23
+.B ARES_FLAG_NOALIASES
+Do not honor the HOSTALIASES environment variable, which normally
+specifies a file of hostname translations.
+.TP 23
+.B ARES_FLAG_NOCHECKRESP
+Do not discard responses with the SERVFAIL, NOTIMP, or REFUSED
+response code or responses whose questions don't match the questions
+in the request.  Primarily useful for writing clients which might be
+used to test or debug name servers.
+.SH RETURN VALUES
+.I ares_init
+or
+.I ares_init_options
+can return any of the following values:
+.TP 14
+.B ARES_SUCCESS
+Initialization succeeded.
+.TP 14
+.B ARES_EFILE
+A configuration file could not be read.
+.TP 14
+.B ARES_ENOMEM
+The process's available memory was exhausted.
+.SH SEE ALSO
+.BR ares_destroy (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_init.c

@@ -0,0 +1,776 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/param.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+#include <errno.h>
+#include "ares.h"
+#include "ares_private.h"
+
+static int init_by_options(ares_channel channel, struct ares_options *options,
+			   int optmask);
+static int init_by_environment(ares_channel channel);
+static int init_by_resolv_conf(ares_channel channel);
+static int init_by_defaults(ares_channel channel);
+static int config_domain(ares_channel channel, char *str);
+static int config_lookup(ares_channel channel, const char *str);
+static int config_nameserver(struct server_state **servers, int *nservers,
+			     const char *str);
+static int config_sortlist(struct apattern **sortlist, int *nsort,
+			   const char *str);
+static int set_search(ares_channel channel, const char *str);
+static int set_options(ares_channel channel, const char *str);
+static char *try_config(char *s, char *opt);
+static const char *try_option(const char *p, const char *q, const char *opt);
+static int ip_addr(const char *s, int len, struct in_addr *addr);
+static void natural_mask(struct apattern *pat);
+
+int ares_init(ares_channel *channelptr)
+{
+  return ares_init_options(channelptr, NULL, 0);
+}
+
+int ares_init_options(ares_channel *channelptr, struct ares_options *options,
+		      int optmask)
+{
+  ares_channel channel;
+  int i, status;
+  struct server_state *server;
+  struct timeval tv;
+
+  channel = malloc(sizeof(struct ares_channeldata));
+  if (!channel)
+    return ARES_ENOMEM;
+
+  /* Set everything to distinguished values so we know they haven't
+   * been set yet.
+   */
+  channel->flags = -1;
+  channel->timeout = -1;
+  channel->tries = -1;
+  channel->ndots = -1;
+  channel->udp_port = -1;
+  channel->tcp_port = -1;
+  channel->nservers = -1;
+  channel->ndomains = -1;
+  channel->nsort = -1;
+  channel->lookups = NULL;
+  channel->queries = NULL;
+
+  /* Initialize configuration by each of the four sources, from highest
+   * precedence to lowest.
+   */
+  status = init_by_options(channel, options, optmask);
+  if (status == ARES_SUCCESS)
+    status = init_by_environment(channel);
+  if (status == ARES_SUCCESS)
+    status = init_by_resolv_conf(channel);
+  if (status == ARES_SUCCESS)
+    status = init_by_defaults(channel);
+  if (status != ARES_SUCCESS)
+    {
+      /* Something failed; clean up memory we may have allocated. */
+      if (channel->nservers != -1)
+	free(channel->servers);
+      if (channel->ndomains != -1)
+	{
+	  for (i = 0; i < channel->ndomains; i++)
+	    free(channel->domains[i]);
+	  free(channel->domains);
+	}
+      if (channel->nsort != -1)
+	free(channel->sortlist);
+      free(channel->lookups);
+      free(channel);
+      return status;
+    }
+
+  /* Trim to one server if ARES_FLAG_PRIMARY is set. */
+  if ((channel->flags & ARES_FLAG_PRIMARY) && channel->nservers > 1)
+    channel->nservers = 1;
+
+  /* Initialize server states. */
+  for (i = 0; i < channel->nservers; i++)
+    {
+      server = &channel->servers[i];
+      server->udp_socket = -1;
+      server->tcp_socket = -1;
+      server->tcp_lenbuf_pos = 0;
+      server->tcp_buffer = NULL;
+      server->qhead = NULL;
+      server->qtail = NULL;
+    }
+
+  /* Choose a somewhat random query ID.  The main point is to avoid
+   * collisions with stale queries.  An attacker trying to spoof a DNS
+   * answer also has to guess the query ID, but it's only a 16-bit
+   * field, so there's not much to be done about that.
+   */
+  gettimeofday(&tv, NULL);
+  channel->next_id = (tv.tv_sec ^ tv.tv_usec ^ getpid()) & 0xffff;
+
+  channel->queries = NULL;
+
+  *channelptr = channel;
+  return ARES_SUCCESS;
+}
+
+static int init_by_options(ares_channel channel, struct ares_options *options,
+			   int optmask)
+{
+  int i;
+
+  /* Easy stuff. */
+  if ((optmask & ARES_OPT_FLAGS) && channel->flags == -1)
+    channel->flags = options->flags;
+  if ((optmask & ARES_OPT_TIMEOUT) && channel->timeout == -1)
+    channel->timeout = options->timeout;
+  if ((optmask & ARES_OPT_TRIES) && channel->tries == -1)
+    channel->tries = options->tries;
+  if ((optmask & ARES_OPT_NDOTS) && channel->ndots == -1)
+    channel->ndots = options->ndots;
+  if ((optmask & ARES_OPT_UDP_PORT) && channel->udp_port == -1)
+    channel->udp_port = options->udp_port;
+  if ((optmask & ARES_OPT_TCP_PORT) && channel->tcp_port == -1)
+    channel->tcp_port = options->tcp_port;
+
+  /* Copy the servers, if given. */
+  if ((optmask & ARES_OPT_SERVERS) && channel->nservers == -1)
+    {
+      channel->servers =
+	malloc(options->nservers * sizeof(struct server_state));
+      if (!channel->servers && options->nservers != 0)
+	return ARES_ENOMEM;
+      for (i = 0; i < options->nservers; i++)
+	channel->servers[i].addr = options->servers[i];
+      channel->nservers = options->nservers;
+    }
+
+  /* Copy the domains, if given.  Keep channel->ndomains consistent so
+   * we can clean up in case of error.
+   */
+  if ((optmask & ARES_OPT_DOMAINS) && channel->ndomains == -1)
+    {
+      channel->domains = malloc(options->ndomains * sizeof(char *));
+      if (!channel->domains && options->ndomains != 0)
+	return ARES_ENOMEM;
+      for (i = 0; i < options->ndomains; i++)
+	{
+	  channel->ndomains = i;
+	  channel->domains[i] = strdup(options->domains[i]);
+	  if (!channel->domains[i])
+	    return ARES_ENOMEM;
+	}
+      channel->ndomains = options->ndomains;
+    }
+
+  /* Set lookups, if given. */
+  if ((optmask & ARES_OPT_LOOKUPS) && !channel->lookups)
+    {
+      channel->lookups = strdup(options->lookups);
+      if (!channel->lookups)
+	return ARES_ENOMEM;
+    }
+
+  return ARES_SUCCESS;
+}
+
+static int init_by_environment(ares_channel channel)
+{
+  const char *localdomain, *res_options;
+  int status;
+
+  localdomain = getenv("LOCALDOMAIN");
+  if (localdomain && channel->ndomains == -1)
+    {
+      status = set_search(channel, localdomain);
+      if (status != ARES_SUCCESS)
+	return status;
+    }
+
+  res_options = getenv("RES_OPTIONS");
+  if (res_options)
+    {
+      status = set_options(channel, res_options);
+      if (status != ARES_SUCCESS)
+	return status;
+    }
+
+  return ARES_SUCCESS;
+}
+#ifdef WIN32
+static int get_res_size_nt(HKEY hKey, char *subkey, int *size)
+{
+	return RegQueryValueEx(hKey, subkey, 0, NULL, NULL, size);
+}
+
+/* Warning: returns a dynamically allocated buffer, the user MUST
+ * use free() if the function returns 1
+ */
+static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
+{
+	/* Test for the size we need */
+	int size = 0;
+	int result;
+	result = RegQueryValueEx(hKey, subkey, 0, NULL, NULL, &size);
+	if ((result != ERROR_SUCCESS && result != ERROR_MORE_DATA) || !size)
+		return 0;
+	*obuf = malloc(size+1);
+
+	if (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
+	{
+		free(*obuf);
+		return 0;
+	}
+	if (size == 1)
+	{
+		free(*obuf);
+		return 0;
+	}
+	return 1;
+}
+
+static int get_res_interfaces_nt(HKEY hKey, char *subkey, char **obuf)
+{
+	char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */
+	int enum_size = 39;
+	int idx = 0;
+	HKEY hVal;
+	while (RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS)
+	{
+		enum_size = 39;
+		if (RegOpenKeyEx(hKey, enumbuf, 0, KEY_QUERY_VALUE, &hVal) != ERROR_SUCCESS)
+			continue;
+		if (!get_res_nt(hVal, subkey, obuf))
+			RegCloseKey(hVal);
+		else
+		{
+			RegCloseKey(hVal);
+			return 1;
+		}
+	}
+	return 0;
+}
+#endif
+
+static int init_by_resolv_conf(ares_channel channel)
+{
+  FILE *fp;
+  char *line = NULL, *p;
+  int linesize, status, nservers = 0, nsort = 0;
+  struct server_state *servers = NULL;
+  struct apattern *sortlist = NULL;
+
+#ifdef WIN32
+
+    /*
+  NameServer Registry:
+
+   On Windows 9X, the DNS server can be found in:
+HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\VxD\MSTCP\NameServer
+
+	On Windows NT/2000/XP/2003:
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\NameServer
+	or
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\DhcpNameServer
+	or
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
+NameServer
+	or
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
+DhcpNameServer
+   */
+
+  HKEY mykey;
+  HKEY subkey;
+  DWORD data_type;
+  DWORD bytes;
+  DWORD result;
+  DWORD index;
+  char name[MAX_PATH];
+  DWORD keysize = MAX_PATH;
+
+  status = ARES_EFILE;
+
+  if (IsNT) 
+  {
+    if (RegOpenKeyEx(
+            HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
+            KEY_READ, &mykey
+        ) == ERROR_SUCCESS)
+    {
+		RegOpenKeyEx(mykey, "Interfaces", 0, KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, &subkey);
+		if (get_res_nt(mykey, NAMESERVER, &line))
+		{
+			status = config_nameserver(&servers, &nservers, line);
+			free(line);
+		}
+		else if (get_res_nt(mykey, DHCPNAMESERVER, &line))
+		{
+			status = config_nameserver(&servers, &nservers, line);
+			free(line);
+		}
+		/* Try the interfaces */
+		else if (get_res_interfaces_nt(subkey, NAMESERVER, &line))
+		{
+			status = config_nameserver(&servers, &nservers, line);
+			free(line);
+		}
+		else if (get_res_interfaces_nt(subkey, DHCPNAMESERVER, &line))
+		{
+			status = config_nameserver(&servers, &nservers, line);
+			free(line);
+		}
+		RegCloseKey(subkey);
+	    RegCloseKey(mykey);
+	}
+  } else {
+      if (RegOpenKeyEx(
+            HKEY_LOCAL_MACHINE, WIN_NS_9X, 0,
+            KEY_READ, &mykey
+          ) == ERROR_SUCCESS)
+      {
+        if ((result = RegQueryValueEx(
+                        mykey, NAMESERVER, NULL, &data_type,
+                        NULL, &bytes
+                      ) 
+            ) == ERROR_SUCCESS ||
+            result == ERROR_MORE_DATA)
+        {
+            if (bytes) {
+                line = (char *)malloc(bytes+1);
+                if (RegQueryValueEx(
+                    mykey, NAMESERVER, NULL, &data_type,
+                    (unsigned char *)line, &bytes
+                    ) == ERROR_SUCCESS) {
+                    status = config_nameserver(&servers, &nservers, line);
+                }
+                free(line);
+            }
+        }
+      } 
+      RegCloseKey(mykey);
+  }
+  
+  if (status != ARES_EFILE) {
+      /*
+      if (!channel->lookups) {
+          status = config_lookup(channel, "file bind");
+      }
+      */
+      status = ARES_EOF;
+  }
+
+#elif defined(riscos)
+
+  /* Under RISC OS, name servers are listed in the
+     system variable Inet$Resolvers, space separated. */
+
+  line = getenv("Inet$Resolvers");
+  status = ARES_EFILE;
+  if (line) {
+    char *resolvers = strdup(line), *pos, *space;
+
+    if (!resolvers)
+      return ARES_ENOMEM;
+
+    pos = resolvers;
+    do {
+      space = strchr(pos, ' ');
+      if (space)
+        *space = 0;
+      status = config_nameserver(&servers, &nservers, pos);
+      if (status != ARES_SUCCESS)
+        break;
+      pos = space + 1;
+    } while (space);
+
+    if (status == ARES_SUCCESS)
+      status = ARES_EOF;
+
+    free(resolvers);
+  }
+
+#else
+
+  fp = fopen(PATH_RESOLV_CONF, "r");
+  if (!fp)
+    return (errno == ENOENT) ? ARES_SUCCESS : ARES_EFILE;
+  while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+    {
+      if ((p = try_config(line, "domain")) && channel->ndomains == -1)
+	status = config_domain(channel, p);
+      else if ((p = try_config(line, "lookup")) && !channel->lookups)
+	status = config_lookup(channel, p);
+      else if ((p = try_config(line, "search")) && channel->ndomains == -1)
+	status = set_search(channel, p);
+      else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
+	status = config_nameserver(&servers, &nservers, p);
+      else if ((p = try_config(line, "sortlist")) && channel->nsort == -1)
+	status = config_sortlist(&sortlist, &nsort, p);
+      else if ((p = try_config(line, "options")))
+	status = set_options(channel, p);
+      else
+	status = ARES_SUCCESS;
+      if (status != ARES_SUCCESS)
+	break;
+    }
+  free(line);
+  fclose(fp);
+
+#endif
+
+  /* Handle errors. */
+  if (status != ARES_EOF)
+    {
+      if (servers != NULL) free(servers);
+      if (sortlist != NULL) free(sortlist);
+      return status;
+    }
+
+  /* If we got any name server entries, fill them in. */
+  if (servers)
+    {
+      channel->servers = servers;
+      channel->nservers = nservers;
+    }
+
+  /* If we got any sortlist entries, fill them in. */
+  if (sortlist)
+    {
+      channel->sortlist = sortlist;
+      channel->nsort = nsort;
+    }
+
+  return ARES_SUCCESS;
+}
+
+static int init_by_defaults(ares_channel channel)
+{
+  char hostname[MAXHOSTNAMELEN + 1];
+
+  if (channel->flags == -1)
+    channel->flags = 0;
+  if (channel->timeout == -1)
+    channel->timeout = DEFAULT_TIMEOUT;
+  if (channel->tries == -1)
+    channel->tries = DEFAULT_TRIES;
+  if (channel->ndots == -1)
+    channel->ndots = 1;
+  if (channel->udp_port == -1)
+    channel->udp_port = htons(NAMESERVER_PORT);
+  if (channel->tcp_port == -1)
+    channel->tcp_port = htons(NAMESERVER_PORT);
+
+  if (channel->nservers == -1)
+    {
+      /* If nobody specified servers, try a local named. */
+      channel->servers = malloc(sizeof(struct server_state));
+      if (!channel->servers)
+	return ARES_ENOMEM;
+      channel->servers[0].addr.s_addr = htonl(INADDR_LOOPBACK);
+      channel->nservers = 1;
+    }
+
+  if (channel->ndomains == -1)
+    {
+      /* Derive a default domain search list from the kernel hostname,
+       * or set it to empty if the hostname isn't helpful.
+       */
+      if (gethostname(hostname, sizeof(hostname)) == -1
+	  || !strchr(hostname, '.'))
+	{
+	  channel->domains = malloc(0);
+	  channel->ndomains = 0;
+	}
+      else
+	{
+	  channel->domains = malloc(sizeof(char *));
+	  if (!channel->domains)
+	    return ARES_ENOMEM;
+	  channel->ndomains = 0;
+	  channel->domains[0] = strdup(strchr(hostname, '.') + 1);
+	  if (!channel->domains[0])
+	    return ARES_ENOMEM;
+	  channel->ndomains = 1;
+	}
+    }
+
+  if (channel->nsort == -1)
+    {
+      channel->sortlist = NULL;
+      channel->nsort = 0;
+    }
+
+  if (!channel->lookups)
+    {
+      channel->lookups = strdup("bf");
+      if (!channel->lookups)
+	return ARES_ENOMEM;
+    }
+
+  return ARES_SUCCESS;
+}
+
+static int config_domain(ares_channel channel, char *str)
+{
+  char *q;
+
+  /* Set a single search domain. */
+  q = str;
+  while (*q && !isspace((unsigned char)*q))
+    q++;
+  *q = 0;
+  return set_search(channel, str);
+}
+
+static int config_lookup(ares_channel channel, const char *str)
+{
+  char lookups[3], *l;
+  const char *p;
+
+  /* Set the lookup order.  Only the first letter of each work
+   * is relevant, and it has to be "b" for DNS or "f" for the
+   * host file.  Ignore everything else.
+   */
+  l = lookups;
+  p = str;
+  while (*p)
+    {
+      if ((*p == 'b' || *p == 'f') && l < lookups + 2)
+	*l++ = *p;
+      while (*p && !isspace((unsigned char)*p))
+	p++;
+      while (isspace((unsigned char)*p))
+	p++;
+    }
+  *l = 0;
+  channel->lookups = strdup(lookups);
+  return (channel->lookups) ? ARES_SUCCESS : ARES_ENOMEM;
+}
+
+static int config_nameserver(struct server_state **servers, int *nservers,
+			     const char *str)
+{
+  struct in_addr addr;
+  struct server_state *newserv;
+
+  /* Add a nameserver entry, if this is a valid address. */
+  addr.s_addr = inet_addr(str);
+  if (addr.s_addr == INADDR_NONE)
+    return ARES_SUCCESS;
+  newserv = realloc(*servers, (*nservers + 1) * sizeof(struct server_state));
+  if (!newserv)
+    return ARES_ENOMEM;
+  newserv[*nservers].addr = addr;
+  *servers = newserv;
+  (*nservers)++;
+  return ARES_SUCCESS;
+}
+
+static int config_sortlist(struct apattern **sortlist, int *nsort,
+			   const char *str)
+{
+  struct apattern pat, *newsort;
+  const char *q;
+
+  /* Add sortlist entries. */
+  while (*str && *str != ';')
+    {
+      q = str;
+      while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q))
+	q++;
+      if (ip_addr(str, q - str, &pat.addr) == 0)
+	{
+	  /* We have a pattern address; now determine the mask. */
+	  if (*q == '/')
+	    {
+	      str = q + 1;
+	      while (*q && *q != ';' && !isspace((unsigned char)*q))
+		q++;
+	      if (ip_addr(str, q - str, &pat.mask) != 0)
+		natural_mask(&pat);
+	    }
+	  else
+	    natural_mask(&pat);
+
+	  /* Add this pattern to our list. */
+	  newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
+	  if (!newsort)
+	    return ARES_ENOMEM;
+	  newsort[*nsort] = pat;
+	  *sortlist = newsort;
+	  (*nsort)++;
+	}
+      else
+	{
+	  while (*q && *q != ';' && !isspace((unsigned char)*q))
+	    q++;
+	}
+      str = q;
+      while (isspace((unsigned char)*str))
+	str++;
+    }
+
+  return ARES_SUCCESS;
+}
+
+static int set_search(ares_channel channel, const char *str)
+{
+  int n;
+  const char *p, *q;
+
+  /* Count the domains given. */
+  n = 0;
+  p = str;
+  while (*p)
+    {
+      while (*p && !isspace((unsigned char)*p))
+	p++;
+      while (isspace((unsigned char)*p))
+	p++;
+      n++;
+    }
+
+  channel->domains = malloc(n * sizeof(char *));
+  if (!channel->domains && n)
+    return ARES_ENOMEM;
+
+  /* Now copy the domains. */
+  n = 0;
+  p = str;
+  while (*p)
+    {
+      channel->ndomains = n;
+      q = p;
+      while (*q && !isspace((unsigned char)*q))
+	q++;
+      channel->domains[n] = malloc(q - p + 1);
+      if (!channel->domains[n])
+	return ARES_ENOMEM;
+      memcpy(channel->domains[n], p, q - p);
+      channel->domains[n][q - p] = 0;
+      p = q;
+      while (isspace((unsigned char)*p))
+	p++;
+      n++;
+    }
+  channel->ndomains = n;
+
+  return ARES_SUCCESS;
+}
+
+static int set_options(ares_channel channel, const char *str)
+{
+  const char *p, *q, *val;
+
+  p = str;
+  while (*p)
+    {
+      q = p;
+      while (*q && !isspace((unsigned char)*q))
+	q++;
+      val = try_option(p, q, "ndots:");
+      if (val && channel->ndots == -1)
+	channel->ndots = atoi(val);
+      val = try_option(p, q, "retrans:");
+      if (val && channel->timeout == -1)
+	channel->timeout = atoi(val);
+      val = try_option(p, q, "retry:");
+      if (val && channel->tries == -1)
+	channel->tries = atoi(val);
+      p = q;
+      while (isspace((unsigned char)*p))
+	p++;
+    }
+
+  return ARES_SUCCESS;
+}
+
+static char *try_config(char *s, char *opt)
+{
+  int len;
+
+  len = strlen(opt);
+  if (strncmp(s, opt, len) != 0 || !isspace((unsigned char)s[len]))
+    return NULL;
+  s += len;
+  while (isspace((unsigned char)*s))
+    s++;
+  return s;
+}
+
+static const char *try_option(const char *p, const char *q, const char *opt)
+{
+  int len;
+
+  len = strlen(opt);
+  return (q - p > len && strncmp(p, opt, len) == 0) ? p + len : NULL;
+}
+
+static int ip_addr(const char *s, int len, struct in_addr *addr)
+{
+  char ipbuf[16];
+
+  /* Four octets and three periods yields at most 15 characters. */
+  if (len > 15)
+    return -1;
+  memcpy(ipbuf, s, len);
+  ipbuf[len] = 0;
+
+  addr->s_addr = inet_addr(ipbuf);
+  if (addr->s_addr == INADDR_NONE && strcmp(ipbuf, "255.255.255.255") != 0)
+    return -1;
+  return 0;
+}
+
+static void natural_mask(struct apattern *pat)
+{
+  struct in_addr addr;
+
+  /* Store a host-byte-order copy of pat in a struct in_addr.  Icky,
+   * but portable.
+   */
+  addr.s_addr = ntohl(pat->addr.s_addr);
+
+  /* This is out of date in the CIDR world, but some people might
+   * still rely on it.
+   */
+  if (IN_CLASSA(addr.s_addr))
+    pat->mask.s_addr = htonl(IN_CLASSA_NET);
+  else if (IN_CLASSB(addr.s_addr))
+    pat->mask.s_addr = htonl(IN_CLASSB_NET);
+  else
+    pat->mask.s_addr = htonl(IN_CLASSC_NET);
+}

ares/ares_init_options.3

@@ -0,0 +1,2 @@
+.so man3/ares_init.3
+.\" $Id$

ares/ares_mkquery.3

@@ -0,0 +1,79 @@
+.\" $Id$
+.\"
+.\" Copyright 1998, 2000 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_MKQUERY 3 "4 January 2000"
+.SH NAME
+ares_mkquery \- Compose a single-question DNS query buffer
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B
+int ares_mkquery(const char *\fIname\fP, int \fIdnsclass\fP, int \fItype\fP,
+.B
+	unsigned short \fIid\fP, int \fIrd\fP, char **\fIbuf\fP,
+	int *\fIbuflen\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_mkquery
+function composes a DNS query with a single question.
+The parameter
+.I name
+gives the query name as a NUL-terminated C string of period-separated
+labels optionally ending with a period; periods and backslashes within
+a label must be escaped with a backlash.  The parameters
+.I dnsclass
+and
+.I type
+give the class and type of the query using the values defined in
+.BR <arpa/nameser.h> .
+The parameter
+.I id
+gives a 16-bit identifier for the query.  The parameter
+.I rd
+should be nonzero if recursion is desired, zero if not.  The query
+will be placed in an allocated buffer, a pointer to which will be
+stored in the variable pointed to by
+.IR buf ,
+and the length of which will be stored in the variable pointed to by
+.IR buflen .
+It is the caller's responsibility to free this buffer using
+.B ares_free_string
+when it is no longer needed.
+.SH RETURN VALUES
+.B ares_mkquery
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+Construction of the DNS query succeeded.
+.TP 15
+.B ARES_EBADNAME
+The query name
+.I name
+could not be encoded as a domain name, either because it contained a
+zero-length label or because it contained a label of more than 63
+characters.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_expand_name (3),
+.BR ares_free_string (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998, 2000 by the Massachusetts Institute of Technology.

ares/ares_mkquery.c

@@ -0,0 +1,161 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+
+/* Header format, from RFC 1035:
+ *                                  1  1  1  1  1  1
+ *    0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                      ID                       |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |QR|   Opcode  |AA|TC|RD|RA|   Z    |   RCODE   |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                    QDCOUNT                    |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                    ANCOUNT                    |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                    NSCOUNT                    |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                    ARCOUNT                    |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *
+ * AA, TC, RA, and RCODE are only set in responses.  Brief description
+ * of the remaining fields:
+ *	ID	Identifier to match responses with queries
+ *	QR	Query (0) or response (1)
+ *	Opcode	For our purposes, always QUERY
+ * 	RD	Recursion desired
+ *	Z	Reserved (zero)
+ *	QDCOUNT	Number of queries
+ *	ANCOUNT	Number of answers
+ *	NSCOUNT	Number of name server records
+ *	ARCOUNT	Number of additional records
+ *
+ * Question format, from RFC 1035:
+ *                                  1  1  1  1  1  1
+ *    0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                                               |
+ *  /                     QNAME                     /
+ *  /                                               /
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                     QTYPE                     |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *  |                     QCLASS                    |
+ *  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ *
+ * The query name is encoded as a series of labels, each represented
+ * as a one-byte length (maximum 63) followed by the text of the
+ * label.  The list is terminated by a label of length zero (which can
+ * be thought of as the root domain).
+ */
+
+int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
+		 int rd, unsigned char **buf, int *buflen)
+{
+  int len;
+  unsigned char *q;
+  const char *p;
+
+  /* Compute the length of the encoded name so we can check buflen.
+   * Start counting at 1 for the zero-length label at the end. */
+  len = 1;
+  for (p = name; *p; p++)
+    {
+      if (*p == '\\' && *(p + 1) != 0)
+	p++;
+      len++;
+    }
+  /* If there are n periods in the name, there are n + 1 labels, and
+   * thus n + 1 length fields, unless the name is empty or ends with a
+   * period.  So add 1 unless name is empty or ends with a period.
+   */
+  if (*name && *(p - 1) != '.')
+    len++;
+
+  *buflen = len + HFIXEDSZ + QFIXEDSZ;
+  *buf = malloc(*buflen);
+  if (!*buf)
+      return ARES_ENOMEM;
+
+  /* Set up the header. */
+  q = *buf;
+  memset(q, 0, HFIXEDSZ);
+  DNS_HEADER_SET_QID(q, id);
+  DNS_HEADER_SET_OPCODE(q, QUERY);
+  DNS_HEADER_SET_RD(q, (rd) ? 1 : 0);
+  DNS_HEADER_SET_QDCOUNT(q, 1);
+
+  /* A name of "." is a screw case for the loop below, so adjust it. */
+  if (strcmp(name, ".") == 0)
+    name++;
+
+  /* Start writing out the name after the header. */
+  q += HFIXEDSZ;
+  while (*name)
+    {
+      if (*name == '.')
+	return ARES_EBADNAME;
+
+      /* Count the number of bytes in this label. */
+      len = 0;
+      for (p = name; *p && *p != '.'; p++)
+	{
+	  if (*p == '\\' && *(p + 1) != 0)
+	    p++;
+	  len++;
+	}
+      if (len > MAXLABEL)
+	return ARES_EBADNAME;
+
+      /* Encode the length and copy the data. */
+      *q++ = len;
+      for (p = name; *p && *p != '.'; p++)
+	{
+	  if (*p == '\\' && *(p + 1) != 0)
+	    p++;
+	  *q++ = *p;
+	}
+
+      /* Go to the next label and repeat, unless we hit the end. */
+      if (!*p)
+	break;
+      name = p + 1;
+    }
+
+  /* Add the zero-length label at the end. */
+  *q++ = 0;
+
+  /* Finish off the question with the type and class. */
+  DNS_QUESTION_SET_TYPE(q, type);
+  DNS_QUESTION_SET_CLASS(q, dnsclass);
+
+  return ARES_SUCCESS;
+}

ares/ares_parse_a_reply.3

@@ -0,0 +1,65 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_PARSE_A_REPLY 3 "25 July 1998"
+.SH NAME
+ares_parse_a_reply \- Parse a reply to a DNS query of type A into a hostent
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B
+int ares_parse_a_reply(const unsigned char *\fIabuf\fB, int \fIalen\fB,
+.B 	struct hostent **\fIhost\fB);
+.fi
+.SH DESCRIPTION
+The
+.B ares_parse_a_reply
+function parses the response to a query of type A into a
+.BR "struct hostent" .
+The parameters
+.I abuf
+and
+.I alen
+give the contents of the response.  The result is stored in allocated
+memory and a pointer to it stored into the variable pointed to by
+.IR host .
+It is the caller's responsibility to free the resulting host structure
+using
+.BR ares_free_hostent (3)
+when it is no longer needed.
+.SH RETURN VALUES
+.B ares_parse_a_reply
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+The response was successfully parsed.
+.TP 15
+.B ARES_EBADRESP
+The response was malformatted.
+.TP 15
+.B ARES_ENODATA
+The response did not contain an answer to the query.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_gethostbyname (3),
+.BR ares_free_hostent (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_parse_a_reply.c

@@ -0,0 +1,173 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_private.h"
+
+int ares_parse_a_reply(const unsigned char *abuf, int alen,
+		       struct hostent **host)
+{
+  unsigned int qdcount, ancount;
+  int status, i, len, rr_type, rr_class, rr_len, naddrs;
+  int naliases;
+  const unsigned char *aptr;
+  char *hostname, *rr_name, *rr_data, **aliases;
+  struct in_addr *addrs;
+  struct hostent *hostent;
+
+  /* Set *host to NULL for all failure cases. */
+  *host = NULL;
+
+  /* Give up if abuf doesn't have room for a header. */
+  if (alen < HFIXEDSZ)
+    return ARES_EBADRESP;
+
+  /* Fetch the question and answer count from the header. */
+  qdcount = DNS_HEADER_QDCOUNT(abuf);
+  ancount = DNS_HEADER_ANCOUNT(abuf);
+  if (qdcount != 1)
+    return ARES_EBADRESP;
+
+  /* Expand the name from the question, and skip past the question. */
+  aptr = abuf + HFIXEDSZ;
+  status = ares_expand_name(aptr, abuf, alen, &hostname, &len);
+  if (status != ARES_SUCCESS)
+    return status;
+  if (aptr + len + QFIXEDSZ > abuf + alen)
+    {
+      free(hostname);
+      return ARES_EBADRESP;
+    }
+  aptr += len + QFIXEDSZ;
+
+  /* Allocate addresses and aliases; ancount gives an upper bound for both. */
+  addrs = malloc(ancount * sizeof(struct in_addr));
+  if (!addrs)
+    {
+      free(hostname);
+      return ARES_ENOMEM;
+    }
+  aliases = malloc((ancount + 1) * sizeof(char *));
+  if (!aliases)
+    {
+      free(hostname);
+      free(addrs);
+      return ARES_ENOMEM;
+    }
+  naddrs = 0;
+  naliases = 0;
+
+  /* Examine each answer resource record (RR) in turn. */
+  for (i = 0; i < ancount; i++)
+    {
+      /* Decode the RR up to the data field. */
+      status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
+      if (status != ARES_SUCCESS)
+	break;
+      aptr += len;
+      if (aptr + RRFIXEDSZ > abuf + alen)
+	{
+	  status = ARES_EBADRESP;
+	  break;
+	}
+      rr_type = DNS_RR_TYPE(aptr);
+      rr_class = DNS_RR_CLASS(aptr);
+      rr_len = DNS_RR_LEN(aptr);
+      aptr += RRFIXEDSZ;
+
+      if (rr_class == C_IN && rr_type == T_A
+	  && rr_len == sizeof(struct in_addr)
+	  && strcasecmp(rr_name, hostname) == 0)
+	{
+	  memcpy(&addrs[naddrs], aptr, sizeof(struct in_addr));
+	  naddrs++;
+	  status = ARES_SUCCESS;
+	}
+
+      if (rr_class == C_IN && rr_type == T_CNAME)
+	{
+	  /* Record the RR name as an alias. */
+	  aliases[naliases] = rr_name;
+	  naliases++;
+
+	  /* Decode the RR data and replace the hostname with it. */
+	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+	  if (status != ARES_SUCCESS)
+	    break;
+	  free(hostname);
+	  hostname = rr_data;
+	}
+      else
+	free(rr_name);
+
+      aptr += rr_len;
+      if (aptr > abuf + alen)
+	{
+	  status = ARES_EBADRESP;
+	  break;
+	}
+    }
+
+  if (status == ARES_SUCCESS && naddrs == 0)
+    status = ARES_ENODATA;
+  if (status == ARES_SUCCESS)
+    {
+      /* We got our answer.  Allocate memory to build the host entry. */
+      aliases[naliases] = NULL;
+      hostent = malloc(sizeof(struct hostent));
+      if (hostent)
+	{
+	  hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
+	  if (hostent->h_addr_list)
+	    {
+	      /* Fill in the hostent and return successfully. */
+	      hostent->h_name = hostname;
+	      hostent->h_aliases = aliases;
+	      hostent->h_addrtype = AF_INET;
+	      hostent->h_length = sizeof(struct in_addr);
+	      for (i = 0; i < naddrs; i++)
+		hostent->h_addr_list[i] = (char *) &addrs[i];
+	      hostent->h_addr_list[naddrs] = NULL;
+	      *host = hostent;
+	      return ARES_SUCCESS;
+	    }
+	  free(hostent);
+	}
+      status = ARES_ENOMEM;
+    }
+  for (i = 0; i < naliases; i++)
+    free(aliases[i]);
+  free(aliases);
+  free(addrs);
+  free(hostname);
+  return status;
+}

ares/ares_parse_ptr_reply.3

@@ -0,0 +1,77 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_PARSE_PTR_REPLY 3 "25 July 1998"
+.SH NAME
+ares_parse_ptr_reply \- Parse a reply to a DNS query of type PTR into a hostent
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B
+int ares_parse_ptr_reply(const unsigned char *\fIabuf\fB, int \fIalen\fB,
+.B
+ 	const void *\fIaddr\fP, int \fIaddrlen\fP, int \fIfamily\fP,
+.B	struct hostent **\fIhost\fB);
+.fi
+.SH DESCRIPTION
+The
+.B ares_parse_ptr_reply
+function parses the response to a query of type PTR into a
+.BR "struct hostent" .
+The parameters
+.I abuf
+and
+.I alen
+give the contents of the response.  The parameters
+.IR addr ,
+.IR addrlen ,
+and
+.I family
+specify which address was queried for; they are not used to verify the
+response, merely used to fill in the address of the
+.BR "struct hostent" .
+The resulting
+.B struct hostent
+is stored in allocated memory and a pointer to it stored into the
+variable pointed to by
+.IR host .
+It is the caller's responsibility to free the resulting host structure
+using
+.BR ares_free_hostent (3)
+when it is no longer needed.
+.SH RETURN VALUES
+.B ares_parse_ptr_reply
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+The response was successfully parsed.
+.TP 15
+.B ARES_EBADRESP
+The response was malformatted.
+.TP 15
+.B ARES_ENODATA
+The response did not contain an answer to the query.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_gethostbyaddr (3),
+.BR ares_free_hostent (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_parse_ptr_reply.c

@@ -0,0 +1,159 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_private.h"
+
+int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
+			 int addrlen, int family, struct hostent **host)
+{
+  unsigned int qdcount, ancount;
+  int status, i, len, rr_type, rr_class, rr_len;
+  const unsigned char *aptr;
+  char *ptrname, *hostname, *rr_name, *rr_data;
+  struct hostent *hostent;
+
+  /* Set *host to NULL for all failure cases. */
+  *host = NULL;
+
+  /* Give up if abuf doesn't have room for a header. */
+  if (alen < HFIXEDSZ)
+    return ARES_EBADRESP;
+
+  /* Fetch the question and answer count from the header. */
+  qdcount = DNS_HEADER_QDCOUNT(abuf);
+  ancount = DNS_HEADER_ANCOUNT(abuf);
+  if (qdcount != 1)
+    return ARES_EBADRESP;
+
+  /* Expand the name from the question, and skip past the question. */
+  aptr = abuf + HFIXEDSZ;
+  status = ares_expand_name(aptr, abuf, alen, &ptrname, &len);
+  if (status != ARES_SUCCESS)
+    return status;
+  if (aptr + len + QFIXEDSZ > abuf + alen)
+    {
+      free(ptrname);
+      return ARES_EBADRESP;
+    }
+  aptr += len + QFIXEDSZ;
+
+  /* Examine each answer resource record (RR) in turn. */
+  hostname = NULL;
+  for (i = 0; i < ancount; i++)
+    {
+      /* Decode the RR up to the data field. */
+      status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
+      if (status != ARES_SUCCESS)
+	break;
+      aptr += len;
+      if (aptr + RRFIXEDSZ > abuf + alen)
+	{
+	  status = ARES_EBADRESP;
+	  break;
+	}
+      rr_type = DNS_RR_TYPE(aptr);
+      rr_class = DNS_RR_CLASS(aptr);
+      rr_len = DNS_RR_LEN(aptr);
+      aptr += RRFIXEDSZ;
+
+      if (rr_class == C_IN && rr_type == T_PTR
+	  && strcasecmp(rr_name, ptrname) == 0)
+	{
+	  /* Decode the RR data and set hostname to it. */
+	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+	  if (status != ARES_SUCCESS)
+	    break;
+	  if (hostname)
+	    free(hostname);
+	  hostname = rr_data;
+	}
+
+      if (rr_class == C_IN && rr_type == T_CNAME)
+	{
+	  /* Decode the RR data and replace ptrname with it. */
+	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+	  if (status != ARES_SUCCESS)
+	    break;
+	  free(ptrname);
+	  ptrname = rr_data;
+	}
+
+      free(rr_name);
+      aptr += rr_len;
+      if (aptr > abuf + alen)
+	{
+	  status = ARES_EBADRESP;
+	  break;
+	}
+    }
+
+  if (status == ARES_SUCCESS && !hostname)
+    status = ARES_ENODATA;
+  if (status == ARES_SUCCESS)
+    {
+      /* We got our answer.  Allocate memory to build the host entry. */
+      hostent = malloc(sizeof(struct hostent));
+      if (hostent)
+	{
+	  hostent->h_addr_list = malloc(2 * sizeof(char *));
+	  if (hostent->h_addr_list)
+	    {
+	      hostent->h_addr_list[0] = malloc(addrlen);
+	      if (hostent->h_addr_list[0])
+		{
+		  hostent->h_aliases = malloc(sizeof (char *));
+		  if (hostent->h_aliases)
+		    {
+		      /* Fill in the hostent and return successfully. */
+		      hostent->h_name = hostname;
+		      hostent->h_aliases[0] = NULL;
+		      hostent->h_addrtype = family;
+		      hostent->h_length = addrlen;
+		      memcpy(hostent->h_addr_list[0], addr, addrlen);
+		      hostent->h_addr_list[1] = NULL;
+		      *host = hostent;
+		      free(ptrname);
+		      return ARES_SUCCESS;
+		    }
+		  free(hostent->h_addr_list[0]);
+		}
+	      free(hostent->h_addr_list);
+	    }
+	  free(hostent);
+	}
+      status = ARES_ENOMEM;
+    }
+  if (hostname)
+    free(hostname);
+  free(ptrname);
+  return status;
+}

ares/ares_private.h

@@ -0,0 +1,145 @@
+/* $Id$ */
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#ifdef WIN32
+
+#else
+#include <netinet/in.h>
+/* We define closesocket() here so that we can use this function all over
+   the source code for closing sockets. */
+#define closesocket(x) close(x)
+#endif
+
+#define	DEFAULT_TIMEOUT		5
+#define DEFAULT_TRIES		4
+#ifndef INADDR_NONE
+#define	INADDR_NONE 0xffffffff
+#endif
+
+#ifdef WIN32
+
+#define IsNT ((int)GetVersion()>0)
+#define WIN_NS_9X      "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
+#define WIN_NS_NT_KEY  "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
+#define NAMESERVER     "NameServer"
+#define DHCPNAMESERVER "DhcpNameServer"
+#define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"
+#define PATH_HOSTS_9X  "\\hosts"
+          
+#else
+
+#define PATH_RESOLV_CONF	"/etc/resolv.conf"
+#ifdef ETC_INET
+#define PATH_HOSTS		"/etc/inet/hosts"
+#else
+#define PATH_HOSTS		"/etc/hosts"
+#endif
+
+#endif
+
+struct send_request {
+  /* Remaining data to send */
+  const char *data;
+  int len;
+
+  /* Next request in queue */
+  struct send_request *next;
+};
+
+struct server_state {
+  struct in_addr addr;
+  int udp_socket;
+  int tcp_socket;
+
+  /* Mini-buffer for reading the length word */
+  unsigned char tcp_lenbuf[2];
+  int tcp_lenbuf_pos;
+  int tcp_length;
+
+  /* Buffer for reading actual TCP data */
+  unsigned char *tcp_buffer;
+  int tcp_buffer_pos;
+
+  /* TCP output queue */
+  struct send_request *qhead;
+  struct send_request *qtail;
+};
+
+struct query {
+  /* Query ID from qbuf, for faster lookup, and current timeout */
+  unsigned short qid;
+  time_t timeout;
+
+  /* Query buf with length at beginning, for TCP transmission */
+  char *tcpbuf;
+  int tcplen;
+
+  /* Arguments passed to ares_send() (qbuf points into tcpbuf) */
+  const char *qbuf;
+  int qlen;
+  ares_callback callback;
+  void *arg;
+
+  /* Query status */
+  int try;
+  int server;
+  int *skip_server;
+  int using_tcp;
+  int error_status;
+
+  /* Next query in chain */
+  struct query *next;
+};
+
+/* An IP address pattern; matches an IP address X if X & mask == addr */
+struct apattern {
+  struct in_addr addr;
+  struct in_addr mask;
+};
+
+struct ares_channeldata {
+  /* Configuration data */
+  int flags;
+  int timeout;
+  int tries;
+  int ndots;
+  int udp_port;
+  int tcp_port;
+  char **domains;
+  int ndomains;
+  struct apattern *sortlist;
+  int nsort;
+  char *lookups;
+
+  /* Server addresses and communications state */
+  struct server_state *servers;
+  int nservers;
+
+  /* ID to use for next query */
+  unsigned short next_id;
+
+  /* Active queries */
+  struct query *queries;
+};
+
+void ares__send_query(ares_channel channel, struct query *query, time_t now);
+void ares__close_sockets(struct server_state *server);
+int ares__get_hostent(FILE *fp, struct hostent **host);
+int ares__read_line(FILE *fp, char **buf, int *bufsize);

ares/ares_process.3

@@ -0,0 +1,79 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_PROCESS 3 "25 July 1998"
+.SH NAME
+ares_process \- Process events for name resolution
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B void ares_process(ares_channel \fIchannel\fP, fd_set *\fIread_fds\fP,
+.B	fd_set *\fIwrite_fds\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_process
+function handles input/output events and timeouts associated with
+queries pending on the name service channel identified by
+.IR channel .
+The file descriptor sets pointed to by
+.I read_fds
+and
+.I write_fds
+should have file descriptors set in them according to whether the file
+descriptors specified by
+.BR ares_fds (3)
+are ready for reading and writing.  (The easiest way to determine this
+information is to invoke
+.B select
+with a timeout no greater than the timeout given by
+.BR ares_timeout (3)).
+.PP
+The
+.B ares_process
+function will invoke callbacks for pending queries if they complete
+successfully or fail.
+.SS EXAMPLE
+The following code fragment waits for all pending queries on a channel
+to complete:
+.PP
+.RS
+.nf
+int nfds, count;
+fd_set readers, writers;
+struct timeval tv, *tvp;
+
+while (1)
+  {
+    FD_ZERO(&readers);
+    FD_ZERO(&writers);
+    nfds = ares_fds(channel, &readers, &writers);
+    if (nfds == 0)
+      break;
+    tvp = ares_timeout(channel, NULL, &tv);
+    count = select(nfds, &readers, &writers, NULL, tvp);
+    ares_process(channel, &readers, &writers);
+  }
+.fi
+.RE
+.SH SEE ALSO
+.BR ares_fds (3),
+.BR ares_timeout (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_process.c

@@ -0,0 +1,625 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/nameser.h>
+#include <unistd.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <time.h>
+#include <errno.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_private.h"
+
+static void write_tcp_data(ares_channel channel, fd_set *write_fds,
+			   time_t now);
+static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
+static void read_udp_packets(ares_channel channel, fd_set *read_fds,
+			     time_t now);
+static void process_timeouts(ares_channel channel, time_t now);
+static void process_answer(ares_channel channel, unsigned char *abuf,
+			   int alen, int whichserver, int tcp, int now);
+static void handle_error(ares_channel channel, int whichserver, time_t now);
+static void next_server(ares_channel channel, struct query *query, time_t now);
+static int open_tcp_socket(ares_channel channel, struct server_state *server);
+static int open_udp_socket(ares_channel channel, struct server_state *server);
+static int same_questions(const unsigned char *qbuf, int qlen,
+			  const unsigned char *abuf, int alen);
+static void end_query(ares_channel channel, struct query *query, int status,
+		      unsigned char *abuf, int alen);
+
+/* Something interesting happened on the wire, or there was a timeout.
+ * See what's up and respond accordingly.
+ */
+void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
+{
+  time_t now;
+
+  time(&now);
+  write_tcp_data(channel, write_fds, now);
+  read_tcp_data(channel, read_fds, now);
+  read_udp_packets(channel, read_fds, now);
+  process_timeouts(channel, now);
+}
+
+/* If any TCP sockets select true for writing, write out queued data
+ * we have for them.
+ */
+static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
+{
+  struct server_state *server;
+  struct send_request *sendreq;
+  struct iovec *vec;
+  int i, n, count;
+
+  for (i = 0; i < channel->nservers; i++)
+    {
+      /* Make sure server has data to send and is selected in write_fds. */
+      server = &channel->servers[i];
+      if (!server->qhead || server->tcp_socket == -1
+	  || !FD_ISSET(server->tcp_socket, write_fds))
+	continue;
+
+      /* Count the number of send queue items. */
+      n = 0;
+      for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
+	n++;
+
+#ifdef WIN32
+      vec = NULL;
+#else
+      /* Allocate iovecs so we can send all our data at once. */
+      vec = malloc(n * sizeof(struct iovec));
+#endif
+      if (vec)
+	{
+#ifdef WIN32
+#else
+	  /* Fill in the iovecs and send. */
+	  n = 0;
+	  for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
+	    {
+	      vec[n].iov_base = (char *) sendreq->data;
+	      vec[n].iov_len = sendreq->len;
+	      n++;
+	    }
+	  count = writev(server->tcp_socket, vec, n);
+	  free(vec);
+	  if (count < 0)
+	    {
+	      handle_error(channel, i, now);
+	      continue;
+	    }
+
+	  /* Advance the send queue by as many bytes as we sent. */
+	  while (count)
+	    {
+	      sendreq = server->qhead;
+	      if (count >= sendreq->len)
+		{
+		  count -= sendreq->len;
+		  server->qhead = sendreq->next;
+		  if (server->qhead == NULL)
+		    server->qtail = NULL;
+		  free(sendreq);
+		}
+	      else
+		{
+		  sendreq->data += count;
+		  sendreq->len -= count;
+		  break;
+		}
+	    }
+#endif
+	}
+      else
+	{
+	  /* Can't allocate iovecs; just send the first request. */
+	  sendreq = server->qhead;
+
+          count = send(server->tcp_socket, sendreq->data, sendreq->len, 0);
+
+	  if (count < 0)
+	    {
+	      handle_error(channel, i, now);
+	      continue;
+	    }
+
+	  /* Advance the send queue by as many bytes as we sent. */
+	  if (count == sendreq->len)
+	    {
+	      server->qhead = sendreq->next;
+	      if (server->qhead == NULL)
+		server->qtail = NULL;
+	      free(sendreq);
+	    }
+	  else
+	    {
+	      sendreq->data += count;
+	      sendreq->len -= count;
+	    }
+	}
+    }
+}
+
+/* If any TCP socket selects true for reading, read some data,
+ * allocate a buffer if we finish reading the length word, and process
+ * a packet if we finish reading one.
+ */
+static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
+{
+  struct server_state *server;
+  int i, count;
+
+  for (i = 0; i < channel->nservers; i++)
+    {
+      /* Make sure the server has a socket and is selected in read_fds. */
+      server = &channel->servers[i];
+      if (server->tcp_socket == -1 || !FD_ISSET(server->tcp_socket, read_fds))
+	continue;
+
+      if (server->tcp_lenbuf_pos != 2)
+	{
+	  /* We haven't yet read a length word, so read that (or
+	   * what's left to read of it).
+	   */
+          count = recv(server->tcp_socket,
+                       server->tcp_lenbuf + server->tcp_buffer_pos,
+                       2 - server->tcp_buffer_pos, 0);
+	  if (count <= 0)
+	    {
+	      handle_error(channel, i, now);
+	      continue;
+	    }
+
+	  server->tcp_lenbuf_pos += count;
+	  if (server->tcp_lenbuf_pos == 2)
+	    {
+	      /* We finished reading the length word.  Decode the
+               * length and allocate a buffer for the data.
+	       */
+	      server->tcp_length = server->tcp_lenbuf[0] << 8
+		| server->tcp_lenbuf[1];
+	      server->tcp_buffer = malloc(server->tcp_length);
+	      if (!server->tcp_buffer)
+		handle_error(channel, i, now);
+	      server->tcp_buffer_pos = 0;
+	    }
+	}
+      else
+	{
+	  /* Read data into the allocated buffer. */
+       	  count = recv(server->tcp_socket,
+		       server->tcp_buffer + server->tcp_buffer_pos,
+		       server->tcp_length - server->tcp_buffer_pos, 0);
+	  if (count <= 0)
+	    {
+	      handle_error(channel, i, now);
+	      continue;
+	    }
+
+	  server->tcp_buffer_pos += count;
+	  if (server->tcp_buffer_pos == server->tcp_length)
+	    {
+	      /* We finished reading this answer; process it and
+               * prepare to read another length word.
+	       */
+	      process_answer(channel, server->tcp_buffer, server->tcp_length,
+			     i, 1, now);
+	      free(server->tcp_buffer);
+	      server->tcp_buffer = NULL;
+	      server->tcp_lenbuf_pos = 0;
+	    }
+	}
+    }
+}
+
+/* If any UDP sockets select true for reading, process them. */
+static void read_udp_packets(ares_channel channel, fd_set *read_fds,
+			     time_t now)
+{
+  struct server_state *server;
+  int i, count;
+  unsigned char buf[PACKETSZ + 1];
+
+  for (i = 0; i < channel->nservers; i++)
+    {
+      /* Make sure the server has a socket and is selected in read_fds. */
+      server = &channel->servers[i];
+
+      if (server->udp_socket == -1 || !FD_ISSET(server->udp_socket, read_fds))
+	continue;
+
+      count = recv(server->udp_socket, buf, sizeof(buf), 0);
+      if (count <= 0)
+	handle_error(channel, i, now);
+
+      process_answer(channel, buf, count, i, 0, now);
+    }
+}
+
+/* If any queries have timed out, note the timeout and move them on. */
+static void process_timeouts(ares_channel channel, time_t now)
+{
+  struct query *query, *next;
+
+  for (query = channel->queries; query; query = next)
+    {
+      next = query->next;
+      if (query->timeout != 0 && now >= query->timeout)
+	{
+	  query->error_status = ARES_ETIMEOUT;
+	  next_server(channel, query, now);
+	}
+    }
+}
+
+/* Handle an answer from a server. */
+static void process_answer(ares_channel channel, unsigned char *abuf,
+			   int alen, int whichserver, int tcp, int now)
+{
+  int id, tc, rcode;
+  struct query *query;
+
+  /* If there's no room in the answer for a header, we can't do much
+   * with it. */
+  if (alen < HFIXEDSZ)
+    return;
+
+  /* Grab the query ID, truncate bit, and response code from the packet. */
+  id = DNS_HEADER_QID(abuf);
+  tc = DNS_HEADER_TC(abuf);
+  rcode = DNS_HEADER_RCODE(abuf);
+
+  /* Find the query corresponding to this packet. */
+  for (query = channel->queries; query; query = query->next)
+    {
+      if (query->qid == id)
+	break;
+    }
+  if (!query)
+    return;
+
+  /* If we got a truncated UDP packet and are not ignoring truncation,
+   * don't accept the packet, and switch the query to TCP if we hadn't
+   * done so already.
+   */
+  if ((tc || alen > PACKETSZ) && !tcp && !(channel->flags & ARES_FLAG_IGNTC))
+    {
+      if (!query->using_tcp)
+	{
+	  query->using_tcp = 1;
+	  ares__send_query(channel, query, now);
+	}
+      return;
+    }
+
+  /* Limit alen to PACKETSZ if we aren't using TCP (only relevant if we
+   * are ignoring truncation.
+   */
+  if (alen > PACKETSZ && !tcp)
+    alen = PACKETSZ;
+
+  /* If we aren't passing through all error packets, discard packets
+   * with SERVFAIL, NOTIMP, or REFUSED response codes.
+   */
+  if (!(channel->flags & ARES_FLAG_NOCHECKRESP))
+    {
+      if (rcode == SERVFAIL || rcode == NOTIMP || rcode == REFUSED)
+	{
+	  query->skip_server[whichserver] = 1;
+	  if (query->server == whichserver)
+	    next_server(channel, query, now);
+	  return;
+	}
+      if (!same_questions(query->qbuf, query->qlen, abuf, alen))
+	{
+	  if (query->server == whichserver)
+	    next_server(channel, query, now);
+	  return;
+	}
+    }
+
+  end_query(channel, query, ARES_SUCCESS, abuf, alen);
+}
+
+static void handle_error(ares_channel channel, int whichserver, time_t now)
+{
+  struct query *query;
+
+  /* Reset communications with this server. */
+  ares__close_sockets(&channel->servers[whichserver]);
+
+  /* Tell all queries talking to this server to move on and not try
+   * this server again.
+   */
+  for (query = channel->queries; query; query = query->next)
+    {
+      if (query->server == whichserver)
+	{
+	  query->skip_server[whichserver] = 1;
+	  next_server(channel, query, now);
+	}
+    }
+}
+
+static void next_server(ares_channel channel, struct query *query, time_t now)
+{
+  /* Advance to the next server or try. */
+  query->server++;
+  for (; query->try < channel->tries; query->try++)
+    {
+      for (; query->server < channel->nservers; query->server++)
+	{
+	  if (!query->skip_server[query->server])
+	    {
+	      ares__send_query(channel, query, now);
+	      return;
+	    }
+	}
+      query->server = 0;
+
+      /* Only one try if we're using TCP. */
+      if (query->using_tcp)
+	break;
+    }
+  end_query(channel, query, query->error_status, NULL, 0);
+}
+
+void ares__send_query(ares_channel channel, struct query *query, time_t now)
+{
+  struct send_request *sendreq;
+  struct server_state *server;
+
+  server = &channel->servers[query->server];
+  if (query->using_tcp)
+    {
+      /* Make sure the TCP socket for this server is set up and queue
+       * a send request.
+       */
+      if (server->tcp_socket == -1)
+	{
+	  if (open_tcp_socket(channel, server) == -1)
+	    {
+	      query->skip_server[query->server] = 1;
+	      next_server(channel, query, now);
+	      return;
+	    }
+	}
+      sendreq = malloc(sizeof(struct send_request));
+      if (!sendreq)
+	end_query(channel, query, ARES_ENOMEM, NULL, 0);
+      sendreq->data = query->tcpbuf;
+      sendreq->len = query->tcplen;
+      sendreq->next = NULL;
+      if (server->qtail)
+	server->qtail->next = sendreq;
+      else
+	server->qhead = sendreq;
+      server->qtail = sendreq;
+      query->timeout = 0;
+    }
+  else
+    {
+      if (server->udp_socket == -1)
+	{
+	  if (open_udp_socket(channel, server) == -1)
+	    {
+	      query->skip_server[query->server] = 1;
+	      next_server(channel, query, now);
+	      return;
+	    }
+	}
+      if (send(server->udp_socket, query->qbuf, query->qlen, 0) == -1)
+	{
+	  query->skip_server[query->server] = 1;
+	  next_server(channel, query, now);
+	  return;
+	}
+      query->timeout = now
+	  + ((query->try == 0) ? channel->timeout
+	     : channel->timeout << query->try / channel->nservers);
+    }
+}
+
+static int open_tcp_socket(ares_channel channel, struct server_state *server)
+{
+  int s, flags;
+  struct sockaddr_in sin;
+
+  /* Acquire a socket. */
+  s = socket(AF_INET, SOCK_STREAM, 0);
+  if (s == -1)
+    return -1;
+
+  /* Set the socket non-blocking. */
+
+#ifdef WIN32
+  flags = 1;
+  ioctlsocket(s, FIONBIO, &flags);
+#else
+  if (fcntl(s, F_GETFL, &flags) == -1)
+    {
+      close(s);
+      return -1;
+    }
+  flags &= O_NONBLOCK;
+  if (fcntl(s, F_SETFL, flags) == -1)
+    {
+      close(s);
+      return -1;
+    }
+#endif
+  
+  /* Connect to the server. */
+  memset(&sin, 0, sizeof(sin));
+  sin.sin_family = AF_INET;
+  sin.sin_addr = server->addr;
+  sin.sin_port = channel->tcp_port;
+  if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) == -1
+      && errno != EINPROGRESS)
+    {
+      closesocket(s);
+      return -1;
+    }
+
+  server->tcp_socket = s;
+  return 0;
+}
+
+static int open_udp_socket(ares_channel channel, struct server_state *server)
+{
+  int s;
+  struct sockaddr_in sin;
+
+  /* Acquire a socket. */
+  s = socket(AF_INET, SOCK_DGRAM, 0);
+  if (s == -1)
+    return -1;
+
+  /* Connect to the server. */
+  memset(&sin, 0, sizeof(sin));
+  sin.sin_family = AF_INET;
+  sin.sin_addr = server->addr;
+  sin.sin_port = channel->udp_port;
+  if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) == -1)
+    {
+      closesocket(s);
+      return -1;
+    }
+
+  server->udp_socket = s;
+  return 0;
+}
+
+static int same_questions(const unsigned char *qbuf, int qlen,
+			  const unsigned char *abuf, int alen)
+{
+  struct {
+    const unsigned char *p;
+    int qdcount;
+    char *name;
+    int namelen;
+    int type;
+    int dnsclass;
+  } q, a;
+  int i, j;
+
+  if (qlen < HFIXEDSZ || alen < HFIXEDSZ)
+    return 0;
+
+  /* Extract qdcount from the request and reply buffers and compare them. */
+  q.qdcount = DNS_HEADER_QDCOUNT(qbuf);
+  a.qdcount = DNS_HEADER_QDCOUNT(abuf);
+  if (q.qdcount != a.qdcount)
+    return 0;
+
+  /* For each question in qbuf, find it in abuf. */
+  q.p = qbuf + HFIXEDSZ;
+  for (i = 0; i < q.qdcount; i++)
+    {
+      /* Decode the question in the query. */
+      if (ares_expand_name(q.p, qbuf, qlen, &q.name, &q.namelen)
+	  != ARES_SUCCESS)
+	return 0;
+      q.p += q.namelen;
+      if (q.p + QFIXEDSZ > qbuf + qlen)
+	{
+	  free(q.name);
+	  return 0;
+	}
+      q.type = DNS_QUESTION_TYPE(q.p);
+      q.dnsclass = DNS_QUESTION_CLASS(q.p);
+      q.p += QFIXEDSZ;
+
+      /* Search for this question in the answer. */
+      a.p = abuf + HFIXEDSZ;
+      for (j = 0; j < a.qdcount; j++)
+	{
+	  /* Decode the question in the answer. */
+	  if (ares_expand_name(a.p, abuf, alen, &a.name, &a.namelen)
+	      != ARES_SUCCESS)
+	    {
+	      free(q.name);
+	      return 0;
+	    }
+	  a.p += a.namelen;
+	  if (a.p + QFIXEDSZ > abuf + alen)
+	    {
+	      free(q.name);
+	      free(a.name);
+	      return 0;
+	    }
+	  a.type = DNS_QUESTION_TYPE(a.p);
+	  a.dnsclass = DNS_QUESTION_CLASS(a.p);
+	  a.p += QFIXEDSZ;
+
+	  /* Compare the decoded questions. */
+	  if (strcasecmp(q.name, a.name) == 0 && q.type == a.type
+	      && q.dnsclass == a.dnsclass)
+	    {
+	      free(a.name);
+	      break;
+	    }
+	  free(a.name);
+	}
+
+      free(q.name);
+      if (j == a.qdcount)
+	return 0;
+    }
+  return 1;
+}
+
+static void end_query(ares_channel channel, struct query *query, int status,
+		      unsigned char *abuf, int alen)
+{
+  struct query **q;
+  int i;
+
+  query->callback(query->arg, status, abuf, alen);
+  for (q = &channel->queries; *q; q = &(*q)->next)
+    {
+      if (*q == query)
+	break;
+    }
+  *q = query->next;
+  free(query->tcpbuf);
+  free(query->skip_server);
+  free(query);
+
+  /* Simple cleanup policy: if no queries are remaining, close all
+   * network sockets unless STAYOPEN is set.
+   */
+  if (!channel->queries && !(channel->flags & ARES_FLAG_STAYOPEN))
+    {
+      for (i = 0; i < channel->nservers; i++)
+	ares__close_sockets(&channel->servers[i]);
+    }
+}

ares/ares_query.3

@@ -0,0 +1,142 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_QUERY 3 "24 July 1998"
+.SH NAME
+ares_query \- Initiate a single-question DNS query
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	unsigned char *\fIabuf\fP, int \fIalen\fP)
+.PP
+.B void ares_query(ares_channel \fIchannel\fP, const char *\fIname\fP,
+.B 	int \fIdnsclass\fP, int \fItype\fP, ares_callback \fIcallback\fP,
+.B	void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_query
+function initiates a single-question DNS query on the name service
+channel identified by
+.IR channel .
+The parameter
+.I name
+gives the query name as a NUL-terminated C string of period-separated
+labels optionally ending with a period; periods and backslashes within
+a label must be escaped with a backslash.  The parameters
+.I dnsclass
+and
+.I type
+give the class and type of the query using the values defined in
+.BR <arpa/nameser.h> .
+When the query is complete or has failed, the ares library will invoke
+.IR callback .
+Completion or failure of the query may happen immediately, or may
+happen during a later call to
+.BR ares_process (3)
+or
+.BR ares_destroy (3).
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_query
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query succeeded and, if not, how it failed.  It
+may have any of the following values:
+.TP 19
+.B ARES_SUCCESS
+The query completed successfully.
+.TP 19
+.B ARES_ENODATA
+The query completed but contains no answers.
+.TP 19
+.B ARES_EFORMERR
+The query completed but the server claims that the query was
+malformatted.
+.TP 19
+.B ARES_ESERVFAIL
+The query completed but the server claims to have experienced a
+failure.  (This code can only occur if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_ENOTFOUND
+The query completed but the queried-for domain name was not found.
+.TP 19
+.B ARES_ENOTIMP
+The query completed but the server does not implement the operation
+requested by the query.  (This code can only occur if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_EREFUSED
+The query completed but the server refused the query.  (This code can
+only occur if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_EBADNAME
+The query name
+.I name
+could not be encoded as a domain name, either because it contained a
+zero-length label or because it contained a label of more than 63
+characters.
+.TP 19
+.B ARES_ETIMEOUT
+No name servers responded within the timeout period.
+.TP 19
+.B ARES_ECONNREFUSED
+No name servers could be contacted.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.PP
+If the query completed (even if there was something wrong with it, as
+indicated by some of the above error codes), the callback argument
+.I abuf
+points to a result buffer of length
+.IR alen .
+If the query did not complete,
+.I abuf
+will be NULL and
+.I alen
+will be 0.
+.SH SEE ALSO
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_query.c

@@ -0,0 +1,112 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_private.h"
+
+struct qquery {
+  ares_callback callback;
+  void *arg;
+};
+
+static void qcallback(void *arg, int status, unsigned char *abuf, int alen);
+
+void ares_query(ares_channel channel, const char *name, int dnsclass,
+		int type, ares_callback callback, void *arg)
+{
+  struct qquery *qquery;
+  unsigned char *qbuf;
+  int qlen, rd, status;
+
+  /* Compose the query. */
+  rd = !(channel->flags & ARES_FLAG_NORECURSE);
+  status = ares_mkquery(name, dnsclass, type, channel->next_id, rd, &qbuf,
+			&qlen);
+  channel->next_id++;
+  if (status != ARES_SUCCESS)
+    {
+      callback(arg, status, NULL, 0);
+      return;
+    }
+
+  /* Allocate and fill in the query structure. */
+  qquery = malloc(sizeof(struct qquery));
+  if (!qquery)
+    {
+      ares_free_string(qbuf);
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+  qquery->callback = callback;
+  qquery->arg = arg;
+
+  /* Send it off.  qcallback will be called when we get an answer. */
+  ares_send(channel, qbuf, qlen, qcallback, qquery);
+  ares_free_string(qbuf);
+}
+
+static void qcallback(void *arg, int status, unsigned char *abuf, int alen)
+{
+  struct qquery *qquery = (struct qquery *) arg;
+  unsigned int ancount;
+  int rcode;
+
+  if (status != ARES_SUCCESS)
+    qquery->callback(qquery->arg, status, abuf, alen);
+  else
+    {
+      /* Pull the response code and answer count from the packet. */
+      rcode = DNS_HEADER_RCODE(abuf);
+      ancount = DNS_HEADER_ANCOUNT(abuf);
+
+      /* Convert errors. */
+      switch (rcode)
+	{
+	case NOERROR:
+	  status = (ancount > 0) ? ARES_SUCCESS : ARES_ENODATA;
+	  break;
+	case FORMERR:
+	  status = ARES_EFORMERR;
+	  break;
+	case SERVFAIL:
+	  status = ARES_ESERVFAIL;
+	  break;
+	case NXDOMAIN:
+	  status = ARES_ENOTFOUND;
+	  break;
+	case NOTIMP:
+	  status = ARES_ENOTIMP;
+	  break;
+	case REFUSED:
+	  status = ARES_EREFUSED;
+	  break;
+	}
+      qquery->callback(qquery->arg, status, abuf, alen);
+    }
+  free(qquery);
+}

ares/ares_search.3

@@ -0,0 +1,144 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_SEARCH 3 "24 July 1998"
+.SH NAME
+ares_search \- Initiate a DNS query with domain search
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	unsigned char *\fIabuf\fP, int \fIalen\fP)
+.PP
+.B void ares_search(ares_channel \fIchannel\fP, const char *\fIname\fP,
+.B 	int \fIdnsclass\fP, int \fItype\fP, ares_callback \fIcallback\fP,
+.B	void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_search
+function initiates a series of single-question DNS queries on the name
+service channel identified by
+.IR channel ,
+using the channel's search domains as well as a host alias file given
+by the HOSTALIAS environment variable.  The parameter
+.I name
+gives the alias name or the base of the query name as a NUL-terminated
+C string of period-separated labels; if it ends with a period, the
+channel's search domains will not be used.  Periods and backslashes
+within a label must be escaped with a backslash.  The parameters
+.I dnsclass
+and
+.I type
+give the class and type of the query using the values defined in
+.BR <arpa/nameser.h> .
+When the query sequence is complete or has failed, the ares library
+will invoke
+.IR callback .
+Completion or failure of the query sequence may happen immediately, or
+may happen during a later call to
+.BR ares_process (3)
+or
+.BR ares_destroy (3).
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_search
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query sequence ended with a successful query
+and, if not, how the query sequence failed.  It may have any of the
+following values:
+.TP 19
+.B ARES_SUCCESS
+A query completed successfully.
+.TP 19
+.B ARES_ENODATA
+No query completed successfully; when the query was tried without a
+search domain appended, a response was returned with no answers.
+.TP 19
+.B ARES_EFORMERR
+A query completed but the server claimed that the query was
+malformatted.
+.TP 19
+.B ARES_ESERVFAIL
+No query completed successfully; when the query was tried without a
+search domain appended, the server claimed to have experienced a
+failure.  (This code can only occur if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_ENOTFOUND
+No query completed successfully; when the query was tried without a
+search domain appended, the server reported that the queried-for
+domain name was not found.
+.TP 19
+.B ARES_ENOTIMP
+A query completed but the server does not implement the operation
+requested by the query.  (This code can only occur if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_EREFUSED
+A query completed but the server refused the query.  (This code can
+only occur returned if the
+.B ARES_FLAG_NOCHECKRESP
+flag was specified at channel initialization time; otherwise, such
+responses are ignored at the
+.BR ares_send (3)
+level.)
+.TP 19
+.B ARES_TIMEOUT
+No name servers responded to a query within the timeout period.
+.TP 19
+.B ARES_ECONNREFUSED
+No name servers could be contacted.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.PP
+If a query completed successfully, the callback argument
+.I abuf
+points to a result buffer of length
+.IR alen .
+If the query did not complete successfully,
+.I abuf
+will usually be NULL and
+.I alen
+will usually be 0, but in some cases an unsuccessful query result may
+be placed in
+.IR abuf .
+.SH SEE ALSO
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_search.c

@@ -0,0 +1,273 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#endif
+
+#include "ares.h"
+#include "ares_private.h"
+
+struct search_query {
+  /* Arguments passed to ares_search */
+  ares_channel channel;
+  char *name;			/* copied into an allocated buffer */
+  int dnsclass;
+  int type;
+  ares_callback callback;
+  void *arg;
+
+  int status_as_is;		/* error status from trying as-is */
+  int next_domain;		/* next search domain to try */
+  int trying_as_is;		/* current query is for name as-is */
+};
+
+static void search_callback(void *arg, int status, unsigned char *abuf,
+			    int alen);
+static void end_squery(struct search_query *squery, int status,
+		       unsigned char *abuf, int alen);
+static int cat_domain(const char *name, const char *domain, char **s);
+static int single_domain(ares_channel channel, const char *name, char **s);
+
+void ares_search(ares_channel channel, const char *name, int dnsclass,
+		 int type, ares_callback callback, void *arg)
+{
+  struct search_query *squery;
+  char *s;
+  const char *p;
+  int status, ndots;
+
+  /* If name only yields one domain to search, then we don't have
+   * to keep extra state, so just do an ares_query().
+   */
+  status = single_domain(channel, name, &s);
+  if (status != ARES_SUCCESS)
+    {
+      callback(arg, status, NULL, 0);
+      return;
+    }
+  if (s)
+    {
+      ares_query(channel, s, dnsclass, type, callback, arg);
+      free(s);
+      return;
+    }
+
+  /* Allocate a search_query structure to hold the state necessary for
+   * doing multiple lookups.
+   */
+  squery = malloc(sizeof(struct search_query));
+  if (!squery)
+    {
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+  squery->channel = channel;
+  squery->name = strdup(name);
+  if (!squery->name)
+    {
+      free(squery);
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+  squery->dnsclass = dnsclass;
+  squery->type = type;
+  squery->status_as_is = -1;
+  squery->callback = callback;
+  squery->arg = arg;
+
+  /* Count the number of dots in name. */
+  ndots = 0;
+  for (p = name; *p; p++)
+    {
+      if (*p == '.')
+	ndots++;
+    }
+
+  /* If ndots is at least the channel ndots threshold (usually 1),
+   * then we try the name as-is first.  Otherwise, we try the name
+   * as-is last.
+   */
+  if (ndots >= channel->ndots)
+    {
+      /* Try the name as-is first. */
+      squery->next_domain = 0;
+      squery->trying_as_is = 1;
+      ares_query(channel, name, dnsclass, type, search_callback, squery);
+    }
+  else
+    {
+      /* Try the name as-is last; start with the first search domain. */
+      squery->next_domain = 1;
+      squery->trying_as_is = 0;
+      status = cat_domain(name, channel->domains[0], &s);
+      if (status == ARES_SUCCESS)
+	{
+	  ares_query(channel, s, dnsclass, type, search_callback, squery);
+	  free(s);
+	}
+      else
+	callback(arg, status, NULL, 0);
+    }
+}
+
+static void search_callback(void *arg, int status, unsigned char *abuf,
+			    int alen)
+{
+  struct search_query *squery = (struct search_query *) arg;
+  ares_channel channel = squery->channel;
+  char *s;
+
+  /* Stop searching unless we got a non-fatal error. */
+  if (status != ARES_ENODATA && status != ARES_ESERVFAIL
+      && status != ARES_ENOTFOUND)
+    end_squery(squery, status, abuf, alen);
+  else
+    {
+      /* Save the status if we were trying as-is. */
+      if (squery->trying_as_is)
+	squery->status_as_is = status;
+      if (squery->next_domain < channel->ndomains)
+	{
+	  /* Try the next domain. */
+	  status = cat_domain(squery->name,
+			      channel->domains[squery->next_domain], &s);
+	  if (status != ARES_SUCCESS)
+	    end_squery(squery, status, NULL, 0);
+	  else
+	    {
+	      squery->trying_as_is = 0;
+	      squery->next_domain++;
+	      ares_query(channel, s, squery->dnsclass, squery->type,
+			 search_callback, squery);
+	      free(s);
+	    }
+	}
+      else if (squery->status_as_is == -1)
+	{
+	  /* Try the name as-is at the end. */
+	  squery->trying_as_is = 1;
+	  ares_query(channel, squery->name, squery->dnsclass, squery->type,
+		     search_callback, squery);
+	}
+      else
+	end_squery(squery, squery->status_as_is, NULL, 0);
+    }
+}
+
+static void end_squery(struct search_query *squery, int status,
+		       unsigned char *abuf, int alen)
+{
+  squery->callback(squery->arg, status, abuf, alen);
+  free(squery->name);
+  free(squery);
+}
+
+/* Concatenate two domains. */
+static int cat_domain(const char *name, const char *domain, char **s)
+{
+  int nlen = strlen(name), dlen = strlen(domain);
+
+  *s = malloc(nlen + 1 + dlen + 1);
+  if (!*s)
+    return ARES_ENOMEM;
+  memcpy(*s, name, nlen);
+  (*s)[nlen] = '.';
+  memcpy(*s + nlen + 1, domain, dlen);
+  (*s)[nlen + 1 + dlen] = 0;
+  return ARES_SUCCESS;
+}
+
+/* Determine if this name only yields one query.  If it does, set *s to
+ * the string we should query, in an allocated buffer.  If not, set *s
+ * to NULL.
+ */
+static int single_domain(ares_channel channel, const char *name, char **s)
+{
+  int len = strlen(name);
+  const char *hostaliases;
+  FILE *fp;
+  char *line = NULL;
+  int linesize, status;
+  const char *p, *q;
+
+  /* If the name contains a trailing dot, then the single query is the name
+   * sans the trailing dot.
+   */
+  if (name[len - 1] == '.')
+    {
+      *s = strdup(name);
+      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
+    }
+
+  if (!(channel->flags & ARES_FLAG_NOALIASES) && !strchr(name, '.'))
+    {
+      /* The name might be a host alias. */
+      hostaliases = getenv("HOSTALIASES");
+      if (hostaliases)
+	{
+	  fp = fopen(hostaliases, "r");
+	  if (fp)
+	    {
+	      while ((status = ares__read_line(fp, &line, &linesize))
+		     == ARES_SUCCESS)
+		{
+		  if (strncasecmp(line, name, len) != 0 ||
+		      !isspace((unsigned char)line[len]))
+		    continue;
+		  p = line + len;
+		  while (isspace((unsigned char)*p))
+		    p++;
+		  if (*p)
+		    {
+		      q = p + 1;
+		      while (*q && !isspace((unsigned char)*q))
+			q++;
+		      *s = malloc(q - p + 1);
+		      if (*s)
+			{
+			  memcpy(*s, p, q - p);
+			  (*s)[q - p] = 0;
+			}
+		      free(line);
+		      fclose(fp);
+		      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
+		    }
+		}
+	      free(line);
+	      fclose(fp);
+	      if (status != ARES_SUCCESS)
+		return status;
+	    }
+	}
+    }
+
+  if (channel->flags & ARES_FLAG_NOSEARCH || channel->ndomains == 0)
+    {
+      /* No domain search to do; just try the name as-is. */
+      *s = strdup(name);
+      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
+    }
+
+  *s = NULL;
+  return ARES_SUCCESS;
+}

ares/ares_send.3

@@ -0,0 +1,117 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_SEND 3 "25 July 1998"
+.SH NAME
+ares_send \- Initiate a DNS query
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	unsigned char *\fIabuf\fP, int \fIalen\fP)
+.PP
+.B
+void ares_send(ares_channel \fIchannel\fP, const unsigned char *\fIqbuf\fP,
+.B 	int \fIqlen\fP, ares_callback \fIcallback\fP, void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_send
+function initiates a DNS query on the name service channel identified
+by
+.IR channel .
+The parameters
+.I qbuf
+and
+.I qlen
+give the DNS query, which should already have been formatted according
+to the DNS protocol.  When the query is complete or has failed, the
+ares library will invoke
+.IR callback .
+Completion or failure of the query may happen immediately, or may
+happen during a later call to
+.BR ares_process (3)
+or
+.BR ares_destroy (3).
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_send
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query succeeded and, if not, how it failed.  It
+may have any of the following values:
+.TP 19
+.B ARES_SUCCESS
+The query completed.
+.TP 19
+.B ARES_EBADQUERY
+The query buffer was poorly formed (was not long enough for a DNS
+header or was too long for TCP transmission).
+.TP 19
+.B ARES_ETIMEOUT
+No name servers responded within the timeout period.
+.TP 19
+.B ARES_ECONNREFUSED
+No name servers could be contacted.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.PP
+If the query completed, the callback argument
+.I abuf
+points to a result buffer of length
+.IR alen .
+If the query did not complete,
+.I abuf
+will be NULL and
+.I alen
+will be 0.
+.PP
+Unless the flag
+.B ARES_FLAG_NOCHECKRESP
+was set at channel initialization time,
+.B ares_send
+will normally ignore responses whose questions do not match the
+questions in
+.IR qbuf ,
+as well as responses with reply codes of
+.BR SERVFAIL ,
+.BR NOTIMP ,
+and
+.BR REFUSED .
+Unlike other query functions in the ares library, however,
+.B ares_send
+does not inspect the header of the reply packet to determine the error
+status, so a callback status of
+.B ARES_SUCCESS
+does not reflect as much about the response as for other query
+functions.
+.SH SEE ALSO
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_send.c

@@ -0,0 +1,104 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+#include "nameser.h"
+#else
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_private.h"
+
+void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
+	       ares_callback callback, void *arg)
+{
+  struct query *query;
+  int i;
+  time_t now;
+
+  /* Verify that the query is at least long enough to hold the header. */
+  if (qlen < HFIXEDSZ || qlen >= (1 << 16))
+    {
+      callback(arg, ARES_EBADQUERY, NULL, 0);
+      return;
+    }
+
+  /* Allocate space for query and allocated fields. */
+  query = malloc(sizeof(struct query));
+  if (!query)
+    {
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+  query->tcpbuf = malloc(qlen + 2);
+  if (!query->tcpbuf)
+    {
+      free(query);
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+  query->skip_server = malloc(channel->nservers * sizeof(int));
+  if (!query->skip_server)
+    {
+      free(query->tcpbuf);
+      free(query);
+      callback(arg, ARES_ENOMEM, NULL, 0);
+      return;
+    }
+
+  /* Compute the query ID.  Start with no timeout. */
+  query->qid = DNS_HEADER_QID(qbuf);
+  query->timeout = 0;
+
+  /* Form the TCP query buffer by prepending qlen (as two
+   * network-order bytes) to qbuf.
+   */
+  query->tcpbuf[0] = (qlen >> 8) & 0xff;
+  query->tcpbuf[1] = qlen & 0xff;
+  memcpy(query->tcpbuf + 2, qbuf, qlen);
+  query->tcplen = qlen + 2;
+
+  /* Fill in query arguments. */
+  query->qbuf = query->tcpbuf + 2;
+  query->qlen = qlen;
+  query->callback = callback;
+  query->arg = arg;
+
+  /* Initialize query status. */
+  query->try = 0;
+  query->server = 0;
+  for (i = 0; i < channel->nservers; i++)
+    query->skip_server[i] = 0;
+  query->using_tcp = (channel->flags & ARES_FLAG_USEVC) || qlen > PACKETSZ;
+  query->error_status = ARES_ECONNREFUSED;
+
+  /* Chain the query into this channel's query list. */
+  query->next = channel->queries;
+  channel->queries = query;
+
+  /* Perform the first query action. */
+  time(&now);
+  ares__send_query(channel, query, now);
+}

ares/ares_strerror.3

@@ -0,0 +1,44 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_STRERROR 3 "25 July 1998"
+.SH NAME
+ares_strerror \- Get the description of an ares library error code
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B const char *ares_strerror(int \fIcode\fP, char **\fImemptr\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_strerror
+function gets the description of the ares library error code
+.IR code ,
+returning the result as a NUL-terminated C string.  A pointer to
+allocated data necessary to compose the error description may be
+stored in the variable pointed to by
+.IR memptr .
+It is the caller's responsibility to invoke
+.BR ares_free_errmem (3)
+with the value of that variable when the error description is no
+longer needed.
+.SH SEE ALSO
+.BR ares_free_errmem (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_strerror.c

@@ -0,0 +1,47 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <assert.h>
+#include "ares.h"
+
+const char *ares_strerror(int code, char **memptr)
+{
+  /* A future implementation may want to handle internationalization.
+   * For now, just return a string literal from a table.
+   */
+  const char *errtext[] = {
+    "Successful completion",
+    "DNS server returned answer with no data",
+    "DNS server claims query was misformatted",
+    "DNS server returned general failure",
+    "Domain name not found",
+    "DNS server does not implement requested operation",
+    "DNS server refused query",
+    "Misformatted DNS query",
+    "Misformatted domain name",
+    "Unsupported address family",
+    "Misformatted DNS reply",
+    "Could not contact DNS servers",
+    "Timeout while contacting DNS servers",
+    "End of file",
+    "Error reading file",
+    "Out of memory"
+  };
+
+  assert(code >= 0 && code < (sizeof(errtext) / sizeof(*errtext)));
+  return errtext[code];
+}

ares/ares_timeout.3

@@ -0,0 +1,64 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_TIMEOUT 3 "25 July 1998"
+.SH NAME
+ares_fds \- Get file descriptors to select on for name service
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B struct timeval *ares_timeout(ares_channel \fIchannel\fP,
+.B	struct timeval *\fImaxtv\fP, struct timeval *\fItvbuf\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_timeout
+function determines the maximum time for which the caller should wait
+before invoking 
+.BR ares_process (3)
+to process timeouts.  The parameter
+.I maxtv
+specifies a existing maximum timeout, or
+.B NULL
+if the caller does not wish to apply a maximum timeout.  The parameter
+.I tvbuf
+must point to a writable buffer of type
+.BR "struct timeval" .
+It is valid for
+.I maxtv
+and
+.I tvbuf
+to have the same value.
+.PP
+If no queries have timeouts pending sooner than the given maximum
+timeout,
+.B ares_timeout
+returns the value of
+.IR maxtv;
+otherwise
+.B ares_timeout
+stores the appropriate timeout value into the buffer pointed to by
+.I tvbuf
+and returns the value of
+.IR tvbuf .
+.SH SEE ALSO
+.BR ares_fds (3),
+.BR ares_process (3)
+.SH AUTHOR
+Greg Hudson, MIT Information Systems
+.br
+Copyright 1998 by the Massachusetts Institute of Technology.

ares/ares_timeout.c

@@ -0,0 +1,67 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+static const char rcsid[] = "$Id$";
+
+#include <sys/types.h>
+
+#ifdef WIN32
+
+#else
+#include <sys/time.h>
+#endif
+
+#include <time.h>
+#include "ares.h"
+#include "ares_private.h"
+
+struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
+			     struct timeval *tvbuf)
+{
+  struct query *query;
+  time_t now;
+  int offset, min_offset;
+
+  /* No queries, no timeout (and no fetch of the current time). */
+  if (!channel->queries)
+    return maxtv;
+
+  /* Find the minimum timeout for the current set of queries. */
+  time(&now);
+  min_offset = -1;
+  for (query = channel->queries; query; query = query->next)
+    {
+      if (query->timeout == 0)
+	continue;
+      offset = query->timeout - now;
+      if (offset < 0)
+	offset = 0;
+      if (min_offset == -1 || offset < min_offset)
+	min_offset = offset;
+    }
+
+  /* If we found a minimum timeout and it's sooner than the one
+   * specified in maxtv (if any), return it.  Otherwise go with
+   * maxtv.
+   */
+  if (min_offset != -1 && (!maxtv || min_offset <= maxtv->tv_sec))
+    {
+      tvbuf->tv_sec = min_offset;
+      tvbuf->tv_usec = 0;
+      return tvbuf;
+    }
+  else
+    return maxtv;
+}

ares/ares_version.c

@@ -0,0 +1,11 @@
+/* $Id$ */
+
+#include "ares_version.h"
+
+char *ares_version(int *version)
+{
+  if(version)
+    *version = ARES_VERSION;
+
+  return ARES_VERSION_STR;
+}

ares/ares_version.h

@@ -0,0 +1,17 @@
+/* $Id$ */
+
+#ifndef ARES__VERSION_H
+#define ARES__VERSION_H
+
+#define ARES_VERSION_MAJOR 1
+#define ARES_VERSION_MINOR 0
+#define ARES_VERSION_PATCH 0
+#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
+                       (ARES_VERSION_MINOR<<8)|\
+                       (ARES_VERSION_PATCH))
+#define ARES_VERSION_STR "1.0.0"
+
+char *ares_version(int *version);
+
+#endif
+

ares/config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-10-21'
+timestamp='2003-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -98,14 +98,17 @@ trap 'exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -113,15 +116,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -178,7 +179,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
@@ -227,66 +239,47 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 	fi
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -439,8 +432,7 @@ EOF
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
@@ -449,7 +441,7 @@ EOF
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
 	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS)
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -524,8 +516,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -624,10 +615,20 @@ EOF
               }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -661,8 +662,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -720,15 +720,15 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
@@ -756,7 +756,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
@@ -769,13 +768,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
     x86:Interix*:3*)
-	echo i386-pc-interix3
+	echo i586-pc-interix3
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
 	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
+	echo i586-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -818,8 +820,26 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -914,7 +934,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -932,6 +951,23 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -966,9 +1002,6 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -995,9 +1028,12 @@ EOF
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
 	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1014,9 +1050,6 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1098,7 +1131,11 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1134,11 +1171,6 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1157,12 +1189,6 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1283,8 +1309,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 

ares/config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-09-05'
+timestamp='2003-02-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -245,17 +245,19 @@ case $basic_machine in
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
 	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
@@ -294,7 +296,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -315,21 +317,25 @@ case $basic_machine in
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
 	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39 | mipstx39el \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -716,6 +722,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -901,10 +911,6 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -921,6 +927,14 @@ case $basic_machine in
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -977,10 +991,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1027,7 +1037,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
@@ -1113,11 +1123,12 @@ case $os in
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1129,8 +1140,10 @@ case $os in
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1224,6 +1237,12 @@ case $os in
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-none)
 		;;
 	*)

ares/configure.in

@@ -0,0 +1,18 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(ares_init.c)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+AC_CANONICAL_HOST
+case $host_os in
+solaris*)
+	AC_DEFINE(ETC_INET)
+	;;
+esac
+
+AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS(socket, socket)
+
+AC_OUTPUT(Makefile)

ares/install-sh

@@ -0,0 +1,250 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0

ares/maketgz

@@ -0,0 +1,93 @@
+#!/usr/bin/env perl
+
+$version = $ARGV[0];
+
+if($version eq "") {
+    print "Enter version number!\n";
+    exit;
+}
+
+if(!-f "ares.h") {
+    print "run this script in the ares source root dir\n";
+    exit;
+}
+
+if(!-f "configure") {
+    `autoconf`;
+}
+
+@files=`find . -name FILES`;
+
+my @entries;
+
+sub dirpart {
+    my ($file)=@_;
+    my @p=split("/", $file);
+    $p[$#p]=""; # blank the last one
+    my $dir=join("/", @p);
+
+    $dir =~ s/^\.\///; # cut off ./ beginnings
+
+    $dir =~ s/\/$//;  # off / trailers
+
+    if(!$dir) {
+        $dir = ".";
+    }
+
+    return $dir;
+}
+
+sub add {
+    my ($file)=@_;
+
+    my $dir=dirpart($file);
+
+    open(FILE, "<$file");
+    while(<FILE>) {
+        if($_ =~ /^ *\#/) {
+            next;
+        }
+        chomp;
+        push @entries, "$dir/$_";
+    }
+    close(FILE);
+}
+
+for(@files) {
+    chomp;
+    add($_);
+}
+
+sub mkalldir {
+    my ($dir) = @_;
+
+    my @parts = split("/", $dir);
+
+    #print "IN: $dir\n";
+
+    my $sub="";
+    for(@parts) {
+        #print "PART: $_\n";
+
+        $sub .= "$_";
+        if($_ eq "") {
+            next;
+        }
+        mkdir($sub, 0777);
+        #print "make $sub\n";
+        $sub .= "/";
+    }
+    
+}
+
+for(@entries) {
+    my $dir = dirpart("arescurl-$version/$_");
+ #   print "Create $dir\n";
+    mkalldir($dir);
+ #   print "Copy $_ to $dir\n";
+    `cp -p $_ $dir`;
+}
+
+`tar -cf arescurl-$version.tar arescurl-$version`;
+`gzip -9 arescurl-$version.tar`;
+`rm -rf arescurl-$version`;

ares/mkinstalldirs

@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id$
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here

ares/nameser.h

@@ -0,0 +1,205 @@
+/* Windows-only header file provided by liren@vivisimo.com to make his Windows
+   port build */
+
+#include <windows.h>
+#include <sys/types.h>
+
+#define MAXHOSTNAMELEN 256
+
+#define EINPROGRESS WSAEINPROGRESS
+
+/* Structure for scatter/gather I/O.  */
+struct iovec
+{
+    void *iov_base;     /* Pointer to data.  */
+    size_t iov_len;     /* Length of data.  */
+};
+
+#define getpid() _getpid()
+
+int strcasecmp(const char *a, const char *b);
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+
+#define NS_CMPRSFLGS  0xc0  
+
+
+  /* Flag bits indicating name compression. */
+#define INDIR_MASK    NS_CMPRSFLGS
+
+typedef enum __ns_class {
+    ns_c_invalid = 0,       /* Cookie. */
+    ns_c_in = 1,            /* Internet. */
+    ns_c_2 = 2,             /* unallocated/unsupported. */
+    ns_c_chaos = 3,         /* MIT Chaos-net. */
+    ns_c_hs = 4,            /* MIT Hesiod. */
+    /* Query class values which do not appear in resource records */
+    ns_c_none = 254,        /* for prereq. sections in update requests */
+    ns_c_any = 255,         /* Wildcard match. */
+        ns_c_max = 65536
+} ns_class;
+
+#define C_IN           ns_c_in
+
+typedef enum __ns_type {
+    ns_t_invalid = 0,       /* Cookie. */
+    ns_t_a = 1,             /* Host address. */
+    ns_t_ns = 2,            /* Authoritative server. */
+    ns_t_md = 3,            /* Mail destination. */
+    ns_t_mf = 4,            /* Mail forwarder. */
+    ns_t_cname = 5,         /* Canonical name. */
+    ns_t_soa = 6,           /* Start of authority zone. */
+    ns_t_mb = 7,            /* Mailbox domain name. */
+    ns_t_mg = 8,            /* Mail group member. */
+    ns_t_mr = 9,            /* Mail rename name. */
+    ns_t_null = 10,         /* Null resource record. */
+    ns_t_wks = 11,          /* Well known service. */
+    ns_t_ptr = 12,          /* Domain name pointer. */
+    ns_t_hinfo = 13,        /* Host information. */
+    ns_t_minfo = 14,        /* Mailbox information. */
+    ns_t_mx = 15,           /* Mail routing information. */
+    ns_t_txt = 16,          /* Text strings. */
+    ns_t_rp = 17,           /* Responsible person. */
+    ns_t_afsdb = 18,        /* AFS cell database. */
+    ns_t_x25 = 19,          /* X_25 calling address. */
+    ns_t_isdn = 20,         /* ISDN calling address. */
+    ns_t_rt = 21,           /* Router. */
+    ns_t_nsap = 22,         /* NSAP address. */
+    ns_t_nsap_ptr = 23,     /* Reverse NSAP lookup (deprecated). */
+    ns_t_sig = 24,          /* Security signature. */
+    ns_t_key = 25,          /* Security key. */
+    ns_t_px = 26,           /* X.400 mail mapping. */
+    ns_t_gpos = 27,         /* Geographical position (withdrawn). */
+    ns_t_aaaa = 28,         /* Ip6 Address. */
+    ns_t_loc = 29,          /* Location Information. */
+    ns_t_nxt = 30,          /* Next domain (security). */
+    ns_t_eid = 31,          /* Endpoint identifier. */
+    ns_t_nimloc = 32,       /* Nimrod Locator. */
+    ns_t_srv = 33,          /* Server Selection. */
+    ns_t_atma = 34,         /* ATM Address */
+    ns_t_naptr = 35,        /* Naming Authority PoinTeR */
+    ns_t_kx = 36,           /* Key Exchange */
+    ns_t_cert = 37,         /* Certification record */
+    ns_t_a6 = 38,           /* IPv6 address (deprecates AAAA) */
+    ns_t_dname = 39,        /* Non-terminal DNAME (for IPv6) */
+    ns_t_sink = 40,         /* Kitchen sink (experimentatl) */
+    ns_t_opt = 41,          /* EDNS0 option (meta-RR) */
+    ns_t_tsig = 250,        /* Transaction signature. */
+    ns_t_ixfr = 251,        /* Incremental zone transfer. */
+    ns_t_axfr = 252,        /* Transfer zone of authority. */
+    ns_t_mailb = 253,       /* Transfer mailbox records. */
+    ns_t_maila = 254,       /* Transfer mail agent records. */
+    ns_t_any = 255,         /* Wildcard match. */
+    ns_t_zxfr = 256,        /* BIND-specific, nonstandard. */
+    ns_t_max = 65536
+} ns_type;
+
+#define T_PTR          ns_t_ptr
+#define T_A            ns_t_a
+
+
+#define NS_DEFAULTPORT        53      /* For both TCP and UDP. */
+#define NAMESERVER_PORT        NS_DEFAULTPORT
+
+#define NS_HFIXEDSZ   12      /* #/bytes of fixed data in header */
+#define HFIXEDSZ      NS_HFIXEDSZ
+
+#define NS_QFIXEDSZ   4       /* #/bytes of fixed data in query */
+#define QFIXEDSZ       NS_QFIXEDSZ
+
+typedef enum __ns_opcode {
+    ns_o_query = 0,         /* Standard query. */
+    ns_o_iquery = 1,        /* Inverse query (deprecated/unsupported). */
+    ns_o_status = 2,        /* Name server status query (unsupported). */
+                                /* Opcode 3 is undefined/reserved. */
+    ns_o_notify = 4,        /* Zone change notification. */
+    ns_o_update = 5,        /* Zone update message. */
+        ns_o_max = 6
+} ns_opcode;
+
+#define QUERY          ns_o_query
+
+#define NS_MAXLABEL   63 
+#define MAXLABEL       NS_MAXLABEL
+
+#define NS_RRFIXEDSZ  10      /* #/bytes of fixed data in r record */
+#define RRFIXEDSZ      NS_RRFIXEDSZ
+
+#define T_CNAME                ns_t_cname
+
+
+#define NS_PACKETSZ   512     /* maximum packet size */
+#define PACKETSZ       NS_PACKETSZ
+
+typedef enum __ns_rcode {
+    ns_r_noerror = 0,       /* No error occurred. */
+    ns_r_formerr = 1,       /* Format error. */
+    ns_r_servfail = 2,      /* Server failure. */
+    ns_r_nxdomain = 3,      /* Name error. */
+    ns_r_notimpl = 4,       /* Unimplemented. */
+    ns_r_refused = 5,       /* Operation refused. */
+    /* these are for BIND_UPDATE */
+    ns_r_yxdomain = 6,      /* Name exists */
+    ns_r_yxrrset = 7,       /* RRset exists */
+    ns_r_nxrrset = 8,       /* RRset does not exist */
+    ns_r_notauth = 9,       /* Not authoritative for zone */
+    ns_r_notzone = 10,      /* Zone of record different from zone section */
+    ns_r_max = 11,
+    /* The following are TSIG extended errors */
+    ns_r_badsig = 16,
+    ns_r_badkey = 17,
+        ns_r_badtime = 18
+} ns_rcode;
+
+#define SERVFAIL       ns_r_servfail
+#define NOTIMP         ns_r_notimpl
+#define REFUSED        ns_r_refused
+#define NOERROR                ns_r_noerror
+#define FORMERR                ns_r_formerr
+#define NXDOMAIN       ns_r_nxdomain
+
+#define C_CHAOS                ns_c_chaos
+#define C_HS            ns_c_hs
+#define C_NONE          ns_c_none
+#define C_ANY           ns_c_any
+
+#define T_A             ns_t_a
+#define T_NS            ns_t_ns
+#define T_MD            ns_t_md
+#define T_MF            ns_t_mf
+#define T_CNAME         ns_t_cname
+#define T_SOA           ns_t_soa
+#define T_MB            ns_t_mb
+#define T_MG            ns_t_mg
+#define T_MR            ns_t_mr
+#define T_NULL          ns_t_null
+#define T_WKS           ns_t_wks
+#define T_PTR           ns_t_ptr
+#define T_HINFO         ns_t_hinfo
+#define T_MINFO         ns_t_minfo
+#define T_MX            ns_t_mx
+#define T_TXT           ns_t_txt
+#define T_RP            ns_t_rp
+#define T_AFSDB         ns_t_afsdb
+#define T_X25           ns_t_x25
+#define T_ISDN          ns_t_isdn
+#define T_RT            ns_t_rt
+#define T_NSAP          ns_t_nsap
+#define T_NSAP_PTR      ns_t_nsap_ptr
+#define T_SIG           ns_t_sig
+#define T_KEY           ns_t_key
+#define T_PX            ns_t_px
+#define T_GPOS          ns_t_gpos
+#define T_AAAA          ns_t_aaaa
+#define T_LOC           ns_t_loc
+#define T_NXT           ns_t_nxt
+#define T_EID           ns_t_eid
+#define T_NIMLOC        ns_t_nimloc
+#define T_SRV           ns_t_srv
+#define T_ATMA          ns_t_atma
+#define T_NAPTR         ns_t_naptr
+#define T_TSIG          ns_t_tsig
+#define T_IXFR          ns_t_ixfr
+#define T_AXFR          ns_t_axfr
+#define T_MAILB         ns_t_mailb
+#define T_MAILA         ns_t_maila
+#define T_ANY           ns_t_any

ares/vc/adig/adig.dep

@@ -0,0 +1,2 @@
+# Microsoft Developer Studio Generated Dependency File, included by adig.mak
+

ares/vc/adig/adig.dsp

@@ -0,0 +1,106 @@
+# Microsoft Developer Studio Project File - Name="adig" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=adig - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "adig.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "adig.mak" CFG="adig - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "adig - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "adig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "adig - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\areslib\Release"
+
+!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\areslib\Debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "adig - Win32 Release"
+# Name "adig - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\adig.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\getopt.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

ares/vc/adig/adig.mak

@@ -0,0 +1,213 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on adig.dsp
+!IF "$(CFG)" == ""
+CFG=adig - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to adig - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "adig - Win32 Release" && "$(CFG)" != "adig - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "adig.mak" CFG="adig - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "adig - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "adig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "adig - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\adig.exe"
+
+!ELSE 
+
+ALL : "areslib - Win32 Release" "$(OUTDIR)\adig.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"areslib - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\adig.obj"
+	-@erase "$(INTDIR)\getopt.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\adig.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\adig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\adig.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\adig.pdb" /machine:I386 /out:"$(OUTDIR)\adig.exe" /libpath:"..\areslib\Release" 
+LINK32_OBJS= \
+	"$(INTDIR)\adig.obj" \
+	"$(INTDIR)\getopt.obj" \
+	"..\areslib\Release\areslib.lib"
+
+"$(OUTDIR)\adig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\adig.exe"
+
+!ELSE 
+
+ALL : "areslib - Win32 Debug" "$(OUTDIR)\adig.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"areslib - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\adig.obj"
+	-@erase "$(INTDIR)\getopt.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\adig.exe"
+	-@erase "$(OUTDIR)\adig.ilk"
+	-@erase "$(OUTDIR)\adig.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\adig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\adig.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\adig.pdb" /debug /machine:I386 /out:"$(OUTDIR)\adig.exe" /pdbtype:sept /libpath:"..\areslib\Debug" 
+LINK32_OBJS= \
+	"$(INTDIR)\adig.obj" \
+	"$(INTDIR)\getopt.obj" \
+	"..\areslib\Debug\areslib.lib"
+
+"$(OUTDIR)\adig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("adig.dep")
+!INCLUDE "adig.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "adig.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "adig - Win32 Release" || "$(CFG)" == "adig - Win32 Debug"
+SOURCE=..\..\adig.c
+
+"$(INTDIR)\adig.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\getopt.c
+
+"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "adig - Win32 Release"
+
+"areslib - Win32 Release" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
+   cd "..\adig"
+
+"areslib - Win32 ReleaseCLEAN" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\adig"
+
+!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
+
+"areslib - Win32 Debug" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
+   cd "..\adig"
+
+"areslib - Win32 DebugCLEAN" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\adig"
+
+!ENDIF 
+
+
+!ENDIF 
+

ares/vc/adig/adig.plg

@@ -0,0 +1,77 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: areslib - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615A.tmp" with contents
+[
+/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"Release/areslib.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
+"Z:\ARES-1.1.1\ares_gethostbyname.c"
+"Z:\ARES-1.1.1\ares_init.c"
+]
+Creating command line "cl.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615A.tmp" 
+Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615B.tmp" with contents
+[
+/nologo /out:"Release\areslib.lib" 
+".\Release\ares__close_sockets.obj"
+".\Release\ares__get_hostent.obj"
+".\Release\ares__read_line.obj"
+".\Release\ares_destroy.obj"
+".\Release\ares_expand_name.obj"
+".\Release\ares_fds.obj"
+".\Release\ares_free_errmem.obj"
+".\Release\ares_free_hostent.obj"
+".\Release\ares_free_string.obj"
+".\Release\ares_gethostbyaddr.obj"
+".\Release\ares_gethostbyname.obj"
+".\Release\ares_init.obj"
+".\Release\ares_mkquery.obj"
+".\Release\ares_parse_a_reply.obj"
+".\Release\ares_parse_ptr_reply.obj"
+".\Release\ares_process.obj"
+".\Release\ares_query.obj"
+".\Release\ares_search.obj"
+".\Release\ares_send.obj"
+".\Release\ares_strerror.obj"
+".\Release\ares_timeout.obj"
+".\Release\windows_port.obj"
+]
+Creating command line "link.exe -lib @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615B.tmp"
+<h3>Output Window</h3>
+Compiling...
+ares_gethostbyname.c
+Z:\ARES-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_init.c
+Z:\ARES-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+Z:\ARES-1.1.1\ares_init.c(141) : warning C4013: '_getpid' undefined; assuming extern returning int
+Z:\ARES-1.1.1\ares_init.c(236) : warning C4101: 'p' : unreferenced local variable
+Z:\ARES-1.1.1\ares_init.c(237) : warning C4101: 'linesize' : unreferenced local variable
+Z:\ARES-1.1.1\ares_init.c(235) : warning C4101: 'fp' : unreferenced local variable
+Creating library...
+<h3>
+--------------------Configuration: adig - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615C.tmp" with contents
+[
+wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"Release/adig.pdb" /machine:I386 /out:"Release/adig.exe" /libpath:"..\areslib\Release" 
+".\Release\adig.obj"
+".\Release\getopt.obj"
+"\ARES-1.1.1\vc\areslib\Release\areslib.lib"
+]
+Creating command line "link.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615C.tmp"
+<h3>Output Window</h3>
+Linking...
+
+
+
+<h3>Results</h3>
+adig.exe - 0 error(s), 6 warning(s)
+</pre>
+</body>
+</html>

ares/vc/ahost/ahost.dep

@@ -0,0 +1,2 @@
+# Microsoft Developer Studio Generated Dependency File, included by ahost.mak
+

ares/vc/ahost/ahost.dsp

@@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="ahost" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=ahost - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ahost.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ahost.mak" CFG="ahost - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ahost - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ahost - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ahost - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\areslib\Release"
+
+!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\areslib\Debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ahost - Win32 Release"
+# Name "ahost - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\ahost.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

ares/vc/ahost/ahost.mak

@@ -0,0 +1,223 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on ahost.dsp
+!IF "$(CFG)" == ""
+CFG=ahost - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ahost - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "ahost - Win32 Release" && "$(CFG)" != "ahost - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ahost.mak" CFG="ahost - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ahost - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ahost - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ahost - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\ahost.exe"
+
+!ELSE 
+
+ALL : "areslib - Win32 Release" "$(OUTDIR)\ahost.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"areslib - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\ahost.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\ahost.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\ahost.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ahost.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ahost.pdb" /machine:I386 /out:"$(OUTDIR)\ahost.exe" /libpath:"..\areslib\Release" 
+LINK32_OBJS= \
+	"$(INTDIR)\ahost.obj" \
+	"..\areslib\Release\areslib.lib"
+
+"$(OUTDIR)\ahost.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\ahost.exe" "$(OUTDIR)\ahost.bsc"
+
+!ELSE 
+
+ALL : "areslib - Win32 Debug" "$(OUTDIR)\ahost.exe" "$(OUTDIR)\ahost.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"areslib - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\ahost.obj"
+	-@erase "$(INTDIR)\ahost.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\ahost.bsc"
+	-@erase "$(OUTDIR)\ahost.exe"
+	-@erase "$(OUTDIR)\ahost.ilk"
+	-@erase "$(OUTDIR)\ahost.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ahost.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ahost.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\ahost.sbr"
+
+"$(OUTDIR)\ahost.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ahost.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ahost.exe" /pdbtype:sept /libpath:"..\areslib\Debug" 
+LINK32_OBJS= \
+	"$(INTDIR)\ahost.obj" \
+	"..\areslib\Debug\areslib.lib"
+
+"$(OUTDIR)\ahost.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("ahost.dep")
+!INCLUDE "ahost.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "ahost.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "ahost - Win32 Release" || "$(CFG)" == "ahost - Win32 Debug"
+SOURCE=..\..\ahost.c
+
+!IF  "$(CFG)" == "ahost - Win32 Release"
+
+
+"$(INTDIR)\ahost.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
+
+
+"$(INTDIR)\ahost.obj"	"$(INTDIR)\ahost.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ahost - Win32 Release"
+
+"areslib - Win32 Release" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
+   cd "..\ahost"
+
+"areslib - Win32 ReleaseCLEAN" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\ahost"
+
+!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
+
+"areslib - Win32 Debug" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
+   cd "..\ahost"
+
+"areslib - Win32 DebugCLEAN" : 
+   cd "\ARES-1.1.1\vc\areslib"
+   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\ahost"
+
+!ENDIF 
+
+
+!ENDIF 
+

ares/vc/ahost/ahost.plg

@@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: ahost - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+ahost.exe - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>

ares/vc/areslib/areslib.dep

@@ -0,0 +1,2 @@
+# Microsoft Developer Studio Generated Dependency File, included by areslib.mak
+

ares/vc/areslib/areslib.dsp

@@ -0,0 +1,196 @@
+# Microsoft Developer Studio Project File - Name="areslib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=areslib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "areslib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "areslib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "areslib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "areslib - Win32 Release"
+# Name "areslib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\ares__close_sockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares__get_hostent.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares__read_line.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_destroy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_expand_name.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_fds.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_free_errmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_free_hostent.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_free_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_gethostbyaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_gethostbyname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_mkquery.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_parse_a_reply.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_parse_ptr_reply.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_process.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_query.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_search.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_send.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_strerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_timeout.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\windows_port.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\ares.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_dns.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ares_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\nameser.h
+# End Source File
+# End Group
+# End Target
+# End Project

ares/vc/areslib/areslib.mak

@@ -0,0 +1,361 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on areslib.dsp
+!IF "$(CFG)" == ""
+CFG=areslib - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to areslib - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "areslib - Win32 Release" && "$(CFG)" != "areslib - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "areslib - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\areslib.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ares__close_sockets.obj"
+	-@erase "$(INTDIR)\ares__get_hostent.obj"
+	-@erase "$(INTDIR)\ares__read_line.obj"
+	-@erase "$(INTDIR)\ares_destroy.obj"
+	-@erase "$(INTDIR)\ares_expand_name.obj"
+	-@erase "$(INTDIR)\ares_fds.obj"
+	-@erase "$(INTDIR)\ares_free_errmem.obj"
+	-@erase "$(INTDIR)\ares_free_hostent.obj"
+	-@erase "$(INTDIR)\ares_free_string.obj"
+	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
+	-@erase "$(INTDIR)\ares_gethostbyname.obj"
+	-@erase "$(INTDIR)\ares_init.obj"
+	-@erase "$(INTDIR)\ares_mkquery.obj"
+	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
+	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
+	-@erase "$(INTDIR)\ares_process.obj"
+	-@erase "$(INTDIR)\ares_query.obj"
+	-@erase "$(INTDIR)\ares_search.obj"
+	-@erase "$(INTDIR)\ares_send.obj"
+	-@erase "$(INTDIR)\ares_strerror.obj"
+	-@erase "$(INTDIR)\ares_timeout.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\windows_port.obj"
+	-@erase "$(OUTDIR)\areslib.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\ares__close_sockets.obj" \
+	"$(INTDIR)\ares__get_hostent.obj" \
+	"$(INTDIR)\ares__read_line.obj" \
+	"$(INTDIR)\ares_destroy.obj" \
+	"$(INTDIR)\ares_expand_name.obj" \
+	"$(INTDIR)\ares_fds.obj" \
+	"$(INTDIR)\ares_free_errmem.obj" \
+	"$(INTDIR)\ares_free_hostent.obj" \
+	"$(INTDIR)\ares_free_string.obj" \
+	"$(INTDIR)\ares_gethostbyaddr.obj" \
+	"$(INTDIR)\ares_gethostbyname.obj" \
+	"$(INTDIR)\ares_init.obj" \
+	"$(INTDIR)\ares_mkquery.obj" \
+	"$(INTDIR)\ares_parse_a_reply.obj" \
+	"$(INTDIR)\ares_parse_ptr_reply.obj" \
+	"$(INTDIR)\ares_process.obj" \
+	"$(INTDIR)\ares_query.obj" \
+	"$(INTDIR)\ares_search.obj" \
+	"$(INTDIR)\ares_send.obj" \
+	"$(INTDIR)\ares_strerror.obj" \
+	"$(INTDIR)\ares_timeout.obj" \
+	"$(INTDIR)\windows_port.obj"
+
+"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "areslib - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\areslib.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ares__close_sockets.obj"
+	-@erase "$(INTDIR)\ares__get_hostent.obj"
+	-@erase "$(INTDIR)\ares__read_line.obj"
+	-@erase "$(INTDIR)\ares_destroy.obj"
+	-@erase "$(INTDIR)\ares_expand_name.obj"
+	-@erase "$(INTDIR)\ares_fds.obj"
+	-@erase "$(INTDIR)\ares_free_errmem.obj"
+	-@erase "$(INTDIR)\ares_free_hostent.obj"
+	-@erase "$(INTDIR)\ares_free_string.obj"
+	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
+	-@erase "$(INTDIR)\ares_gethostbyname.obj"
+	-@erase "$(INTDIR)\ares_init.obj"
+	-@erase "$(INTDIR)\ares_mkquery.obj"
+	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
+	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
+	-@erase "$(INTDIR)\ares_process.obj"
+	-@erase "$(INTDIR)\ares_query.obj"
+	-@erase "$(INTDIR)\ares_search.obj"
+	-@erase "$(INTDIR)\ares_send.obj"
+	-@erase "$(INTDIR)\ares_strerror.obj"
+	-@erase "$(INTDIR)\ares_timeout.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\windows_port.obj"
+	-@erase "$(OUTDIR)\areslib.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\ares__close_sockets.obj" \
+	"$(INTDIR)\ares__get_hostent.obj" \
+	"$(INTDIR)\ares__read_line.obj" \
+	"$(INTDIR)\ares_destroy.obj" \
+	"$(INTDIR)\ares_expand_name.obj" \
+	"$(INTDIR)\ares_fds.obj" \
+	"$(INTDIR)\ares_free_errmem.obj" \
+	"$(INTDIR)\ares_free_hostent.obj" \
+	"$(INTDIR)\ares_free_string.obj" \
+	"$(INTDIR)\ares_gethostbyaddr.obj" \
+	"$(INTDIR)\ares_gethostbyname.obj" \
+	"$(INTDIR)\ares_init.obj" \
+	"$(INTDIR)\ares_mkquery.obj" \
+	"$(INTDIR)\ares_parse_a_reply.obj" \
+	"$(INTDIR)\ares_parse_ptr_reply.obj" \
+	"$(INTDIR)\ares_process.obj" \
+	"$(INTDIR)\ares_query.obj" \
+	"$(INTDIR)\ares_search.obj" \
+	"$(INTDIR)\ares_send.obj" \
+	"$(INTDIR)\ares_strerror.obj" \
+	"$(INTDIR)\ares_timeout.obj" \
+	"$(INTDIR)\windows_port.obj"
+
+"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("areslib.dep")
+!INCLUDE "areslib.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "areslib.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "areslib - Win32 Release" || "$(CFG)" == "areslib - Win32 Debug"
+SOURCE=..\..\ares__close_sockets.c
+
+"$(INTDIR)\ares__close_sockets.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares__get_hostent.c
+
+"$(INTDIR)\ares__get_hostent.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares__read_line.c
+
+"$(INTDIR)\ares__read_line.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_destroy.c
+
+"$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_expand_name.c
+
+"$(INTDIR)\ares_expand_name.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_fds.c
+
+"$(INTDIR)\ares_fds.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_free_errmem.c
+
+"$(INTDIR)\ares_free_errmem.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_free_hostent.c
+
+"$(INTDIR)\ares_free_hostent.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_free_string.c
+
+"$(INTDIR)\ares_free_string.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_gethostbyaddr.c
+
+"$(INTDIR)\ares_gethostbyaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_gethostbyname.c
+
+"$(INTDIR)\ares_gethostbyname.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_init.c
+
+"$(INTDIR)\ares_init.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_mkquery.c
+
+"$(INTDIR)\ares_mkquery.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_parse_a_reply.c
+
+"$(INTDIR)\ares_parse_a_reply.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_parse_ptr_reply.c
+
+"$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_process.c
+
+"$(INTDIR)\ares_process.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_query.c
+
+"$(INTDIR)\ares_query.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_search.c
+
+"$(INTDIR)\ares_search.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_send.c
+
+"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_strerror.c
+
+"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_timeout.c
+
+"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\windows_port.c
+
+"$(INTDIR)\windows_port.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+

ares/vc/areslib/areslib.plg

@@ -0,0 +1,125 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: areslib - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603D.tmp" with contents
+[
+/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"Release/areslib.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
+"Z:\ares-1.1.1\ares__close_sockets.c"
+"Z:\ares-1.1.1\ares__get_hostent.c"
+"Z:\ares-1.1.1\ares__read_line.c"
+"Z:\ares-1.1.1\ares_destroy.c"
+"Z:\ares-1.1.1\ares_expand_name.c"
+"Z:\ares-1.1.1\ares_fds.c"
+"Z:\ares-1.1.1\ares_free_errmem.c"
+"Z:\ares-1.1.1\ares_free_hostent.c"
+"Z:\ares-1.1.1\ares_free_string.c"
+"Z:\ares-1.1.1\ares_gethostbyaddr.c"
+"Z:\ares-1.1.1\ares_gethostbyname.c"
+"Z:\ares-1.1.1\ares_init.c"
+"Z:\ares-1.1.1\ares_mkquery.c"
+"Z:\ares-1.1.1\ares_parse_a_reply.c"
+"Z:\ares-1.1.1\ares_parse_ptr_reply.c"
+"Z:\ares-1.1.1\ares_process.c"
+"Z:\ares-1.1.1\ares_query.c"
+"Z:\ares-1.1.1\ares_search.c"
+"Z:\ares-1.1.1\ares_send.c"
+"Z:\ares-1.1.1\ares_strerror.c"
+"Z:\ares-1.1.1\ares_timeout.c"
+"Z:\ares-1.1.1\windows_port.c"
+]
+Creating command line "cl.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603D.tmp" 
+Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603E.tmp" with contents
+[
+/nologo /out:"Release\areslib.lib" 
+".\Release\ares__close_sockets.obj"
+".\Release\ares__get_hostent.obj"
+".\Release\ares__read_line.obj"
+".\Release\ares_destroy.obj"
+".\Release\ares_expand_name.obj"
+".\Release\ares_fds.obj"
+".\Release\ares_free_errmem.obj"
+".\Release\ares_free_hostent.obj"
+".\Release\ares_free_string.obj"
+".\Release\ares_gethostbyaddr.obj"
+".\Release\ares_gethostbyname.obj"
+".\Release\ares_init.obj"
+".\Release\ares_mkquery.obj"
+".\Release\ares_parse_a_reply.obj"
+".\Release\ares_parse_ptr_reply.obj"
+".\Release\ares_process.obj"
+".\Release\ares_query.obj"
+".\Release\ares_search.obj"
+".\Release\ares_send.obj"
+".\Release\ares_strerror.obj"
+".\Release\ares_timeout.obj"
+".\Release\windows_port.obj"
+]
+Creating command line "link.exe -lib @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603E.tmp"
+<h3>Output Window</h3>
+Compiling...
+ares__close_sockets.c
+Z:\ares-1.1.1\ares__close_sockets.c(46) : warning C4013: 'close' undefined; assuming extern returning int
+ares__get_hostent.c
+ares__read_line.c
+ares_destroy.c
+ares_expand_name.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_fds.c
+ares_free_errmem.c
+ares_free_hostent.c
+ares_free_string.c
+ares_gethostbyaddr.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_gethostbyname.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_init.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+Z:\ares-1.1.1\ares_init.c(141) : warning C4013: '_getpid' undefined; assuming extern returning int
+Z:\ares-1.1.1\ares_init.c(236) : warning C4101: 'p' : unreferenced local variable
+Z:\ares-1.1.1\ares_init.c(237) : warning C4101: 'linesize' : unreferenced local variable
+Z:\ares-1.1.1\ares_init.c(235) : warning C4101: 'fp' : unreferenced local variable
+ares_mkquery.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_parse_a_reply.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+Z:\ares-1.1.1\ares_parse_a_reply.c(90) : warning C4018: '<' : signed/unsigned mismatch
+ares_parse_ptr_reply.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+Z:\ares-1.1.1\ares_parse_ptr_reply.c(71) : warning C4018: '<' : signed/unsigned mismatch
+ares_process.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_query.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_search.c
+Z:\ares-1.1.1\ares_search.c(229) : warning C4013: 'strncasecmp' undefined; assuming extern returning int
+ares_send.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+ares_strerror.c
+ares_timeout.c
+windows_port.c
+Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
+        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
+Creating library...
+
+
+
+<h3>Results</h3>
+areslib.lib - 0 error(s), 19 warning(s)
+</pre>
+</body>
+</html>

ares/vc/vc.dsw

@@ -0,0 +1,59 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "adig"=".\adig\adig.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name areslib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ahost"=".\ahost\ahost.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name areslib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "areslib"=".\areslib\areslib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

ares/windows_port.c

@@ -0,0 +1,61 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "nameser.h"
+
+int
+strncasecmp(const char *a, const char *b, size_t n)
+{
+    size_t i;
+
+    for (i = 0; i < n; i++) {
+        int c1 = isupper(a[i]) ? tolower(a[i]) : a[i];
+        int c2 = isupper(b[i]) ? tolower(b[i]) : b[i];
+        if (c1 != c2) return c1-c2;
+    }
+    return 0;
+}
+
+int
+strcasecmp(const char *a, const char *b)
+{
+    return strncasecmp(a, b, strlen(a)+1);
+}
+
+int 
+gettimeofday(struct timeval *tv, struct timezone *tz) 
+{
+    FILETIME        ft;
+    LARGE_INTEGER   li;
+    __int64         t;
+    static int      tzflag;
+
+    if (tv)
+    {
+        GetSystemTimeAsFileTime(&ft);
+        li.LowPart  = ft.dwLowDateTime;
+        li.HighPart = ft.dwHighDateTime;
+        t  = li.QuadPart;       /* In 100-nanosecond intervals */
+        //t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+        t /= 10;                /* In microseconds */
+        tv->tv_sec  = (long)(t / 1000000);
+        tv->tv_usec = (long)(t % 1000000);
+    }
+
+#if 0
+    if (tz)
+    {
+        if (!tzflag)
+        {
+            _tzset();
+            tzflag++;
+        }
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime = _daylight;
+    }
+#endif
+
+    return 0;
+}

buildconf

@@ -6,18 +6,19 @@ die(){
 }
 
 #--------------------------------------------------------------------------
-# autoconf 2.50 or newer
+# autoconf 2.57 or newer
 #
+need_autoconf="2.57"
 ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
   echo "buildconf: autoconf not found."
-  echo "            You need autoconf version 2.50 or newer installed."
+  echo "            You need autoconf version $need_autoconf or newer installed."
   exit 1
 fi
 IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "50" || test "$1" -lt "2"; then
+if test "$1" = "2" -a "$2" -lt "57" || test "$1" -lt "2"; then
   echo "buildconf: autoconf version $ac_version found."
-  echo "            You need autoconf version 2.50 or newer installed."
+  echo "            You need autoconf version $need_autoconf or newer installed."
   echo "            If you have a sufficient autoconf installed, but it"
   echo "            is not named 'autoconf', then try setting the"
   echo "            AUTOCONF environment variable."
@@ -48,18 +49,19 @@ fi
 echo "buildconf: autoheader version $ah_version (ok)"
 
 #--------------------------------------------------------------------------
-# automake 1.5 or newer
+# automake 1.7 or newer
 #
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+need_automake="1.7"
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
 if test -z "$am_version"; then
   echo "buildconf: automake not found."
-  echo "            You need automake version 1.5 or newer installed."
+  echo "            You need automake version $need_automake or newer installed."
   exit 1
 fi
 IFS=.; set $am_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "5" || test "$1" -lt "1"; then
+if test "$1" = "1" -a "$2" -lt "7" || test "$1" -lt "1"; then
   echo "buildconf: automake version $am_version found."
-  echo "            You need automake version 1.5 or newer installed."
+  echo "            You need automake version $need_automake or newer installed."
   echo "            If you have a sufficient automake installed, but it"
   echo "            is not named 'autommake', then try setting the"
   echo "            AUTOMAKE environment variable."
@@ -68,32 +70,45 @@ fi
 
 echo "buildconf: automake version $am_version (ok)"
 
+
 #--------------------------------------------------------------------------
-# libtool 1.4 or newer
+# libtool check
 #
 LIBTOOL_WANTED_MAJOR=1
 LIBTOOL_WANTED_MINOR=4
-LIBTOOL_WANTED_PATCH=
-LIBTOOL_WANTED_VERSION=1.4
+LIBTOOL_WANTED_PATCH=2
+LIBTOOL_WANTED_VERSION=1.4.2
 
 libtool=`which glibtool 2>/dev/null`
 if test ! -x "$libtool"; then
   libtool=`which libtool`
 fi
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
+#lt_pversion=`${LIBTOOL:-$libtool} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
+lt_pversion=`$libtool --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
   echo "buildconf: libtool not found."
   echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
   exit 1
 fi
-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$//'`
 IFS=.; set $lt_version; IFS=' '
 lt_status="good"
-if test "$1" = "$LIBTOOL_WANTED_MAJOR"; then
-   if test "$2" -lt "$LIBTOOL_WANTED_MINOR"; then
+
+major=$1
+minor=$2
+patch=$3
+
+if test "$major" = "$LIBTOOL_WANTED_MAJOR"; then
+   if test "$minor" -lt "$LIBTOOL_WANTED_MINOR"; then
       lt_status="bad"
-   elif test ! -z "$LIBTOOL_WANTED_PATCH"; then
-       if test "$3" -lt "$LIBTOOL_WANTED_PATCH"; then
+   elif test -n "$LIBTOOL_WANTED_PATCH"; then
+       if test "$minor" -gt "$LIBTOOL_WANTED_MINOR"; then
+         lt_status="good"
+       elif test -n "$patch"; then
+          if test "$patch" -lt "$LIBTOOL_WANTED_PATCH"; then
+             lt_status="bad"
+          fi
+       else
           lt_status="bad"
        fi
    fi
@@ -104,15 +119,28 @@ if test $lt_status != "good"; then
   exit 1
 fi
 
-echo "buildconf: libtool version $lt_pversion (ok)"
+echo "buildconf: libtool version $lt_version (ok)"
 
+# ------------------------------------------------------------
+
+# run the correct scripts now
+
+echo "buildconf: running libtoolize"
+${LIBTOOLIZE:-libtoolize} --copy --automake || die "The command '${LIBTOOLIZE:-libtoolize}  --copy --automake' failed"
 echo "buildconf: running aclocal"
-aclocal           || die "The command 'aclocal' failed"
+${ACLOCAL:-aclocal}       || die "The command '${AUTOHEADER:-aclocal}' failed"
 echo "buildconf: running autoheader"
-autoheader        || die "The command 'autoheader' failed"
+${AUTOHEADER:-autoheader} || die "The command '${AUTOHEADER:-autoheader}' failed"
 echo "buildconf: running autoconf"
-autoconf          || die "The command 'autoconf' failed"
-echo "buildconf: running automake"
-automake -a       || die "The command 'automake -a' failed"
+${AUTOCONF:-autoconf}     || die "The command '${AUTOCONF:-autoconf}' failed"
 
+if test -d ares; then
+  echo "buildconf: running autoconf in the ares directory"
+  cd ares
+  ${AUTOCONF:-autoconf}     || die "The command '${AUTOCONF:-autoconf}' failed"
+  cd ..
+fi
+
+echo "buildconf: running automake"
+${AUTOMAKE:-automake} -a  || die "The command '${AUTOMAKE:-automake} -a' failed"
 exit 0

configure.ac

@@ -1,9 +1,7 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Ensure that this file is processed with autoconf 2.50 or newer
-dnl Don't even think about removing this check!
-AC_PREREQ(2.50)
+AC_PREREQ(2.57)
 
 dnl We don't know the version number "staticly" so we use a dash here
 AC_INIT(curl, [-], [curl-bug@haxx.se])
@@ -14,12 +12,17 @@ This configure script may be copied, distributed and modified under the
 terms of the curl license; see COPYING for more details])
 
 AC_CONFIG_SRCDIR([lib/urldata.h])
-AM_CONFIG_HEADER(lib/config.h src/config.h tests/server/config.h lib/ca-bundle.h)
+AM_CONFIG_HEADER(lib/config.h src/config.h)
 AM_MAINTAINER_MODE
 
+dnl SED is needed by some of the tools
 AC_PATH_PROG( SED, sed, , $PATH:/usr/bin:/usr/local/bin)
 AC_SUBST(SED)
 
+dnl AR is used by libtool, and try the odd Solaris path too
+AC_PATH_PROG( AR, ar, , $PATH:/usr/bin:/usr/local/bin:/usr/ccs/bin)
+AC_SUBST(AR)
+
 dnl figure out the libcurl version
 VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
 AM_INIT_AUTOMAKE(curl,$VERSION)
@@ -63,6 +66,7 @@ AC_LIBTOOL_WIN32_DLL
 dnl libtool setup
 AM_PROG_LIBTOOL
 
+AC_MSG_CHECKING([if we need -no-undefined])
 case $host in
   *-*-cygwin | *-*-mingw* | *-*-pw32*)
     need_no_undefined=yes
@@ -71,9 +75,23 @@ case $host in
     need_no_undefined=no
     ;;
 esac
-
+AC_MSG_RESULT($need_no_undefined)
 AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
 
+AC_MSG_CHECKING([if we need -mimpure-text])
+case $host in
+  *-*-solaris2*)
+    if test "$GCC" = "yes"; then
+      mimpure="yes"
+    fi
+    ;;
+  *)
+    mimpure=no
+    ;;
+esac
+AC_MSG_RESULT($mimpure)
+AM_CONDITIONAL(MIMPURE, test x$mimpure = xyes)
+
 dnl The install stuff has already been taken care of by the automake stuff
 dnl AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -190,49 +208,6 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
        AC_MSG_RESULT(yes)
 )
 
-
-dnl **********************************************************************
-dnl Checks for IPv6
-dnl **********************************************************************
-
-AC_MSG_CHECKING([whether to enable ipv6])
-AC_ARG_ENABLE(ipv6,
-AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support])
-AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]),
-[ case "$enableval" in
-  no)
-       AC_MSG_RESULT(no)
-       ipv6=no
-       ;;
-  *)   AC_MSG_RESULT(yes)
-       ipv6=yes
-       ;;
-  esac ],
-
-  AC_TRY_RUN([ /* is AF_INET6 available? */
-#include <sys/types.h>
-#include <sys/socket.h>
-main()
-{
- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-   exit(1);
- else
-   exit(0);
-}
-],
-  AC_MSG_RESULT(yes)
-  ipv6=yes,
-  AC_MSG_RESULT(no)
-  ipv6=no,
-  AC_MSG_RESULT(no)
-  ipv6=no
-))
-
-if test "$ipv6" = "yes"; then
-  CURL_CHECK_WORKING_GETADDRINFO
-fi
-
-
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************
@@ -247,7 +222,7 @@ fi
 
 dnl At least one system has been identified to require BOTH nsl and
 dnl socket libs to link properly.
-if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
+if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_lib_socket_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
   AC_MSG_CHECKING([trying both nsl and socket libs])
   my_ac_save_LIBS=$LIBS
   LIBS="-lnsl -lsocket $LIBS"
@@ -296,6 +271,47 @@ AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
        AC_MSG_RESULT(no)
 )
 
+dnl **********************************************************************
+dnl Checks for IPv6
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether to enable ipv6])
+AC_ARG_ENABLE(ipv6,
+AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support])
+AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ipv6=no
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ipv6=yes
+       ;;
+  esac ],
+
+  AC_TRY_RUN([ /* is AF_INET6 available? */
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+   exit(1);
+ else
+   exit(0);
+}
+],
+  AC_MSG_RESULT(yes)
+  ipv6=yes,
+  AC_MSG_RESULT(no)
+  ipv6=no,
+  AC_MSG_RESULT(no)
+  ipv6=no
+))
+
+if test "$ipv6" = "yes"; then
+  CURL_CHECK_WORKING_GETADDRINFO
+fi
+
 dnl **********************************************************************
 dnl Check how non-blocking sockets are set
 dnl **********************************************************************
@@ -349,15 +365,17 @@ dnl Check if the operating system allows programs to write to their own argv[]
 dnl **********************************************************************
 
 AC_MSG_CHECKING([if argv can be written to])
-AC_TRY_RUN([
+AC_RUN_IFELSE([[
 int main(int argc, char ** argv) {
 	argv[0][0] = ' ';
 	return (argv[0][0] == ' ')?0:1;
 }
-	],
+	]],
 	AC_DEFINE(HAVE_WRITABLE_ARGV, 1, [Define this symbol if your OS supports changing the contents of argv])
 	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no),
         AC_MSG_RESULT(no)
+        AC_MSG_WARN([the previous check could not be made default was used])
 )
 
 dnl **********************************************************************
@@ -452,6 +470,97 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl **********************************************************************
+dnl Check for FBopenssl(SPNEGO) libraries
+dnl **********************************************************************
+
+AC_ARG_WITH(spnego,
+  AC_HELP_STRING([--with-spnego=DIR],
+                 [Specify location of SPNEGO library fbopenssl]),
+  [ SPNEGO_ROOT="$withval"
+    want_spnego="yes" ]
+)
+AC_MSG_CHECKING([if SPNEGO support is requested])
+if test x"$want_spnego" = xyes; then
+ 
+  if test -z "$SPNEGO_LIB_DIR"; then
+     LDFLAGS="$LDFLAGS -L$SPNEGO_ROOT $(wl)-R$SPNEGO_ROOT -lfbopenssl"
+  else
+     LDFLAGS="$LDFLAGS $SPNEGO_LIB_DIR"
+  fi
+ 
+  AC_DEFINE(HAVE_SPNEGO, 1, [Define this if you have the SPNEGO library fbopenssl])
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+dnl **********************************************************************
+dnl Check for GSS-API libraries
+dnl **********************************************************************
+
+AC_ARG_WITH(gssapi-includes,
+  AC_HELP_STRING([--with-gssapi-includes=DIR],
+                 [Specify location of GSSAPI header]),
+  [ GSSAPI_INCS="-I$withval" 
+    want_gss="yes" ]
+)
+
+AC_ARG_WITH(gssapi-libs,
+  AC_HELP_STRING([--with-gssapi-libs=DIR],
+  		 [Specify location of GSSAPI libs]),
+  [ GSSAPI_LIBS="-L$withval -lgssapi"
+    want_gss="yes" ]
+)
+
+AC_ARG_WITH(gssapi,
+  AC_HELP_STRING([--with-gssapi=DIR],
+                 [Where to look for GSSAPI]),
+  [ GSSAPI_ROOT="$withval"
+    want_gss="yes" ]
+)
+
+AC_MSG_CHECKING([if GSSAPI support is requested])
+if test x"$want_gss" = xyes; then
+  if test -z "$GSSAPI_INCS"; then
+     if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+     else
+        GSSAPI_INCS=="-I$GSSAPI_ROOT/include"
+     fi
+  fi
+  CPPFLAGS="$CPPFLAGS $GSSAPI_INCS"
+  
+  if test -z "$GSSAPI_LIB_DIR"; then
+     if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+        gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+	LDFLAGS="$LDFLAGS $gss_ldflags"
+     else
+        LDFLAGS="$LDFLAGS $GSSAPI_ROOT/lib -lgssapi"
+     fi
+  else
+     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
+  fi
+
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_GSSAPI, 1, [if you have the gssapi libraries])
+
+  if test -n "$GSSAPI_INCS"; then
+    # cut off the preceding -I from the include path
+    GSSAPI_INCS=`echo $GSSAPI_INCS | sed -e s/^-I//g`
+  fi
+
+  if test -f "$GSSAPI_INCS/gssapi.h"; then
+      AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
+  else
+      AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
+  fi
+  
+else
+  AC_MSG_RESULT(no)
+fi
+  
+
 dnl Detect the pkg-config tool, as it may have extra info about the
 dnl openssl installation we can use. I *believe* this is what we are
 dnl expected to do on really recent Redhat Linux hosts.
@@ -484,6 +593,8 @@ dnl **********************************************************************
 
 dnl Default to compiler & linker defaults for SSL files & libraries.
 OPT_SSL=off
+dnl Default to no CA bundle
+ca="no"
 AC_ARG_WITH(ssl,dnl
 AC_HELP_STRING([--with-ssl=PATH],[where to look for SSL, PATH points to the SSL installation (default: /usr/local/ssl)])
 AC_HELP_STRING([--without-ssl], [disable SSL]),
@@ -567,6 +678,37 @@ else
 
     AC_SUBST(OPENSSL_ENABLED)
 
+    AC_MSG_CHECKING([CA cert bundle install path])
+
+    AC_ARG_WITH(ca-bundle,
+AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])
+AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
+    [ ca="$withval" ],
+    [
+      if test "x$prefix" != xNONE; then
+        ca="\${prefix}/share/curl/curl-ca-bundle.crt"
+      else
+        ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
+      fi
+    ] )
+
+    if test X"$OPT_SSL" = Xno; then
+      ca="no"
+    fi
+
+    if test "x$ca" != "xno"; then
+      CURL_CA_BUNDLE='"'$ca'"'
+      AC_SUBST(CURL_CA_BUNDLE)  
+    fi
+    AC_MSG_RESULT([$ca])
+
+    dnl these can only exist if openssl exists
+
+    AC_CHECK_FUNCS( RAND_status \
+                    RAND_screen \
+                    RAND_egd \
+                    CRYPTO_cleanup_all_ex_data )
+
   fi
 
   if test X"$OPT_SSL" != Xoff &&
@@ -574,15 +716,10 @@ else
     AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
   fi
 
-
-  dnl these can only exist if openssl exists
-
-  AC_CHECK_FUNCS( RAND_status \
-                  RAND_screen \
-                  RAND_egd )
-
 fi
 
+AM_CONDITIONAL(CABUNDLE, test x$ca != xno)
+
 dnl **********************************************************************
 dnl Check for the presence of ZLIB libraries and headers
 dnl **********************************************************************
@@ -625,6 +762,9 @@ case "$OPT_ZLIB" in
     ;;
 esac
 
+dnl set variable for use in automakefile(s)
+AM_CONDITIONAL(HAVE_LIBZ, test x"$HAVE_LIBZ" = x1)
+
 dnl Default is to try the thread-safe versions of a few functions
 OPT_THREAD=on
 
@@ -644,9 +784,17 @@ printf("just fine");
 )
 
 AC_ARG_ENABLE(thread,dnl
-AC_HELP_STRING([--disable-thread],[don't look for thread-safe functions]),
+AC_HELP_STRING([--disable-thread],[don't look for thread-safe functions])
+AC_HELP_STRING([--enable-thread],[look for thread-safe functions]),
+[ case "$enableval" in
+  no)
     OPT_THREAD=off
     AC_MSG_WARN(libcurl will not get built using thread-safe functions)
+    ;;
+  *)
+    ;;
+  esac
+]
 )
 
 if test X"$OPT_THREAD" = Xoff
@@ -735,15 +883,14 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
-# mprintf() checks:
+AC_CHECK_SIZEOF(off_t)
 
-# check for 'long double'
-# AC_CHECK_SIZEOF(long double, 8)
-# check for 'long long'
-# AC_CHECK_SIZEOF(long long, 4)
+AC_CHECK_TYPE(long long,
+   [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports 'long long'])])
 
 # check for ssize_t
-AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(ssize_t, ,
+   AC_DEFINE(ssize_t, int, [the signed version of size_t]))
 
 TYPE_SOCKLEN_T
 TYPE_IN_ADDR_T
@@ -768,11 +915,12 @@ AC_CHECK_FUNCS( socket \
                 gettimeofday \
                 inet_addr \
                 inet_ntoa \
+                inet_pton \
                 tcsetattr \
                 tcgetattr \
                 perror \
                 closesocket \
-                setvbuf \
+                siginterrupt \
                 sigaction \
                 signal \
                 getpass_r \
@@ -820,31 +968,6 @@ AC_PATH_PROGS( NROFF, gnroff nroff, ,
   $PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST(NROFF)
 
-AC_MSG_CHECKING([CA cert bundle install path])
-
-AC_ARG_WITH(ca-bundle,
-AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])
-AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
-   [ ca="$withval" ],
-   [
-  if test "x$prefix" != xNONE; then
-    ca="$prefix/share/curl/curl-ca-bundle.crt"
-  else
-    ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
-  fi
-   ] )
-
-if test "x$ca" = "xno"; then
-  dnl let's not keep "no" as path name, blank it instead
-  ca=""
-else
-  AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [CA bundle full path name])
-fi
-
-CURL_CA_BUNDLE="$ca"
-AC_SUBST(CURL_CA_BUNDLE)
-AC_MSG_RESULT([$ca])
-
 AC_PROG_YACC
 
 dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib, 
@@ -864,10 +987,10 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
        ;;
   *)   AC_MSG_RESULT(yes)
 
-    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
+    CPPFLAGS="$CPPFLAGS -DCURLDEBUG"
     CFLAGS="$CFLAGS -g" 
     if test "$GCC" = "yes"; then
-       CFLAGS="$CFLAGS -W -Wall -Wwrite-strings -pedantic -Wundef -Wpointer-arith -Wnested-externs"
+       CFLAGS="$CFLAGS -W -Wall -Wwrite-strings -pedantic -Wno-long-long -Wundef -Wpointer-arith -Wnested-externs"
     fi
     dnl strip off optimizer flags
     NEWFLAGS=""
@@ -887,6 +1010,31 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
        AC_MSG_RESULT(no)
 )
 
+ares="no"
+AC_MSG_CHECKING([whether to enable ares])
+AC_ARG_ENABLE(ares,
+AC_HELP_STRING([--enable-ares],[Enable using ares for name lookups])
+AC_HELP_STRING([--disable-ares],[Disable using ares for name lookups]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+
+       if test "x$IPV6_ENABLED" = "x1"; then
+         AC_MSG_ERROR([ares doesn't work with ipv6, disable ipv6 to use ares])
+       fi
+
+       AC_DEFINE(USE_ARES, 1, [Define if you want to enable ares support])
+
+       ares="yes"
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+AM_CONDITIONAL(ARES, test x$ares = xyes)
+
 AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
            docs/examples/Makefile \
@@ -907,6 +1055,7 @@ AC_CONFIG_FILES([Makefile \
 	   packages/Linux/RPM/curl.spec \
 	   packages/Linux/RPM/curl-ssl.spec \
            packages/Solaris/Makefile \
+           packages/DOS/Makefile \
            packages/EPM/curl.list \
            packages/EPM/Makefile \
            curl-config

curl-style.el

@@ -37,7 +37,7 @@
   (setq tab-width 8
 	indent-tabs-mode nil		; Use spaces. Not tabs.
 	comment-column 40
-	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t" "size_t" "socklen_t" "fd_set"))
+	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t" "size_t" "socklen_t" "fd_set" "time_t"))
 	)
   ;; keybindings for C, C++, and Objective-C.  We can put these in
   ;; c-mode-base-map because of inheritance ...

docs/BINDINGS

@@ -6,15 +6,20 @@
 
                                libcurl bindings
 
-Creative people have written particular bindings or interfaces for various
-environments and programming languages. Using one of these allows you to take
-advantage of curl powers from within your favourite language or system.
+Creative people have written bindings or interfaces for various environments
+and programming languages. Using one of these allows you to take advantage of
+curl powers from within your favourite language or system.
 
 This is a list of all known interfaces as of this writing.
 
 The bindings listed below are not part of the curl/libcurl distribution
 archives, but must be downloaded and installed separately.
 
+Ada95
+
+  Writtten by Andreas Almroth.
+  http://www.almroth.com/adacurl/index.html
+
 Basic
 
   ScriptBasic bindings to libcurl. Writtten by Peter Verhas.
@@ -22,8 +27,8 @@ Basic
 
 C++
 
-  Maintained by Jean-Philippe Barrette-LaPierre.
-  http://curl.haxx.se/libcurl/cplusplus/
+  Written by Jean-Philippe Barrette-LaPierre.
+  http://www.sourceforge.net/projects/curlpp
 
 Cocoa
 
@@ -35,6 +40,11 @@ Dylan
   Written by Chris Double.
   http://dylanlibs.sourceforge.net/
 
+Euphoria
+
+  Written by Ray Smith.
+  http://rays-web.com/eulibcurl.htm
+
 Java
 
   Written by Daniel Stenberg.
@@ -50,6 +60,11 @@ Object-Pascal
   Free Pascal, Delphi and Kylix binding written by Christophe Espern.
   http://www.tekool.com/opcurl
 
+O'Caml
+
+  Written by Lars Nilsson.
+  http://sourceforge.net/projects/ocurl/
+
 Pascal
 
   Free Pascal, Delphi and Kylix binding written by Jeffrey Pohlmeyer.

docs/BUGS

@@ -8,7 +8,7 @@ $Id$
 BUGS
 
   Curl and libcurl have grown substantially since the beginning. At the time
-  of writing (end of March 2003), there are 35000 lines of source code, and by
+  of writing (August 2003), there are about 40000 lines of source code, and by
   the time you read this it has probably grown even more.
 
   Of course there are lots of bugs left. And lots of misfeatures.
@@ -32,7 +32,7 @@ WHERE TO REPORT
 
 WHAT TO REPORT
 
-  When reporting a bug, you should include information that will help us
+  When reporting a bug, you should include all information that will help us
   understand what's wrong, what you expected to happen and how to repeat the
   bad behavior. You therefore need to tell us:
 
@@ -48,16 +48,15 @@ WHAT TO REPORT
   enable us to help you quicker and more accurately.
 
   Since curl deals with networks, it often helps us if you include a protocol
-  debug dump with your bug report. The output you get by using the -v
-  flag. Usually, you also get more info by using -i so that is likely to be
-  useful when reporting bugs as well.
+  debug dump with your bug report. The output you get by using the -v or
+  --trace options.
 
   If curl crashed, causing a core dump (in unix), there is hardly any use to
   send that huge file to anyone of us. Unless we have an exact same system
-  setup as you, we can't do much with it. What we instead ask of you is to get
-  a stack trace and send that (much smaller) output to us instead!
+  setup as you, we can't do much with it. Instead we ask you to get a stack
+  trace and send that (much smaller) output to us instead!
 
-  The address and how to subscribe to the mailing list is detailed in the
+  The address and how to subscribe to the mailing lists are detailed in the
   MANUAL file.
 
 HOW TO GET A STACK TRACE
@@ -66,7 +65,7 @@ HOW TO GET A STACK TRACE
   don't 'strip' the final executable. Try to avoid optimizing the code as
   well, remove -O, -O2 etc from the compiler options.
 
-  Run the program until it dumps core.
+  Run the program until it cores.
 
   Run your debugger on the core file, like '<debugger> curl core'. <debugger>
   should be replaced with the name of your debugger, in most cases that will

docs/CONTRIBUTE

@@ -58,9 +58,9 @@ Commenting
 
  Comment your source code extensively using C comments (/* comment */), DO NOT
  use C++ comments (// this style). Commented code is quality code and enables
- future modifications much more. Uncommented code much more risk being
- completely replaced when someone wants to extend things, since other persons'
- source code can get quite hard to read.
+ future modifications much more. Uncommented code risk having to be completely
+ replaced when someone wants to extend things, since other persons' source
+ code can get quite hard to read.
 
 General Style
 
@@ -128,7 +128,7 @@ Test Cases
  improve it, all new features and functions that are added need to be tested
  in the test suite. Every feature that is added should get at least one valid
  test case that verifies that it works as documented. If every submitter also
- post a few test cases, it won't end up as a heavy burden on a single person!
+ posts a few test cases, it won't end up as a heavy burden on a single person!
 
 How To Make a Patch
 

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: February 25, 2003 (http://curl.haxx.se/docs/faq.html)
+Updated: June 17, 2003 (http://curl.haxx.se/docs/faq.html)
                                   _   _ ____  _     
                               ___| | | |  _ \| |    
                              / __| | | | |_) | |    
@@ -97,6 +97,12 @@ FAQ
   We spell it cURL or just curl. We pronounce it with an initial k sound:
   [kurl].
 
+  NOTE: there are numerous sub-projects and related projects that also use the
+  word curl in the project names in various combinations, but you should take
+  notice that this FAQ is directed at the command-line tool named curl (and
+  libcurl the library), and may therefore not be valid for other curl
+  projects.
+
   1.2 What is libcurl?
 
   libcurl is a reliable and portable library which provides you with an easy
@@ -132,11 +138,9 @@ FAQ
   better. We do however believe in a few rules when it comes to the future of
   curl:
 
-  * Curl is to remain a command line tool. If you want GUIs or fancy scripting
-    capabilities, you're free to write another tool that uses libcurl and that
-    offers this. There's no point in having a single tool that does every
-    imaginable thing. That's also one of the great advantages of having the
-    core of curl as a library.
+  * Curl -- the command line tool -- is to remain a non-graphical command line
+    tool. If you want GUIs or fancy scripting capabilities, you should look
+    for another tool that uses libcurl.
 
   * We do not add things to curl that other small and available tools already
     do very fine at the side. Curl's output is fine to pipe into another
@@ -589,9 +593,11 @@ FAQ
 
   4.9. Curl can't authenticate to the server that requires NTLM?
 
-  NTLM is a Microsoft proprietary protocol. Unfortunately, curl does not
-  currently support that. Proprietary formats are evil. You should not use
-  such ones.
+  This is supported in curl 7.10.6 or later. No earlier curl version knows
+  of this magic.
+
+  NTLM is a Microsoft proprietary protocol. Proprietary formats are evil. You
+  should not use such ones.
 
   4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
 
@@ -772,6 +778,5 @@ FAQ
   discussions and a large amount of people have contributed with source code
   knowing that this is the license we use. This license puts the restrictions
   we want on curl/libcurl and it does not spread to other programs or
-  libraries that use it. The recent dual license modification should make it
-  possible for everyone to use libcurl or curl in their projects, no matter
-  what license they already have in use.
+  libraries that use it. It should be possible for everyone to use libcurl or
+  curl in their projects, no matter what license they already have in use.

docs/FEATURES

@@ -17,27 +17,31 @@ Misc
  - progress bar/time specs while downloading
  - "standard" proxy environment variables support
  - config file support
- - compiles on win32 (reported built on 29 operating systems)
+ - compiles on win32 (reported builds on 40+ operating systems)
  - redirectable stderr
- - use selected network interface for outgoing traffic
+ - selectable network interface for outgoing traffic
  - IPv6 support
  - persistant connections
+ - socks5 support
+ - supports user name + password in proxy environment variables
+ - operations through proxy "tunnel" (using CONNECT)
 
 HTTP
- - HTTP/1.1 compliant
+ - HTTP/1.1 compliant (optionally uses 1.0)
  - GET
  - PUT
  - HEAD
  - POST
- - multipart POST
- - authentication
+ - multipart formpost (RFC1867-style)
+ - authentication: Basic, Digest, NTLM(*1), GSS-Negotiate/Negotiate(*3) and
+   SPNEGO (*4)
  - resume (both GET and PUT)
  - follow redirects
  - maximum amount of redirects to follow
  - custom HTTP request
  - cookie get/send fully parsed
- - understands the netscape cookie file format
- - custom headers (that can replace/remove internally generated headers)
+ - reads/writes the netscape cookie file format
+ - custom headers (replace/remove internally generated headers)
  - custom user-agent string
  - custom referer string
  - range
@@ -45,17 +49,21 @@ HTTP
  - time conditions
  - via http-proxy
  - retrieve file modification date
+ - Content-Encoding support for deflate and gzip
+ - "Transfer-Encoding: chunked" support for "uploads"
 
 HTTPS (*1)
  - (all the HTTP features)
  - using certificates
  - verify server certificate
  - via http-proxy
+ - select desired encryption
+ - force usage of a specific SSL version (SSLv2, SSLv3 or TLSv1)
 
 FTP
  - download
  - authentication
- - kerberos security
+ - kerberos4 (*5)
  - active/passive using PORT, EPRT, PASV or EPSV
  - single file size information (compare to HTTP HEAD)
  - 'type=' URL support
@@ -90,5 +98,11 @@ GOPHER
 FILE
  - URL support
 
+FOOTNOTES
+=========
+
   *1 = requires OpenSSL
   *2 = requires OpenLDAP
+  *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
+  *4 = requires FBopenssl
+  *5 = requires a krb4 library, such as the MIT one or similar.

docs/INSTALL

@@ -31,6 +31,10 @@ UNIX
    If you have checked out the sources from the CVS repository, read the
    CVS-INFO on how to proceed.
 
+   Get a full listing of all available configure options by invoking it like:
+
+        ./configure --help
+
    If you want to install curl in a different file hierarchy than /usr/local,
    you need to specify that already when running configure:
 
@@ -200,7 +204,14 @@ Win32
         Before running nmake define the OPENSSL_PATH environment variable with
         the root/base directory of OpenSSL, for example:
 
-          set OPENSSL_PATH=c:\openssl-0.9.6b
+          set OPENSSL_PATH=c:\openssl-0.9.7a
+
+        lib/Makefile.vc6 depends on zlib (http://www.gzip.org/zlib/) as well.
+        Please read the zlib documentation on how to compile zlib.  Define the
+        ZLIB_PATH environment variable to the location of zlib.h and zlib.lib,
+        for example:
+
+          set ZLIB_PATH=c:\zlib-1.1.4
 
         Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
         directory.  'nmake vc-ssl' will create a libcurl static and dynamic
@@ -444,6 +455,7 @@ PORTS
         - StrongARM NetBSD 1.4.1
         - Ultrix 4.3a
         - i386 BeOS
+        - i386 DOS
         - i386 FreeBSD
         - i386 HURD
         - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4
@@ -454,10 +466,12 @@ PORTS
         - i386 Solaris 2.7
         - i386 Windows 95, 98, ME, NT, 2000
         - i386 QNX 6
+        - i486 ncr-sysv4.3.03 (NCR MP-RAS)
         - ia64 Linux 2.3.99
         - m68k AmigaOS 3
         - m68k Linux
         - m68k OpenBSD
+        - m88k dg-dgux5.4R3.00
         - s390 Linux 
         - XScale/PXA250 Linux 2.4
 

docs/KNOWN_BUGS

@@ -3,6 +3,40 @@ join in and help us correct one or more of these! Also be sure to check the
 changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
+* CURLOPT_USERPWD and CURLOPT_PROXYUSERPWD have no way of providing user names
+  that contain a colon. This can't be fixed easily in a backwards compatible
+  way without adding new options (and then, they should most probably allow
+  setting user name and password separately).
+
+* libcurl ignores empty path parts in FTP URLs, whereas RFC1738 states that
+  such parts should be sent to the server as 'CWD ' (without an argument).
+  The only exception to this rule, is that we knowingly break this if the
+  empty part is first in the path, as then we use the double slashes to
+  indicate that the user wants to reach the root dir (this exception SHALL
+  remain even when this bug is fixed).
+
+* 1) libcurl does a POST
+  2) receives a 100-continue
+  3) sends away the POST
+  Now, if nothing else is returned from the server, libcurl MUST return
+  CURLE_GOT_NOTHING, but it seems it returns CURLE_OK as it seems to count
+  the 100-continue reply as a good enough reply.
+
+* libcurl doesn't treat the content-length of compressed data properly, as
+  it seems HTTP servers send the *uncompressed* length in that header and
+  libcurl thinks of it as the *compressed* lenght. Some explanations are here:
+  http://curl.haxx.se/mail/lib-2003-06/0146.html
+
+* Downloading 0 (zero) bytes files over FTP will not create a zero byte file
+  locally, which is because libcurl doesn't call the write callback with zero
+  bytes. Explained here: http://curl.haxx.se/mail/archive-2003-04/0143.html
+
+* Using CURLOPT_FAILONERROR (-f/--fail) will make authentication to stop
+  working if you use anything but plain Basic auth.
+
+* IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
+  struct. It has been reported to work on AIX 5.1 though.
+
 * Running 'make test' on Mac OS X gives 4 errors. This seems to be related
   to some kind of libtool problem:
   http://curl.haxx.se/mail/archive-2002-03/0029.html and

docs/MANUAL

@@ -11,7 +11,7 @@ SIMPLE USAGE
 
         curl http://www.netscape.com/
 
-  Get the root README file from funet's ftp-server:
+  Get the README file the user's home directory at funet's ftp-server:
 
         curl ftp://ftp.funet.fi/README
 
@@ -19,7 +19,7 @@ SIMPLE USAGE
 
         curl http://www.weirdserver.com:8000/
 
-  Get a list of the root directory of an FTP site:
+  Get a list of a directory of an FTP site:
 
         curl ftp://cool.haxx.se/
 
@@ -243,7 +243,7 @@ POST (HTTP)
 
   To post to this, you enter a curl command line like:
 
-        curl -d "user=foobar&pass=12345&id=blablabla&dig=submit"  (continues)
+        curl -d "user=foobar&pass=12345&id=blablabla&ding=submit"  (continues)
           http://www.formpost.com/getthis/post.cgi
 
 

docs/Makefile.am

@@ -19,30 +19,28 @@ PDFPAGES = \
 
 SUBDIRS = examples libcurl
 
-EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS		\
+EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	\
 	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
 	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) \
 	     HISTORY INSTALL libcurl-the-guide $(PDFPAGES)
 
-MAN2HTML= gnroff -man $< | man2html >$@
+MAN2HTML= $(NROFF) -man $< | man2html >$@
 
-SUFFIXES = .1 .3 .html .pdf
+SUFFIXES = .1 .html .pdf
 
 html: $(HTMLPAGES)
 	cd libcurl; make html
 
-.3.html:
-	$(MAN2HTML)
+pdf: $(PDFPAGES)
+	cd libcurl; make pdf
 
 .1.html:
 	$(MAN2HTML)
 
-MAN2PDF = groff -Tps -man curl.1 $< >$@
+.1.pdf:
+	@(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \
+	groff -Tps -man $< >$$foo.ps; \
+	ps2pdf $$foo.ps $@; \
+	rm $$foo.ps; \
+	echo "converted $< to $@")
 
-pdf:
-	for file in $(man_MANS); do \
-	  foo=`echo $$file | sed -e 's/\.[0-9]$$//g'`; \
-	  groff -Tps -man $$file >$$foo.ps; \
-	  ps2pdf $$foo.ps $$foo.pdf; \
-	done
-	cd libcurl; make pdf

docs/README.win32

@@ -13,8 +13,8 @@ README.win32
   are win32-based.
 
   The unix-style man pages are tricky to read on windows, so therefore are all
-  those pages also converted to HTML and those are also included in the
-  release archives.
+  those pages converted to HTML as well as pdf, and included in the release
+  archives.
 
   The main curl.1 man page is also "built-in" in the command line tool. Use a
   command line similar to this in order to extract a separate text file:

docs/RESOURCES

@@ -5,14 +5,9 @@
                              \___|\___/|_| \_\_____|
 
 
-This document lists documents that specify standards used by curl, software
-that extends curl, web pages with similar utilities and information pages that
-describe some of the tools that we use to build/compile/develop curl.
+This document lists documents and standards used by curl.
 
-Standards
----------
-
-  RFC 959  - Defines how FTP works
+  RFC 959  - The FTP protocol
 
   RFC 1635 - How to Use Anonymous FTP
 
@@ -75,50 +70,3 @@ Standards
              
   RFC 2965 - HTTP State Management Mechanism. Cookies. Obsoletes RFC2109
 
-Compilers
----------
-  MingW32 - http://www.mingw.org/
-
-  gcc     - http://www.gnu.org/software/gcc/gcc.html
-
-Software
---------
-  OpenSSL -  http://www.openssl.org/
-
-  OpenLDAP - http://www.openldap.org/
-
-  zlib -     http://www.cdrom.com/pub/infozip/zlib/
-
-Similar Tools
--------------
-  wget    - http://sunsite.dk/wget/
-
-  snarf   - http://www.xach.com/snarf/
-
-  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
-
-  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
-
-  Kermit  - http://www.columbia.edu/kermit/ftpclient
-
-  Pavuk   - http://www.idata.sk/~ondrej/pavuk/
-
-  httpr   - http://zwolak.dhs.org/httpr/
-
-  puf     - http://www.inf.tu-dresden.de/~ob6/sw/puf.html
-
-Related Software
-----------------
-  ftpparse - http://cr.yp.to/ftpparse.html parses FTP LIST responses
-
-  autoconf - http://www.gnu.org/software/autoconf/autoconf.html
-
-  automake - http://www.gnu.org/software/automake/automake.html
-
-  bison    - http://www.gnu.org/software/bison/bison.html
-
-  gzip     - http://www.gnu.org/software/gzip/gzip.html
-
-  tar      - http://www.gnu.org/software/tar/tar.html
-
-  libtool  - http://www.gnu.org/software/libtool/libtool.html