PERFORCE change 20294 for review

Robert Watson rwatson at freebsd.org
Mon Oct 28 19:00:46 GMT 2002


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

Change 20294 by rwatson at rwatson_tislabs on 2002/10/28 10:59:55

	Integ the MAC tree.  Various changes, including
	loop back of recent _system_ namespace checks.

Affected files ...

.. //depot/projects/trustedbsd/mac/Makefile.inc1#27 integrate
.. //depot/projects/trustedbsd/mac/UPDATING#18 integrate
.. //depot/projects/trustedbsd/mac/bin/expr/expr.1#5 integrate
.. //depot/projects/trustedbsd/mac/bin/expr/expr.y#6 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.c#18 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.c#2 integrate
.. //depot/projects/trustedbsd/mac/include/limits.h#3 integrate
.. //depot/projects/trustedbsd/mac/include/unistd.h#10 integrate
.. //depot/projects/trustedbsd/mac/include/wchar.h#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/check_utility_compat.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/gen/check_utility_compat.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mblen.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbtowc.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstombs.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/wctomb.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#13 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/write_ia64_disk.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libfetch/common.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libfetch/common.h#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libfetch/http.c#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_radius/pam_radius.8#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_radius/pam_radius.c#8 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#5 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#8 integrate
.. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#9 integrate
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 integrate
.. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml#3 integrate
.. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#12 integrate
.. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#12 integrate
.. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#1 branch
.. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/map.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/map.h#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#14 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#15 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/dummynet.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ipfirewall.4#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/raidframe/rf_types.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_crypt.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#28 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/spkr.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/interrupt.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/locore.s#6 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sapic.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/cpufunc.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/intrcnt.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#35 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#336 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#96 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/ciss/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/em/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/posix4/posix4_mib.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/utrap.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#9 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#199 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#154 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/syslimits.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/unistd.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#50 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#60 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#14 integrate
.. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#8 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/getconf/getconf.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/getconf/getconf.h#3 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/getconf/pathconf.gperf#4 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/getconf/sysconf.gperf#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#19 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.c#11 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/kbdmap/kbdmap.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/rrenumd/parser.y#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#14 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/nfs.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#16 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/Makefile.inc1#27 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.307 2002/10/25 19:15:29 peter Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.309 2002/10/28 08:44:59 ru Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS4 to build KerberosIV
@@ -356,8 +356,8 @@
 		false; \
 	fi
 .endif
-.if ${TARGET_ARCH} == ${MACHINE_ARCH} && \
-    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+.if ${TARGET_ARCH} == ${MACHINE_ARCH} && !defined(DISTDIR) && \
+    (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/")
 	@echo "Checking to see if your booted kernel is fresh enough.."
 	${.OBJDIR}/bin/sh/sh -c \
 	    'echo "Testing installed kernel for new sigaction(2) syscall"'

==== //depot/projects/trustedbsd/mac/UPDATING#18 (text+ko) ====

@@ -1004,6 +1004,7 @@
 	# Note: sometimes if you are running current you gotta do more than
 	# is listed here if you are upgrading from a really old current.
 
+	<make sure you have good level 0 dumps>
 	<maybe fix /etc/fstab>				[7]
 	make buildworld
 	make buildkernel KERNCONF=YOUR_KERNEL_HERE
@@ -1018,10 +1019,20 @@
 
 	To upgrade from 4.x-stable to current
 	-------------------------------------
+	# 5.x uses more space than 4.x.  Also, the location of kernel
+	# modules has changed.  If you are installing 5.0 onto a 4.x
+	# system, you'll need about 30MB of free disk space on your /
+	# partition.  If you have less than this, you may encounter difficult
+	# to back out of problems with this proceedure.  If /tmp is on
+	# the / partition, you may want to completely remove all its content
+	# before upgrading, as this can be a common source of shortage of
+	# space on /.
+	
+	<make sure you have good level 0 dumps>
 	<maybe fix /etc/fstab>				[7]
 	make buildworld
-	make buildkernel KERNCONF=YOUR_KERNEL_HERE
-	cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2]
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE	[8]
+	cp src/sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2]
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	cd src/sys/boot ; make install			[6]
 							[1]
@@ -1060,6 +1071,9 @@
 		adjkerntz -i		# if CMOS is wall time
 	Also, when doing a major release upgrade, it is required that
 	you boot into single user mode to do the installworld.
+	For the 4.x -> 5.0 upgrade, you will also see many messages about
+	needing to recompile your userland.  These are harmless and can
+	be ignored while you proceed to the next step.
 
 	[4] Note: This step is non-optional.  Failure to do this step
 	can result in a significant reduction in the functionality of the
@@ -1092,6 +1106,11 @@
 	You generally must update these entries to use the post FreeBSD
 	2.x form of /dev/ad0s1a.
 
+	[8] In order to have a kernel that can run the 4.x binaries
+	needed to do an installworld, you must include the COMPAT_FREEBSD4
+	option in your kernel.  Failure to do so may leave you with a system
+	that is hard to boot to recover.
+
 FORMAT:
 
 This file contains a list, in reverse chronological order, of major
@@ -1125,4 +1144,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.220 2002/10/26 06:25:11 imp Exp $
+$FreeBSD: src/UPDATING,v 1.225 2002/10/27 06:31:37 imp Exp $

==== //depot/projects/trustedbsd/mac/bin/expr/expr.1#5 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/expr/expr.1,v 1.20 2002/05/29 15:18:35 ru Exp $
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.21 2002/10/28 00:15:42 wollman Exp $
 .\"
 .Dd May 10, 2002
 .Dt EXPR 1
@@ -121,9 +121,23 @@
 .Pp
 Parentheses are used for grouping in the usual manner.
 .Pp
-Unless the
-.Ev EXPR_COMPAT
-variable is defined in the process environment, this version of
+The
+.Nm
+utility makes no lexical distinction between arguments which may be
+operators and arguments which may be operands.
+An operand which is lexically identical to an operator will be considered a
+syntax error.
+See the examples below for a work-around.
+.Pp
+The syntax of the
+.Nm
+command in general is historic and inconvenient.
+New applications are advised to use shell arithmetic rather than
+.Nm .
+.Ss Compatibility with previous implementations
+Unless 
+.Fx 4.x
+compatibility is enabled, this version of
 .Nm
 adheres to the
 \*[Px]
@@ -140,43 +154,31 @@
 See the examples below for portable ways to guarantee the correct
 interpretation.
 The
-.Ev EXPR_COMPAT
-variable is intended for use as a transition and debugging aid, when
+.Xr check_utility_compat 3
+function (with a
+.Fa utility
+argument of
+.Dq Li expr )
+is used to determine whether compatibility mode should be enabled.
+This feature is intended for use as a transition and debugging aid, when
 .Nm
 is used in complex scripts which cannot easily be recast to avoid the
 non-portable usage.
-Defining
-.Ev EXPR_COMPAT
+Enabling compatibility mode
 also implicitly enables the
 .Fl e
 option, since this matches the historic behavior of
 .Nm
 in
 .Fx .
-.Pp
-The
-.Nm
-utility makes no lexical distinction between arguments which may be
-operators and arguments which may be operands.
-An operand which is lexically identical to an operator will be considered a
-syntax error.
-See the examples below for a work-around.
+For historical reasons, defining the environment variable
+.Ev EXPR_COMPAT
+also enables compatibility mode.
 .Pp
-The syntax of the
-.Nm
-command in general is historic and inconvenient.
-New applications are advised to use shell arithmetic rather than
-.Nm .
 .Sh ENVIRONMENT
 .Bl -tag -width ".Ev EXPR_COMPAT"
 .It Ev EXPR_COMPAT
-If set,
-.Nm
-will emulate historic
-.Nm
-implementations which did not obey the Utility Syntax Guidelines.
-Implies
-.Fl e .
+If set, enables compatibility mode.
 .El
 .Sh EXAMPLES
 .Bl -bullet
@@ -248,15 +250,14 @@
 .El
 .Sh SEE ALSO
 .Xr sh 1 ,
-.Xr test 1
+.Xr test 1 ,
+.Xr check_utility_compat 3
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
 .St -p1003.1-2001 ,
-provided that the
-.Ev EXPR_COMPAT
-environment variable is not defined.
+provided that compatibility mode is not enabled.
 The
 .Fl e
 flag is an extension.

==== //depot/projects/trustedbsd/mac/bin/expr/expr.y#6 (text+ko) ====

@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc at wimsey.com)
  *
- * $FreeBSD: src/bin/expr/expr.y,v 1.22 2002/05/11 03:08:12 wollman Exp $
+ * $FreeBSD: src/bin/expr/expr.y,v 1.23 2002/10/28 00:15:42 wollman Exp $
  */
 
 #include <sys/types.h>
@@ -278,7 +278,8 @@
 	int c;
 
 	setlocale (LC_ALL, "");
-	if (getenv("EXPR_COMPAT") != NULL) {
+	if (getenv("EXPR_COMPAT") != NULL
+	    || check_utility_compat("expr")) {
 		av = argv + 1;
 		eflag = 1;
 	} else {

==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#18 (text+ko) ====

@@ -46,11 +46,10 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.69 2002/10/24 01:01:53 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.70 2002/10/27 17:44:32 wollman Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
 #include <sys/ioctl.h>
 #include <sys/mac.h>
 

==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.c#2 (text+ko) ====

@@ -13,7 +13,7 @@
  * The University of Texas at Austin
  * Austin, Texas  78712
  *
- * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.12 2001/02/13 16:55:42 ru Exp $
+ * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.13 2002/10/27 02:12:52 kris Exp $
  */
 
 #define MANPATH_MAIN
@@ -493,6 +493,9 @@
       lp++;
     }
 
+  if (!len)
+    return strdup("");
+
   manpathlist = (char *) malloc (len);
   if (manpathlist == NULL)
     gripe_alloc (len, "manpathlist");

==== //depot/projects/trustedbsd/mac/include/limits.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/include/limits.h,v 1.13 2002/09/21 21:28:25 bde Exp $
+ * $FreeBSD: src/include/limits.h,v 1.14 2002/10/27 18:03:02 wollman Exp $
  */
 
 #ifndef _LIMITS_H_
@@ -41,18 +41,27 @@
 
 #if __POSIX_VISIBLE
 #define	_POSIX_ARG_MAX		4096
-#define	_POSIX_CHILD_MAX	6
+#define	_POSIX_CHILD_MAX	25
 #define	_POSIX_LINK_MAX		8
 #define	_POSIX_MAX_CANON	255
 #define	_POSIX_MAX_INPUT	255
 #define	_POSIX_NAME_MAX		14
-#define	_POSIX_NGROUPS_MAX	0
-#define	_POSIX_OPEN_MAX		16
-#define	_POSIX_PATH_MAX		255
+#define	_POSIX_NGROUPS_MAX	8
+#define	_POSIX_OPEN_MAX		20
+#define	_POSIX_PATH_MAX		256
 #define	_POSIX_PIPE_BUF		512
 #define	_POSIX_SSIZE_MAX	32767
 #define	_POSIX_STREAM_MAX	8
-#define	_POSIX_TZNAME_MAX	3
+#define	_POSIX_TZNAME_MAX	6
+
+#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
+#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
+#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
+#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
+#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
+#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
+#define	LINE_MAX		 2048	/* max bytes in an input line */
+#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
 
 #define	_POSIX2_BC_BASE_MAX	99
 #define	_POSIX2_BC_DIM_MAX	2048
@@ -70,19 +79,40 @@
 #define	_POSIX_DELAYTIMER_MAX	32
 #define	_POSIX_MQ_OPEN_MAX	8
 #define	_POSIX_MQ_PRIO_MAX	32
-#define	_POSIX_RTSIG_MAX	0
+#define	_POSIX_RTSIG_MAX	8
 #define	_POSIX_SEM_NSEMS_MAX	256
 #define	_POSIX_SEM_VALUE_MAX	32767
 #define	_POSIX_SIGQUEUE_MAX	32
 #define	_POSIX_TIMER_MAX	32
 #endif
 
+#if __POSIX_VISIBLE >= 199506
+#define	_POSIX_THREAD_DESTRUCTOR_ITERATIONS 4
+#define	_POSIX_THREAD_KEYS_MAX	128
+#define	_POSIX_THREAD_THREADS_MAX 64
+#endif
+
 #if __POSIX_VISIBLE >= 200112
 #define	_POSIX_HOST_NAME_MAX	255
+#define	_POSIX_LOGIN_NAME_MAX	9
+#define	_POSIX_SS_REPL_MAX	4
+#define	_POSIX_SYMLINK_MAX	255
+#define	_POSIX_SYMLOOP_MAX	8
+#define	_POSIX_TRACE_EVENT_NAME_MAX 30
+#define	_POSIX_TRACE_NAME_MAX	8
+#define	_POSIX_TRACE_SYS_MAX	8
+#define	_POSIX_TRACE_USER_EVENT_MAX 32
+#define	_POSIX_TTY_NAME_MAX	9
+#define	_POSIX2_CHARCLASS_NAME_MAX 14
+#define	_POSIX2_COLL_WEIGHTS_MAX 2
+
+#define	_POSIX_RE_DUP_MAX	_POSIX2_RE_DUP_MAX
 #endif
 
 #if __XSI_VISIBLE
 #define	_XOPEN_IOV_MAX		16
+#define	_XOPEN_NAME_MAX		255
+#define	_XOPEN_PATH_MAX		1024
 #define	PASS_MAX		128	/* _PASSWORD_LEN from <pwd.h> */
 
 #define	NL_ARGMAX		99	/* max # of position args for printf */

==== //depot/projects/trustedbsd/mac/include/unistd.h#10 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.61 2002/10/13 14:25:01 mike Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.63 2002/10/28 00:15:43 wollman Exp $
  */
 
 #ifndef _UNISTD_H_
@@ -260,6 +260,9 @@
 #define	_SC_V6_ILP32_OFFBIG	104 /* user */
 #define	_SC_V6_LP64_OFF64	105 /* user */
 #define	_SC_V6_LPBIG_OFFBIG	106 /* user */
+#define	_SC_IPV6		118
+#define	_SC_RAW_SOCKETS		119
+#define	_SC_SYMLOOP_MAX		120
 #endif
 
 #if __XSI_VISIBLE
@@ -434,6 +437,7 @@
 int	 acct(const char *);
 int	 async_daemon(void);
 int	 brk(const void *);
+int	 check_utility_compat(const char *);
 int	 chroot(const char *);
 const char *
 	 crypt_get_format(void);

==== //depot/projects/trustedbsd/mac/include/wchar.h#10 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/wchar.h,v 1.32 2002/10/04 03:18:25 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.33 2002/10/27 11:30:36 tjr Exp $
  */
 
 /*-
@@ -129,14 +129,9 @@
 wint_t	ungetwc(wint_t, struct __sFILE *);
 int	vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict,
 	    __va_list);
-int	vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict,
-	    __va_list);
 int	vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
 	    __va_list);
-int	vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
-	    __va_list);
 int	vwprintf(const wchar_t * __restrict, __va_list);
-int	vwscanf(const wchar_t * __restrict, __va_list);
 size_t	wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
 wchar_t	*wcscat(wchar_t * __restrict, const wchar_t * __restrict);
 wchar_t	*wcschr(const wchar_t *, wchar_t);
@@ -163,12 +158,8 @@
 wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,
 	    wchar_t ** __restrict);
 long	 wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int);
-long long
-	wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int);
 unsigned long
 	 wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int);
-unsigned long long
-	 wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int);
 wchar_t	*wmemchr(const wchar_t *, wchar_t, size_t);
 int	wmemcmp(const wchar_t *, const wchar_t *, size_t);
 wchar_t	*wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
@@ -177,6 +168,22 @@
 int	wprintf(const wchar_t * __restrict, ...);
 int	wscanf(const wchar_t * __restrict, ...);
 
+#if __ISO_C_VISIBLE >= 1999
+int	vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict,
+	    __va_list);
+int	vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
+	    __va_list);
+int	vwscanf(const wchar_t * __restrict, __va_list);
+#ifdef __LONG_LONG_SUPPORTED
+/* LONGLONG */
+long long
+	wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int);
+/* LONGLONG */
+unsigned long long
+	 wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int);
+#endif
+#endif	/* __ISO_C_VISIBLE >= 1999 */
+
 #if __XSI_VISIBLE
 int	wcswidth(const wchar_t *, size_t);
 int	wcwidth(wchar_t);

==== //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#11 (text+ko) ====

@@ -1,11 +1,11 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.96 2002/10/09 08:04:24 peter Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
 
 SRCS+=  __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
-	alarm.c arc4random.c assert.c basename.c \
+	alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
 	clock.c closedir.c confstr.c \
 	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
 	dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
@@ -38,7 +38,7 @@
 
 .if ${LIB} == "c"
 MAN+=	alarm.3 arc4random.3 \
-	basename.3 clock.3 \
+	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 \
 	devname.3 directory.3 dirname.3 dladdr.3 dllockinit.3 dlopen.3 \
 	err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 frexp.3 ftok.3 fts.3 \

==== //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.c#7 (text+ko) ====

@@ -38,12 +38,13 @@
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.16 2002/09/21 02:14:04 wollman Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.17 2002/10/27 18:03:02 wollman Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/resource.h>
+#include <sys/socket.h>
 
 #include <errno.h>
 #include <limits.h>
@@ -176,9 +177,13 @@
 		return (value);
 
 	case _SC_ASYNCHRONOUS_IO:
+#if _POSIX_ASYNCHRONOUS_IO == 0
 		mib[0] = CTL_P1003_1B;
 		mib[1] = CTL_P1003_1B_ASYNCHRONOUS_IO;
-		goto yesno;
+		break;
+#else
+		return (_POSIX_ASYNCHRONOUS_IO);
+#endif
 	case _SC_MAPPED_FILES:
 		return (_POSIX_MAPPED_FILES);
 	case _SC_MEMLOCK:
@@ -545,6 +550,23 @@
 	case _SC_XOPEN_XCU_VERSION:
 		return (_XOPEN_XCU_VERSION);
 #endif
+	case _SC_SYMLOOP_MAX:
+		return (MAXSYMLINKS);
+	case _SC_RAW_SOCKETS:
+		return (_POSIX_RAW_SOCKETS);
+	case _SC_IPV6:
+#if _POSIX_IPV6 == 0
+		sverrno = errno;
+		value = socket(PF_INET6, SOCK_DGRAM, 0);
+		errno = sverrno;
+		if (value >= 0) {
+			close(value);
+			return (200112L);
+		} else
+			return (0);
+#else
+		return (_POSIX_IPV6);
+#endif
 
 	case _SC_NPROCESSORS_CONF:
 	case _SC_NPROCESSORS_ONLN:

==== //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#6 (text+ko) ====

@@ -25,14 +25,15 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.11 2002/08/08 05:51:54 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.12 2002/10/27 17:44:33 wollman Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
+
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

==== //depot/projects/trustedbsd/mac/lib/libc/locale/mblen.c#2 (text+ko) ====

@@ -35,26 +35,24 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.2 2002/09/03 01:09:47 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.4 2002/10/28 08:24:46 tjr Exp $");
 
 #include <errno.h>
+#include <stddef.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <rune.h>
 
 int
-mblen(s, n)
-	const char *s;
-	size_t n;
+mblen(const char *s, size_t n)
 {
-	char const *e;
+	const char *e;
 
-	if (s == 0 || *s == 0)
-		return (0);	/* No support for state dependent encodings. */
-
+	if (s == NULL)
+		/* No support for state dependent encodings. */
+		return (0);	
 	if (sgetrune(s, n, &e) == _INVALID_RUNE) {
 		errno = EILSEQ;
-		return (s - e);
+		return (-1);
 	}
-	return (e - s);
+	return (*s == '\0' ? 0 : e - s);
 }

==== //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.5 2002/10/27 10:41:21 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
@@ -44,22 +44,20 @@
 #include <rune.h>
 
 size_t
-mbstowcs(pwcs, s, n)
-	wchar_t * __restrict pwcs;
-	const char * __restrict s;
-	size_t n;
+mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
-	char const *e;
-	int cnt = 0;
+	const char *e;
+	int cnt;
 	rune_t r;
 
-	if (!s) {
+	if (s == NULL) {
 		errno = EINVAL;
 		return (-1);
 	}
 
 	if (pwcs == NULL) {
 		/* Convert and count only, do not store. */
+		cnt = 0;
 		while ((r = sgetrune(s, MB_LEN_MAX, &e)) != _INVALID_RUNE &&
 		    r != 0) {
 			s = e;
@@ -72,13 +70,14 @@
 	}
 
 	/* Convert, store and count characters. */
+	cnt = 0;
 	while (n-- > 0) {
 		*pwcs = sgetrune(s, MB_LEN_MAX, &e);
 		if (*pwcs == _INVALID_RUNE) {
 			errno = EILSEQ;
 			return (-1);
 		}
-		if (*pwcs++ == 0)
+		if (*pwcs++ == L'\0')
 			break;
 		s = e;
 		++cnt;

==== //depot/projects/trustedbsd/mac/lib/libc/locale/mbtowc.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.4 2002/09/06 11:23:45 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.6 2002/10/28 08:24:46 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
@@ -43,22 +43,19 @@
 #include <rune.h>
 
 int
-mbtowc(pwc, s, n)
-	wchar_t * __restrict pwc;
-	const char * __restrict s;
-	size_t n;
+mbtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n)
 {
-	char const *e;
+	const char *e;
 	rune_t r;
 
-	if (s == 0 || *s == 0)
-		return (0);	/* No support for state dependent encodings. */
-
+	if (s == NULL)
+		/* No support for state dependent encodings. */
+		return (0);	
 	if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) {
 		errno = EILSEQ;
-		return (s - e);
+		return (-1);
 	}
-	if (pwc)
+	if (pwc != NULL)
 		*pwc = r;
-	return (e - s);
+	return (r == 0 ? 0 : e - s);
 }

==== //depot/projects/trustedbsd/mac/lib/libc/locale/wcstombs.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.5 2002/10/27 10:41:21 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
@@ -44,16 +44,13 @@
 #include <rune.h>
 
 size_t
-wcstombs(s, pwcs, n)
-	char * __restrict s;
-	const wchar_t * __restrict pwcs;
-	size_t n;
+wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
 {
 	char buf[MB_LEN_MAX];
 	char *e;
 	int cnt, nb;
 
-	if (!pwcs || n > INT_MAX) {
+	if (pwcs == NULL || n > INT_MAX) {
 		errno = EINVAL;
 		return (-1);
 	}
@@ -63,7 +60,7 @@
 	if (s == NULL) {
 		/* Convert and count only, do not store. */
 		while (*pwcs != L'\0') {
-			if (!sputrune(*pwcs++, buf, MB_LEN_MAX, &e)) {
+			if (sputrune(*pwcs++, buf, MB_LEN_MAX, &e) == 0) {
 				errno = EILSEQ;
 				return (-1);
 			}
@@ -75,15 +72,15 @@
 	/* Convert, store and count characters. */
 	nb = n;
 	while (nb > 0) {
-		if (*pwcs == 0) {
-			*s = 0;
+		if (*pwcs == L'\0') {
+			*s = '\0';
 			break;
 		}
-		if (!sputrune(*pwcs++, s, nb, &e)) {
+		if (sputrune(*pwcs++, s, nb, &e) == 0) {
 			errno = EILSEQ;
 			return (-1);
 		}
-		if (!e)			/* too long */
+		if (e == NULL)		/* too long */
 			return (cnt);
 		cnt += e - s;
 		nb -= e - s;

==== //depot/projects/trustedbsd/mac/lib/libc/locale/wctomb.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.2 2002/09/03 01:09:47 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.3 2002/10/27 10:41:21 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
@@ -44,17 +44,16 @@
 #include <rune.h>
 
 int
-wctomb(s, wchar)
-	char *s;
-	wchar_t wchar;
+wctomb(char *s, wchar_t wchar)
 {
 	char *e;
 
-	if (s == 0)
-		return (0);	/* No support for state dependent encodings. */
+	if (s == NULL)
+		/* No support for state dependent encodings. */
+		return (0);	
 
-	if (wchar == 0) {
-		*s = 0;
+	if (wchar == L'\0') {
+		*s = '\0';
 		return (1);
 	}
 

==== //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.44 2002/08/12 11:47:19 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.45 2002/10/27 17:44:33 wollman Exp $");
 
 /*
  * We need a better way of handling errors than printing text.  I need
@@ -41,9 +41,10 @@
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
+
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <locale.h>
 #include <nl_types.h>
 #include <stdio.h>

==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#7 (text+ko) ====

@@ -34,16 +34,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.2 2002/10/24 01:16:56 chris Exp $
+ * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.3 2002/10/27 17:44:33 wollman Exp $
  */
 
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
-#include <sys/syslimits.h>
 
 #include <dlfcn.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

==== //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.3#3 (text+ko) ====

@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdio/putwc.3,v 1.3 2002/10/10 04:12:40 tjr Exp $
+.\" $FreeBSD: src/lib/libc/stdio/putwc.3,v 1.4 2002/10/28 10:35:18 tjr Exp $
 .\"
 .Dd October 10, 2002
 .Dt PUTWC 3
@@ -89,6 +89,7 @@
 .Xr ferror 3 ,
 .Xr fopen 3 ,
 .Xr getwc 3 ,
+.Xr putc 3 ,
 .Xr stdio 3
 .Sh STANDARDS
 The functions

==== //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libdisk/Makefile,v 1.34 2002/10/23 20:02:33 phk Exp $
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.35 2002/10/27 00:21:02 peter Exp $
 
 LIB=	disk
 SRCS=	blocks.c chunk.c disk.c change.c \
@@ -16,7 +16,11 @@
 SRCS	+=	write_i386_disk.c
 .endif
 
-.if ${MACHINE} == "alpha"
+.if ${MACHINE_ARCH} == "ia64"
+SRCS	+=	write_ia64_disk.c
+.endif
+
+.if ${MACHINE_ARCH} == "alpha"
 SRCS	+=	write_alpha_disk.c
 .endif
 

==== //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#13 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.93 2002/10/24 13:35:52 gallatin Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.94 2002/10/27 00:21:02 peter Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -778,6 +778,10 @@
 #elif defined(__alpha__)
 	printf("  boot1=%p, bootmgr=%p\n",
 		d->boot1, d->bootmgr);
+#elif defined(__ia64__)
+	printf("\n");
+#else
+/* Should be: error "Debug_Disk: unknown arch"; */
 #endif
 	Debug_Chunk(d->chunks);
 }
@@ -791,9 +795,13 @@
 	if(d->bootipl) free(d->bootipl);
 	if(d->bootmenu) free(d->bootmenu);

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list