BSD 4_3_Reno release

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

diff --git a/usr/src/lib/libc/net/inet_network.c b/usr/src/lib/libc/net/inet_network.c
index f4d9712..acef30c 100644 (file)
--- a/usr/src/lib/libc/net/inet_network.c
+++ b/usr/src/lib/libc/net/inet_network.c
@@ -1,14 +1,28 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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.

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

-static char sccsid[] = "@(#)inet_network.c     5.2 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)inet_network.c     5.6 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */

 
 #include <sys/types.h>
 
 #include <sys/types.h>

+#include <netinet/in.h>

 #include <ctype.h>
 
 /*
 #include <ctype.h>
 
 /*


@@ -46,16 +60,16 @@ again:
        }
        if (*cp == '.') {
                if (pp >= parts + 4)
        }
        if (*cp == '.') {
                if (pp >= parts + 4)

-                       return (-1);
+                       return (INADDR_NONE);

                *pp++ = val, cp++;
                goto again;
        }
        if (*cp && !isspace(*cp))
                *pp++ = val, cp++;
                goto again;
        }
        if (*cp && !isspace(*cp))

-               return (-1);
+               return (INADDR_NONE);

        *pp++ = val;
        n = pp - parts;
        if (n > 4)
        *pp++ = val;
        n = pp - parts;
        if (n > 4)

-               return (-1);
+               return (INADDR_NONE);

        for (val = 0, i = 0; i < n; i++) {
                val <<= 8;
                val |= parts[i] & 0xff;
        for (val = 0, i = 0; i < n; i++) {
                val <<= 8;
                val |= parts[i] & 0xff;