BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / net / res_query.c

diff --git a/usr/src/lib/libc/net/res_query.c b/usr/src/lib/libc/net/res_query.c
index dface1e..995be0e 100644 (file)
--- a/usr/src/lib/libc/net/res_query.c
+++ b/usr/src/lib/libc/net/res_query.c
@@ -2,36 +2,50 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)res_query.c        5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)res_query.c        5.11 (Berkeley) 3/6/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>

-#include <sys/socket.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

-#include <ctype.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>

 #include <netdb.h>
 #include <netdb.h>

+#include <resolv.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <resolv.h>

 
 #if PACKETSZ > 1024
 #define MAXPACKET      PACKETSZ
 
 #if PACKETSZ > 1024
 #define MAXPACKET      PACKETSZ


@@ -39,7 +53,6 @@ static char sccsid[] = "@(#)res_query.c       5.7 (Berkeley) 6/1/90";
 #define MAXPACKET      1024
 #endif
 
 #define MAXPACKET      1024
 #endif
 

-extern int errno;

 int h_errno;
 
 /*
 int h_errno;
 
 /*


@@ -78,7 +91,7 @@ res_query(name, class, type, answer, anslen)
                h_errno = NO_RECOVERY;
                return (n);
        }
                h_errno = NO_RECOVERY;
                return (n);
        }

-       n = res_send(buf, n, answer, anslen);
+       n = res_send(buf, n, (char *)answer, anslen);

        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)
        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)


@@ -133,7 +146,7 @@ res_search(name, class, type, answer, anslen)
 {
        register char *cp, **domain;
        int n, ret, got_nodata = 0;
 {
        register char *cp, **domain;
        int n, ret, got_nodata = 0;

-       char *hostalias();
+       char *__hostalias();

 
        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
                return (-1);
 
        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
                return (-1);


@@ -143,7 +156,7 @@ res_search(name, class, type, answer, anslen)
        for (cp = name, n = 0; *cp; cp++)
                if (*cp == '.')
                        n++;
        for (cp = name, n = 0; *cp; cp++)
                if (*cp == '.')
                        n++;

-       if (n == 0 && (cp = hostalias(name)))
+       if (n == 0 && (cp = __hostalias(name)))

                return (res_query(cp, class, type, answer, anslen));
 
        /*
                return (res_query(cp, class, type, answer, anslen));
 
        /*


@@ -234,8 +247,8 @@ res_querydomain(name, domain, class, type, answer, anslen)
 }
 
 char *
 }
 
 char *

-hostalias(name)
-       register char *name;
+__hostalias(name)
+       register const char *name;

 {
        register char *C1, *C2;
        FILE *fp;
 {
        register char *C1, *C2;
        FILE *fp;