date and time created 91/04/15 11:47:09 by donn

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

diff --git a/usr/src/lib/libc/net/gethostnamadr.c b/usr/src/lib/libc/net/gethostnamadr.c
index fc2c139..3662466 100644 (file)
--- a/usr/src/lib/libc/net/gethostnamadr.c
+++ b/usr/src/lib/libc/net/gethostnamadr.c
@@ -2,33 +2,24 @@
  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

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

-static char sccsid[] = "@(#)gethostnamadr.c    6.38 (Berkeley) %G%";
+static char sccsid[] = "@(#)gethostnamadr.c    6.45 (Berkeley) %G%";

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

-#include <ctype.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <errno.h>

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

+#include <netdb.h>

 #include <resolv.h>
 #include <resolv.h>

+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>

 
 #define        MAXALIASES      35
 #define        MAXADDRS        35
 
 #define        MAXALIASES      35
 #define        MAXADDRS        35


@@ -39,7 +30,6 @@ static struct hostent host;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;

-static char HOSTDB[] = "/etc/hosts";

 static FILE *hostf = NULL;
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static FILE *hostf = NULL;
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];


@@ -62,9 +52,7 @@ typedef union {
     char ac;
 } align;
 
     char ac;
 } align;
 

-

 int h_errno;
 int h_errno;

-extern errno;

 
 static struct hostent *
 getanswer(answer, anslen, iquery)
 
 static struct hostent *
 getanswer(answer, anslen, iquery)


@@ -93,8 +81,9 @@ getanswer(answer, anslen, iquery)
        cp = answer->buf + sizeof(HEADER);
        if (qdcount) {
                if (iquery) {
        cp = answer->buf + sizeof(HEADER);
        if (qdcount) {
                if (iquery) {

-                       if ((n = dn_expand((char *)answer->buf, eom,
-                            cp, bp, buflen)) < 0) {
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0) {

                                h_errno = NO_RECOVERY;
                                return ((struct hostent *) NULL);
                        }
                                h_errno = NO_RECOVERY;
                                return ((struct hostent *) NULL);
                        }


@@ -104,9 +93,9 @@ getanswer(answer, anslen, iquery)
                        bp += n;
                        buflen -= n;
                } else
                        bp += n;
                        buflen -= n;
                } else

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

                while (--qdcount > 0)
                while (--qdcount > 0)

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;
        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;


@@ -115,14 +104,17 @@ getanswer(answer, anslen, iquery)
                return ((struct hostent *) NULL);
        }
        ap = host_aliases;
                return ((struct hostent *) NULL);
        }
        ap = host_aliases;

+       *ap = NULL;

        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;
        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;

+       *hap = NULL;

 #if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {
 #if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {

-               if ((n = dn_expand((char *)answer->buf, eom, cp, bp, buflen)) < 0)
+               if ((n = dn_expand((u_char *)answer->buf, (u_char *)eom,
+                   (u_char *)cp, (u_char *)bp, buflen)) < 0)

                        break;
                cp += n;
                type = _getshort(cp);
                        break;
                cp += n;
                type = _getshort(cp);


@@ -142,8 +134,9 @@ getanswer(answer, anslen, iquery)
                        continue;
                }
                if (iquery && type == T_PTR) {
                        continue;
                }
                if (iquery && type == T_PTR) {

-                       if ((n = dn_expand((char *)answer->buf, eom,
-                           cp, bp, buflen)) < 0) {
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0) {

                                cp += n;
                                continue;
                        }
                                cp += n;
                                continue;
                        }


@@ -269,7 +262,7 @@ gethostbyname(name)
 
 struct hostent *
 gethostbyaddr(addr, len, type)
 
 struct hostent *
 gethostbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        int n;
        int len, type;
 {
        int n;


@@ -313,7 +306,7 @@ _sethtent(f)
        int f;
 {
        if (hostf == NULL)
        int f;
 {
        if (hostf == NULL)

-               hostf = fopen(HOSTDB, "r" );
+               hostf = fopen(_PATH_HOSTS, "r" );

        else
                rewind(hostf);
        stayopen |= f;
        else
                rewind(hostf);
        stayopen |= f;


@@ -333,7 +326,7 @@ _gethtent()
        char *p;
        register char *cp, **q;
 
        char *p;
        register char *cp, **q;
 

-       if (hostf == NULL && (hostf = fopen(HOSTDB, "r" )) == NULL)
+       if (hostf == NULL && (hostf = fopen(_PATH_HOSTS, "r" )) == NULL)

                return (NULL);
 again:
        if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)
                return (NULL);
 again:
        if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)


@@ -400,7 +393,7 @@ found:
 
 struct hostent *
 _gethtbyaddr(addr, len, type)
 
 struct hostent *
 _gethtbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        register struct hostent *p;
        int len, type;
 {
        register struct hostent *p;