PERFORCE change 136517 for review

Sam Leffler sam at FreeBSD.org
Fri Feb 29 21:04:44 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=136517

Change 136517 by sam at sam_ebb on 2008/02/29 21:04:21

	IFC @ 136516

Affected files ...

.. //depot/projects/vap/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/vap/lib/libc/stdio/fdopen.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/fopen.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/freopen.c#4 integrate
.. //depot/projects/vap/lib/libc/stdlib/getenv.c#3 integrate
.. //depot/projects/vap/lib/libc/sys/mq_close.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_getattr.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_notify.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_open.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_receive.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_send.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/mq_setattr.2#4 integrate
.. //depot/projects/vap/lib/msun/src/e_rem_pio2.c#5 integrate
.. //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#5 integrate
.. //depot/projects/vap/share/misc/bsd-family-tree#5 integrate
.. //depot/projects/vap/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#5 integrate
.. //depot/projects/vap/sys/boot/i386/btx/btx/Makefile#3 integrate
.. //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#5 integrate
.. //depot/projects/vap/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/vap/sys/boot/pc98/btx/btx/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/pc98/btx/btx/btx.S#5 integrate
.. //depot/projects/vap/sys/boot/pc98/libpc98/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/vap/sys/dev/md/md.c#7 integrate
.. //depot/projects/vap/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/vap/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/vap/sys/gdb/gdb_main.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/vap/sys/i386/cpufreq/est.c#5 integrate
.. //depot/projects/vap/sys/i386/i386/identcpu.c#7 integrate
.. //depot/projects/vap/sys/pc98/cbus/sio.c#4 integrate
.. //depot/projects/vap/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate
.. //depot/projects/vap/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/unifdef/unifdef.c#3 integrate

Differences ...

==== //depot/projects/vap/games/fortune/datfiles/fortunes#4 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $
 %
 =======================================================================
 ||								     ||
@@ -15979,6 +15979,9 @@
 %
 Don't mind him; politicians always sound like that.
 %
+Don't patch bad code -- rewrite it.
+		-- "The Elements of Programming Style", Kernighan and Plauger
+%
 Don't plan any hasty moves.
 You'll be evicted soon anyway.
 %
@@ -31243,7 +31246,7 @@
 		-- Charles Dickens
 %
 Let the machine do the dirty work.
-		-- "Elements of Programming Style", Kernighan and Ritchie
+		-- "The Elements of Programming Style", Kernighan and Plauger
 %
 Let the meek inherit the earth -- they have it coming to them.
 		-- James Thurber

==== //depot/projects/vap/lib/libc/stdio/fdopen.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.9 2008/02/27 19:02:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.10 2008/02/27 21:25:19 jhb Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -42,6 +42,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
+#include <limits.h>
 #include "un-namespace.h"
 #include "local.h"
 

==== //depot/projects/vap/lib/libc/stdio/fopen.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.12 2008/02/27 19:02:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
+#include <limits.h>
 #include "un-namespace.h"
 
 #include "local.h"

==== //depot/projects/vap/lib/libc/stdio/freopen.c#4 (text+ko) ====

@@ -34,13 +34,14 @@
 static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.19 2008/02/27 19:02:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.20 2008/02/27 21:25:19 jhb Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <limits.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

==== //depot/projects/vap/lib/libc/stdlib/getenv.c#3 (text+ko) ====

@@ -23,23 +23,25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.13 2008/02/28 04:09:08 scf Exp $");
+
+
+#include "namespace.h"
 #include <sys/types.h>
-#include <err.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include "un-namespace.h"
 
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.12 2007/09/22 02:30:44 scf Exp $");
-
-
-static const char CorruptEnvFindMsg[] =
-    "environment corrupt; unable to find %.*s";
+static const char CorruptEnvFindMsg[] = "environment corrupt; unable to find ";
 static const char CorruptEnvValueMsg[] =
-    "environment corrupt; missing value for %s";
+    "environment corrupt; missing value for ";
 
 
 /*
@@ -97,6 +99,26 @@
 
 
 /*
+ * A simple version of warnx() to avoid the bloat of including stdio in static
+ * binaries.
+ */
+static void
+__env_warnx(const char *msg, const char *name, size_t nameLen)
+{
+	static const char nl[] = "\n";
+	static const char progSep[] = ": ";
+
+	_write(STDERR_FILENO, _getprogname(), strlen(_getprogname()));
+	_write(STDERR_FILENO, progSep, sizeof(progSep) - 1);
+	_write(STDERR_FILENO, msg, strlen(msg));
+	_write(STDERR_FILENO, name, nameLen);
+	_write(STDERR_FILENO, nl, sizeof(nl) - 1);
+
+	return;
+}
+
+
+/*
  * Inline strlen() for performance.  Also, perform check for an equals sign.
  * Cheaper here than peforming a strchr() later.
  */
@@ -341,7 +363,8 @@
 			envVars[envNdx].valueSize =
 			    strlen(envVars[envNdx].value);
 		} else {
-			warnx(CorruptEnvValueMsg, envVars[envNdx].name);
+			__env_warnx(CorruptEnvValueMsg, envVars[envNdx].name,
+			    strlen(envVars[envNdx].name));
 			errno = EFAULT;
 			goto Failure;
 		}
@@ -356,8 +379,8 @@
 		activeNdx = envVarsTotal - 1;
 		if (__findenv(envVars[envNdx].name, nameLen, &activeNdx,
 		    false) == NULL) {
-			warnx(CorruptEnvFindMsg, (int)nameLen,
-			    envVars[envNdx].name);
+			__env_warnx(CorruptEnvFindMsg, envVars[envNdx].name,
+			    nameLen);
 			errno = EFAULT;
 			goto Failure;
 		}
@@ -527,7 +550,8 @@
 		if (origEnviron != NULL)
 			for (env = origEnviron; *env != NULL; env++) {
 				if ((equals = strchr(*env, '=')) == NULL) {
-					warnx(CorruptEnvValueMsg, *env);
+					__env_warnx(CorruptEnvValueMsg, *env,
+					    strlen(*env));
 					errno = EFAULT;
 					return (-1);
 				}

==== //depot/projects/vap/lib/libc/sys/mq_close.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_CLOSE 2
@@ -95,11 +95,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_getattr.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_GETATTR 2
@@ -117,11 +117,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_notify.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.9 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.10 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_NOTIFY 2
@@ -141,11 +141,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_open.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.9 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.10 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_OPEN 2
@@ -313,11 +313,11 @@
 and contain no other slash characters.
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_receive.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.6 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.7 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_RECEIVE 2
@@ -207,11 +207,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_send.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.5 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.6 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SEND 2
@@ -226,11 +226,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/libc/sys/mq_setattr.2#4 (text+ko) ====

@@ -25,17 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"   Portions of this text are reprinted and reproduced in electronic form
-.\"   from IEEE Std 1003.1, 2003 Edition, Standard for Information
-.\"   Technology -- Portable Operating System Interface (POSIX), The Open
-.\"   Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-.\"   Institute of Electrical and Electronics Engineers, Inc and The Open
-.\"   Group. In the event of any discrepancy between this version and the
-.\"   original IEEE and The Open Group Standard, the original IEEE and The
-.\"   Open Group Standard is the referee document. The original Standard can
-.\"   be obtained online at http://www.opengroup.org/unix/online.html .
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+.\" Portable Operating System Interface (POSIX), The Open Group Base
+.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
+.\" event of any discrepancy between this version and the original IEEE and
+.\" The Open Group Standard, the original IEEE and The Open Group Standard is
+.\" the referee document.  The original Standard can be obtained online at
+.\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.6 2008/02/21 19:16:57 philip Exp $
+.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.7 2008/02/29 17:48:25 philip Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SETATTR 2
@@ -113,11 +113,11 @@
 .Fx 7.0 .
 .Sh COPYRIGHT
 Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information
-Technology -- Portable Operating System Interface (POSIX), The Open
-Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the
-Institute of Electrical and Electronics Engineers, Inc and The Open
-Group. In the event of any discrepancy between this version and the
-original IEEE and The Open Group Standard, the original IEEE and The
-Open Group Standard is the referee document. The original Standard can
-be obtained online at http://www.opengroup.org/unix/online.html .
+from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
+Portable Operating System Interface (POSIX), The Open Group Base
+Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
+Electrical and Electronics Engineers, Inc and The Open Group.  In the
+event of any discrepancy between this version and the original IEEE and
+The Open Group Standard, the original IEEE and The Open Group Standard is
+the referee document.  The original Standard can be obtained online at
+	http://www.opengroup.org/unix/online.html.

==== //depot/projects/vap/lib/msun/src/e_rem_pio2.c#5 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.18 2008/02/28 16:22:36 bde Exp $");
 
 /* __ieee754_rem_pio2(x,y)
  * 
@@ -126,7 +126,7 @@
 		}
 	    }
 	}
-	if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */
+	if(ix<0x413921fb) {	/* |x| ~< 2^20*(pi/2), medium size */
 medium:
 	    /* Use a specialized rint() to get fn.  Assume round-to-nearest. */
 	    STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52);

==== //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#5 (text+ko) ====

@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.29 2008/02/28 16:22:36 bde Exp $");
 
 /* __ieee754_rem_pio2f(x,y)
  *
@@ -38,8 +38,8 @@
 static const double
 half =  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
 invpio2 =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
-pio2_1  =  1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */
-pio2_1t =  6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */
+pio2_1  =  1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */
+pio2_1t =  1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */
 
 #ifdef INLINE_REM_PIO2F
 extern inline
@@ -55,7 +55,7 @@
 	GET_FLOAT_WORD(hx,x);
 	ix = hx&0x7fffffff;
     /* 33+53 bit pi is good enough for medium size */
-	if(ix<=0x49490f80) {		/* |x| ~<= 2^19*(pi/2), medium size */
+	if(ix<0x4dc90fdb) {		/* |x| ~< 2^28*(pi/2), medium size */
 	    /* Use a specialized rint() to get fn.  Assume round-to-nearest. */
 	    STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52);
 	    fn = fn-0x1.8p52;

==== //depot/projects/vap/share/misc/bsd-family-tree#5 (text+ko) ====

@@ -169,8 +169,8 @@
  |   FreeBSD 4.10  |  |      |                 |
  |      |          |  |      |                 |
  |   FreeBSD 4.11  |  |      |                 |
- |      |          |  |      |                 |
- |      v           `-|------|-----------------|---------------------.
+ |                 |  |      |                 |
+ |                  `-|------|-----------------|---------------------.
  |                    |      |                 |                      \
 FreeBSD 5.0           |      |                 |                       |
  |                    |      |                 |                       |
@@ -212,12 +212,18 @@
  |     |              |      |                 |                DragonFly 1.8.0
  |     |              |      |             OpenBSD 4.1                 |
  |     |              |      |                 |                DragonFly 1.10.0
+ |     |           Mac OS X  |                 |                       |
+ |     |             10.5    |                 |                       |
  |     |              |      |             OpenBSD 4.2                 |
  |     |              |   NetBSD 4.0           |                       |
  | FreeBSD 6.3        |      |                 |                       |
  |                    |      |                 |                       |
+ *--FreeBSD           |      |                 |                DragonFly 1.12.0
+ |    7.0             |      |                 |                       |
+ |     |              |      |                 |                       |
+ |     V              |      |                 |                       |
  |                    |      |                 |                       |
-FreeBSD 7 -current    |  NetBSD -current  OpenBSD -current             |
+FreeBSD 8 -current    |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
  v                    v      v                 v                       v
 
@@ -472,9 +478,12 @@
 DragonFly 1.8.0		2007-01-30 [DFB]
 OpenBSD 4.1		2007-05-01 [OBD]
 DragonFly 1.10.0	2007-08-06 [DFB]
+Mac OS X 10.5		2007-10-26 [APL]
 OpenBSD 4.2		2007-11-01 [OBD]
 NetBSD 4.0		2007-12-19 [NBD]
 FreeBSD 6.3		2008-01-18 [FBD]
+DragonFly 1.12.0	2008-02-26 [DFB]
+FreeBSD 7.0		2008-02-27 [FBD]
 
 Bibliography
 ------------------------
@@ -535,4 +544,4 @@
 Copyright (c) 1997-2007 Wolfram Schneider <wosch at FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.118 2008/01/18 19:25:15 maxim Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.119 2008/02/28 06:54:24 maxim Exp $

==== //depot/projects/vap/share/mk/bsd.cpu.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.64 2008/02/29 19:20:05 jhb Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
@@ -133,6 +133,8 @@
 MACHINE_CPU = 3dnow mmx i586 i486 i386
 .  elif ${CPUTYPE} == "c3-2"
 MACHINE_CPU = sse mmx i586 i486 i386
+.  elif ${CPUTYPE} == "c7"
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "prescott"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m"

==== //depot/projects/vap/sys/boot/i386/boot2/boot2.c#5 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.85 2007/10/26 21:02:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.86 2008/02/28 17:08:05 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
@@ -129,7 +129,7 @@
     unsigned start;
     int init;
 } dsk;
-static char cmd[512];
+static char cmd[512], cmddup[512];
 static char kname[1024];
 static uint32_t opts;
 static int comspeed = SIOSPD;
@@ -255,10 +255,11 @@
 	fsread(ino, cmd, sizeof(cmd));
 
     if (*cmd) {
+	memcpy(cmddup, cmd, sizeof(cmd));
 	if (parse())
 	    autoboot = 0;
 	if (!OPT_CHECK(RBX_QUIET))
-	    printf("%s: %s", PATH_CONFIG, cmd);
+	    printf("%s: %s", PATH_CONFIG, cmddup);
 	/* Do not process this command twice */
 	*cmd = 0;
     }

==== //depot/projects/vap/sys/boot/i386/btx/btx/Makefile#3 (text+ko) ====

@@ -1,14 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.20 2008/02/27 23:35:39 jhb Exp $
 
 PROG=	btx
 INTERNALPROG=
 NO_MAN=
 SRCS=	btx.S
 
-.if defined(PAGING)
-CFLAGS+=-DPAGING
-.endif
-
 .if defined(BOOT_BTX_NOHANG)
 BOOT_BTX_FLAGS=0x1
 .else

==== //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#5 (text+ko) ====

@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.45 2008/02/27 23:35:39 jhb Exp $
  */
 
 /*
@@ -25,8 +25,7 @@
 		.set MEM_IDT,0x1e00		# IDT
 		.set MEM_TSS,0x1f98		# TSS
 		.set MEM_MAP,0x2000		# I/O bit map
-		.set MEM_DIR,0x4000		# Page directory
-		.set MEM_TBL,0x5000		# Page tables
+		.set MEM_TSS_END,0x3fff		# Page directory
 		.set MEM_ORG,0x9000		# BTX code
 		.set MEM_USR,0xa000		# Start of user memory
 /*
@@ -88,7 +87,7 @@
 		.set _ESP0H,MEM_ESP0>>0x8	# Byte 1 of ESP0
 		.set _ESP1H,MEM_ESP1>>0x8	# Byte 1 of ESP1
 		.set _TSSIO,MEM_MAP-MEM_TSS	# TSS I/O base
-		.set _TSSLM,MEM_DIR-MEM_TSS-1	# TSS limit
+		.set _TSSLM,MEM_TSS_END-MEM_TSS	# TSS limit
 		.set _IDTLM,MEM_TSS-MEM_IDT-1	# IDT limit
 /*
  * Code segment.
@@ -158,58 +157,15 @@
 		movb $SEL_SDATA,TSS_SS0(%di)	# Set SS0
 		movb $_ESP1H,TSS_ESP1+1(%di)	# Set ESP1
 		movb $_TSSIO,TSS_MAP(%di)	# Set I/O bit map base
-#ifdef PAGING
 /*
- * Create page directory.
- */
-		xor %edx,%edx			# Page
-		mov $PAG_SIZ>>0x8,%dh		#  size
-		xor %eax,%eax			# Zero
-		mov $MEM_DIR,%di		# Page directory
-		mov $PAG_CNT>>0xa,%cl		# Entries
-		mov $MEM_TBL|0x7,%ax	 	# First entry
-init.5: 	stosl				# Write entry
-		add %dx,%ax			# To next
-		loop init.5			# Till done
-/*
- * Create page tables.
- */
-		mov $MEM_TBL,%di		# Page table
-		mov $PAG_CNT>>0x8,%ch		# Entries
-		xor %ax,%ax			# Start address
-init.6: 	mov $0x7,%al			# Set U:W:P flags
-		cmp btx_hdr+0x8,%cx	 	# Standard user page?
-		jb init.7			# Yes
-		cmp $PAG_CNT-MEM_BTX>>0xc,%cx	# BTX memory?
-		jae init.7			# No or first page
-		and $~0x2,%al			# Clear W flag
-		cmp $PAG_CNT-MEM_USR>>0xc,%cx	# User page zero?
-		jne init.7			# No
-		testb $0x80,btx_hdr+0x7		# Unmap it?
-		jz init.7			# No
-		and $~0x1,%al			# Clear P flag
-init.7: 	stosl				# Set entry
-		add %edx,%eax			# Next address
-		loop init.6			# Till done
-#endif
-/*
  * Bring up the system.
  */
 		mov $0x2820,%bx			# Set protected mode
 		callw setpic			#  IRQ offsets
 		lidt idtdesc	 		# Set IDT
-#ifdef PAGING
-		xor %eax,%eax			# Set base
-		mov $MEM_DIR>>0x8,%ah		#  of page
-		mov %eax,%cr3			#  directory
-#endif
 		lgdt gdtdesc	 		# Set GDT
 		mov %cr0,%eax			# Switch to protected
-#ifdef PAGING
-		or $0x80000001,%eax             #  mode and enable paging
-#else
 		inc %ax				#  mode
-#endif
 		mov %eax,%cr0			#
 		ljmp $SEL_SCODE,$init.8		# To 32-bit code
 		.code32
@@ -854,13 +810,6 @@
 		movl $MEM_USR,%eax		# User base address
 		addl 0xc(%esp,1),%eax		# Change to user
 		leal 0x4(%eax),%esp		#  stack
-#ifdef PAGING
-		movl %cr0,%eax			# Turn
-		andl $~0x80000000,%eax		#  off
-		movl %eax,%cr0			#  paging
-		xorl %eax,%eax			# Flush
-		movl %eax,%cr3			#  TLB
-#endif
 		popl %eax			# Call
 		call *%eax			#  program
 intx30.1:	orb $0x1,%ss:btx_hdr+0x7	# Flag reboot

==== //depot/projects/vap/sys/boot/i386/gptboot/gptboot.c#3 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.86 2007/10/26 21:02:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.87 2008/02/28 17:08:05 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/gpt.h>
@@ -127,7 +127,7 @@
     daddr_t start;
     int init;
 } dsk;
-static char cmd[512];
+static char cmd[512], cmddup[512];
 static char kname[1024];
 static uint32_t opts;
 static int comspeed = SIOSPD;
@@ -253,10 +253,11 @@
 	fsread(ino, cmd, sizeof(cmd));
 
     if (*cmd) {
+	memcpy(cmddup, cmd, sizeof(cmd));
 	if (parse())
 	    autoboot = 0;
 	if (!OPT_CHECK(RBX_QUIET))
-	    printf("%s: %s", PATH_CONFIG, cmd);
+	    printf("%s: %s", PATH_CONFIG, cmddup);
 	/* Do not process this command twice */
 	*cmd = 0;
     }

==== //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.54 2007/11/12 23:53:43 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.55 2008/02/28 17:49:23 jhb Exp $");
 
 /*
  * BIOS disk device handling.
@@ -316,6 +316,29 @@
     }
 }
 
+/* Given a size in 512 byte sectors, convert it to a human-readable number. */
+static char *
+display_size(uint64_t size)
+{
+    static char buf[80];
+    char unit;
+
+    size /= 2;
+    unit = 'K';
+    if (size >= 10485760000LL) {
+	size /= 1073741824;
+	unit = 'T';
+    } else if (size >= 10240000) {
+	size /= 1048576;
+	unit = 'G';
+    } else if (size >= 10000) {
+	size /= 1024;
+	unit = 'M';
+    }
+    sprintf(buf, "%.6ld%cB", (long)size, unit);
+    return (buf);
+}
+
 static uuid_t efi = GPT_ENT_TYPE_EFI;
 static uuid_t freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
 static uuid_t freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
@@ -329,33 +352,22 @@
 {
     char stats[80];
     char line[96];
-    uint64_t size;
-    char unit;
 
-    if (verbose) {
-	size = (gp->gp_end + 1 - gp->gp_start) / 2048;
-	unit = 'M';
-	if (size >= 10240000) {
-	    size /= 1048576;
-	    unit = 'T';
-	} else if (size >= 10000) {
-	    size /= 1024;
-	    unit = 'G';
-	}
-	sprintf(stats, " %.6ld%cB", (long)size, unit);
-    } else
+    if (verbose)
+	sprintf(stats, " %s", display_size(gp->gp_end + 1 - gp->gp_start));
+    else
 	stats[0] = '\0';
 
     if (uuid_equal(&gp->gp_type, &efi, NULL))
-	sprintf(line, "%s: EFI%s\n", prefix, stats);
+	sprintf(line, "%s: EFI         %s\n", prefix, stats);
     else if (uuid_equal(&gp->gp_type, &ms_basic_data, NULL))
-	sprintf(line, "%s: FAT/NTFS%s\n", prefix, stats);
+	sprintf(line, "%s: FAT/NTFS    %s\n", prefix, stats);
     else if (uuid_equal(&gp->gp_type, &freebsd_boot, NULL))
 	sprintf(line, "%s: FreeBSD boot%s\n", prefix, stats);
     else if (uuid_equal(&gp->gp_type, &freebsd_ufs, NULL))
-	sprintf(line, "%s: FreeBSD UFS%s\n", prefix, stats);
+	sprintf(line, "%s: FreeBSD UFS %s\n", prefix, stats);
     else if (uuid_equal(&gp->gp_type, &freebsd_zfs, NULL))
-	sprintf(line, "%s: FreeBSD ZFS%s\n", prefix, stats);
+	sprintf(line, "%s: FreeBSD ZFS %s\n", prefix, stats);
     else if (uuid_equal(&gp->gp_type, &freebsd_swap, NULL))
 	sprintf(line, "%s: FreeBSD swap%s\n", prefix, stats);
     else
@@ -377,70 +389,50 @@
 bd_printslice(struct open_disk *od, struct dos_partition *dp, char *prefix,
 	int verbose)
 {
+	char stats[80];
 	char line[80];
 
+	if (verbose)
+		sprintf(stats, " %s (%d - %d)", display_size(dp->dp_size),
+		    dp->dp_start, dp->dp_start + dp->dp_size);
+	else
+		stats[0] = '\0';
+
 	switch (dp->dp_typ) {
 	case DOSPTYP_386BSD:
 		bd_printbsdslice(od, (daddr_t)dp->dp_start, prefix, verbose);
 		return;

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list