From NetBSD: merge of 960317

4 files changed, 28 insertions, 13 deletions

diff --git a/src/lib/libc/net/inet_network.c b/src/lib/libc/net/inet_network.c
index 35105fa75a..3de21a5bac 100644
--- a/src/lib/libc/net/inet_network.c
+++ b/src/lib/libc/net/inet_network.c
@@ -1,4 +1,5 @@
-/*      $NetBSD: inet_network.c,v 1.4 1995/02/25 06:20:45 cgd Exp $     */
+/*      $OpenBSD: inet_network.c,v 1.2 1996/03/19 23:15:08 niklas Exp $ */
+/*      $NetBSD: inet_network.c,v 1.5 1996/02/17 15:35:41 hpeyerl Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -37,7 +38,8 @@
 #if 0
 static char sccsid[] = "@(#)inet_network.c      8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$NetBSD: inet_network.c,v 1.4 1995/02/25 06:20:45 cgd Exp $";
+static char rcsid[] = "$OpenBSD: inet_network.c,v 1.2 1996/03/19 23:15:08 niklas Exp $";
+static char rcsid[] = "$NetBSD: inet_network.c,v 1.5 1996/02/17 15:35:41 hpeyerl Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -80,7 +82,7 @@ again:
                 break;
         }
         if (*cp == '.') {
-                if (pp >= parts + 4)
+                if (pp >= parts + 3)
                         return (INADDR_NONE);
                 *pp++ = val, cp++;
                 goto again;
@@ -89,8 +91,6 @@ again:
                 return (INADDR_NONE);
         *pp++ = val;
         n = pp - parts;
-        if (n > 4)
-                return (INADDR_NONE);
         for (val = 0, i = 0; i < n; i++) {
                 val <<= 8;
                 val |= parts[i] & 0xff;
diff --git a/src/lib/libc/stdlib/strtod.c b/src/lib/libc/stdlib/strtod.c
index b13fa128f5..f1c5463933 100644
--- a/src/lib/libc/stdlib/strtod.c
+++ b/src/lib/libc/stdlib/strtod.c
@@ -1,3 +1,6 @@
+/*      $OpenBSD: strtod.c,v 1.2 1996/03/19 23:15:11 niklas Exp $       */
+/*      $NetBSD: strtod.c,v 1.21 1996/02/16 21:19:29 mark Exp $ */
+
 /****************************************************************
  *
  * The author of this software is David M. Gay.
@@ -90,7 +93,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: strtod.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strtod.c,v 1.2 1996/03/19 23:15:11 niklas Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
@@ -103,6 +106,15 @@ static char *rcsid = "$Id: strtod.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $"
 #endif
 #endif
 
+#ifdef __arm32__
+/*
+ * Although the CPU is little endian the FP has different
+ * byte and word endianness. The byte order is still little endian
+ * but the word order is big endian.
+ */
+#define IEEE_BIG_ENDIAN
+#endif
+
 #ifdef vax
 #define VAX
 #endif
@@ -224,7 +236,7 @@ IBM should be defined.
  * An alternative that might be better on some machines is
  * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX)
+#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm32__)
 #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
 ((unsigned short *)a)[0] = (unsigned short)c, a++)
 #else
diff --git a/src/lib/libc/stdlib/system.3 b/src/lib/libc/stdlib/system.3
index d77a082545..b3e3cb8e47 100644
--- a/src/lib/libc/stdlib/system.3
+++ b/src/lib/libc/stdlib/system.3
@@ -1,3 +1,6 @@
+.\"     $OpenBSD: system.3,v 1.3 1996/03/19 23:15:12 niklas Exp $
+.\"     $NetBSD: system.3,v 1.7 1996/02/16 22:30:46 jtc Exp $
+.\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -34,7 +37,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)system.3      6.5 (Berkeley) 6/29/91
-.\"     $Id: system.3,v 1.2 1995/11/01 16:43:27 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt SYSTEM 3
@@ -87,8 +89,8 @@ returns the termination status for a program that terminates with a call of
 .Sh SEE ALSO
 .Xr sh 1 ,
 .Xr execve 2 ,
-.Xr popen 3 ,
-.Xr waitpid 3 ,
+.Xr waitpid 2 ,
+.Xr popen 3
 .Sh STANDARDS
 The
 .Fn system
diff --git a/src/lib/libc/string/strftime.3 b/src/lib/libc/string/strftime.3
index f14db4bb13..a6eecd95e0 100644
--- a/src/lib/libc/string/strftime.3
+++ b/src/lib/libc/string/strftime.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strftime.3,v 1.2 1996/03/19 23:15:14 niklas Exp $
+.\"
 .\" Copyright (c) 1989, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -34,7 +36,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)strftime.3    5.12 (Berkeley) 6/29/91
-.\"     $Id: strftime.3,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt STRFTIME 3
@@ -157,9 +158,9 @@ the week) as a decimal number (00-53).
 is replaced by the weekday (Sunday as the first day of the week)
 as a decimal number (0-6).
 .It Cm \&%X
-is replaced by the locale's appropriate date representation.
-.It Cm \&%x
 is replaced by the locale's appropriate time representation.
+.It Cm \&%x
+is replaced by the locale's appropriate date representation.
 .It Cm \&%Y
 is replaced by the year with century as a decimal number.
 .It Cm \&%y