1 files changed, 62 insertions, 49 deletions

diff --git a/src/lib/libc/net/inet_addr.c b/src/lib/libc/net/inet_addr.c
index b5b9d8302f..c962a03382 100644
--- a/src/lib/libc/net/inet_addr.c
+++ b/src/lib/libc/net/inet_addr.c
@@ -1,9 +1,11 @@
-/*      $NetBSD: inet_addr.c,v 1.5 1995/02/25 06:20:41 cgd Exp $        */
+/*      $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $     */
 
 /*
+ * ++Copyright++ 1983, 1990, 1993
+ * -
  * Copyright (c) 1983, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
+ *    The Regents of the University of California.  All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12,14 +14,10 @@
  * 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
+ * 3. 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
@@ -31,16 +29,29 @@
  * 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.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
-#else
-static char rcsid[] = "$NetBSD: inet_addr.c,v 1.5 1995/02/25 06:20:41 cgd Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
+#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -50,9 +61,8 @@ static char rcsid[] = "$NetBSD: inet_addr.c,v 1.5 1995/02/25 06:20:41 cgd Exp $"
  * Ascii internet address interpretation routine.
  * The value returned is in network order.
  */
-u_long
-inet_addr(cp)
-        register const char *cp;
+in_addr_t
+inet_addr(const char *cp)
 {
         struct in_addr val;
 
@@ -69,60 +79,60 @@ inet_addr(cp)
  * cannot distinguish between failure and a local broadcast address.
  */
 int
-inet_aton(cp, addr)
-        register const char *cp;
-        struct in_addr *addr;
+inet_aton(const char *cp, struct in_addr *addr)
 {
-        register u_long val;
-        register int base, n;
-        register char c;
+        in_addr_t val;
+        int base, n;
+        char c;
         u_int parts[4];
-        register u_int *pp = parts;
+        u_int *pp = parts;
 
+        c = *cp;
         for (;;) {
                 /*
                  * Collect number up to ``.''.
                  * Values are specified as for C:
-                 * 0x=hex, 0=octal, other=decimal.
+                 * 0x=hex, 0=octal, isdigit=decimal.
                  */
+                if (!isdigit(c))
+                        return (0);
                 val = 0; base = 10;
-                if (*cp == '0') {
-                        if (*++cp == 'x' || *cp == 'X')
-                                base = 16, cp++;
+                if (c == '0') {
+                        c = *++cp;
+                        if (c == 'x' || c == 'X')
+                                base = 16, c = *++cp;
                         else
                                 base = 8;
                 }
-                while ((c = *cp) != '\0') {
+                for (;;) {
                         if (isascii(c) && isdigit(c)) {
                                 val = (val * base) + (c - '0');
-                                cp++;
-                                continue;
-                        }
-                        if (base == 16 && isascii(c) && isxdigit(c)) {
-                                val = (val << 4) + 
+                                c = *++cp;
+                        } else if (base == 16 && isascii(c) && isxdigit(c)) {
+                                val = (val << 4) |
                                         (c + 10 - (islower(c) ? 'a' : 'A'));
-                                cp++;
-                                continue;
-                        }
-                        break;
+                                c = *++cp;
+                        } else
+                                break;
                 }
-                if (*cp == '.') {
+                if (c == '.') {
                         /*
                          * Internet format:
                          *      a.b.c.d
-                         *      a.b.c   (with c treated as 16-bits)
+                         *      a.b.c   (with c treated as 16 bits)
                          *      a.b     (with b treated as 24 bits)
                          */
-                        if (pp >= parts + 3 || val > 0xff)
+                        if (pp >= parts + 3)
                                 return (0);
-                        *pp++ = val, cp++;
+                        *pp++ = val;
+                        c = *++cp;
                 } else
                         break;
         }
         /*
          * Check for trailing characters.
          */
-        if (*cp && (!isascii(*cp) || !isspace(*cp)))
+        if (c != '\0' && (!isascii(c) || !isspace(c)))
                 return (0);
         /*
          * Concoct the address according to
@@ -131,23 +141,26 @@ inet_aton(cp, addr)
         n = pp - parts + 1;
         switch (n) {
 
+        case 0:
+                return (0);             /* initial nondigit */
+
         case 1:                         /* a -- 32 bits */
                 break;
 
         case 2:                         /* a.b -- 8.24 bits */
-                if (val > 0xffffff)
+                if ((val > 0xffffff) || (parts[0] > 0xff))
                         return (0);
                 val |= parts[0] << 24;
                 break;
 
         case 3:                         /* a.b.c -- 8.8.16 bits */
-                if (val > 0xffff)
+                if ((val > 0xffff) || (parts[0] > 0xff) || (parts[1] > 0xff))
                         return (0);
                 val |= (parts[0] << 24) | (parts[1] << 16);
                 break;
 
         case 4:                         /* a.b.c.d -- 8.8.8.8 bits */
-                if (val > 0xff)
+                if ((val > 0xff) || (parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff))
                         return (0);
                 val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
                 break;