PERFORCE change 30727 for review

Peter Wemm peter at FreeBSD.org
Wed May 7 16:59:32 PDT 2003 

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

Change 30727 by peter at peter_overcee on 2003/05/07 16:58:32

	IFC @30722

Affected files ...

.. //depot/projects/hammer/bin/df/df.1#3 integrate
.. //depot/projects/hammer/bin/ls/ls.1#6 integrate
.. //depot/projects/hammer/bin/mv/mv.c#3 integrate
.. //depot/projects/hammer/bin/mv/pathnames.h#2 delete
.. //depot/projects/hammer/bin/sh/var.c#3 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#3 integrate
.. //depot/projects/hammer/contrib/tar/src/buffer.c#5 integrate
.. //depot/projects/hammer/etc/Makefile#12 integrate
.. //depot/projects/hammer/etc/devd.conf#3 integrate
.. //depot/projects/hammer/etc/devfs.conf#1 branch
.. //depot/projects/hammer/etc/rc.d/apm#3 integrate
.. //depot/projects/hammer/etc/rc.d/apmd#5 integrate
.. //depot/projects/hammer/etc/rc.d/archdep#5 integrate
.. //depot/projects/hammer/etc/rc.d/devfs#5 integrate
.. //depot/projects/hammer/etc/rc.d/kpasswdd#2 integrate
.. //depot/projects/hammer/include/paths.h#3 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/rfork_thread.S#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#5 integrate
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/hammer/release/alpha/dokern.sh#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/hammer/sbin/dump/main.c#8 integrate
.. //depot/projects/hammer/sbin/dump/traverse.c#5 integrate
.. //depot/projects/hammer/sbin/dumpon/dumpon.8#3 integrate
.. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#6 integrate
.. //depot/projects/hammer/sbin/shutdown/pathnames.h#2 delete
.. //depot/projects/hammer/sbin/shutdown/shutdown.c#3 integrate
.. //depot/projects/hammer/sbin/startslip/startslip.c#2 integrate
.. //depot/projects/hammer/sbin/vinum/commands.c#6 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#9 integrate
.. //depot/projects/hammer/share/man/man9/malloc.9#4 integrate
.. //depot/projects/hammer/share/sendmail/Makefile#2 integrate
.. //depot/projects/hammer/sys/conf/newvers.sh#3 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#8 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#13 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#9 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/hammer/sys/geom/geom_bsd.c#16 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#12 integrate
.. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#12 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#11 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#8 integrate
.. //depot/projects/hammer/sys/sys/dkstat.h#3 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#10 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#18 integrate
.. //depot/projects/hammer/sys/vm/vm_pager.c#5 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#11 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#5 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#7 integrate
.. //depot/projects/hammer/usr.bin/vi/pathnames.h#2 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#8 integrate

Differences ...

==== //depot/projects/hammer/bin/df/df.1#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $
+.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -81,11 +81,11 @@
 .It Fl H
 "Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to three or less using base 10 for sizes.
+digits to four or fewer using base 10 for sizes.
 .It Fl h
 "Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to three or less using base 2 for sizes.
+digits to four or fewer using base 2 for sizes.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

==== //depot/projects/hammer/bin/ls/ls.1#6 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $
 .\"
 .Dd May 19, 2002
 .Dt LS 1
@@ -175,7 +175,7 @@
 When used with the
 .Fl l
 option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte
-and Petabyte in order to reduce the number of digits to three or less
+and Petabyte in order to reduce the number of digits to four or fewer
 using base 2 for sizes.
 .It Fl i
 For each file, print the file's file serial number (inode number).

==== //depot/projects/hammer/bin/mv/mv.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -67,8 +67,6 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-#include "pathnames.h"
-
 int fflg, iflg, nflg, vflg;
 
 int	copy(char *, char *);

==== //depot/projects/hammer/bin/sh/var.c#3 (text+ko) ====

@@ -40,10 +40,11 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <paths.h>
 
 /*
  * Shell variables.
@@ -105,7 +106,7 @@
 	  NULL },
 	{ &vmpath,	VSTRFIXED|VTEXTFIXED|VUNSET,	"MAILPATH=",
 	  NULL },
-	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=/bin:/usr/bin",
+	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=" _PATH_DEFPATH,
 	  changepath },
 	{ &vppid,	VSTRFIXED|VTEXTFIXED|VUNSET,	"PPID=",
 	  NULL },

==== //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#3 (text+ko) ====

@@ -44,7 +44,7 @@
 #ifndef lint
 static char copyright[] =
 "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium.  All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -53,7 +53,7 @@
 
 struct client_config top_level_config;
 
-char client_script_name [] = "/sbin/dhclient-script";
+char client_script_name [] = _PATH_DHCLIENT_SCRIPT;
 
 u_int32_t default_requested_options [] = {
 	DHO_SUBNET_MASK,

==== //depot/projects/hammer/contrib/tar/src/buffer.c#5 (text+ko) ====

@@ -19,12 +19,18 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */
+/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */
 
 #include "system.h"
 
 #include <signal.h>
 
+#if __FreeBSD__
+# include <paths.h>
+#else
+# define _PATH_BSHELL "/bin/sh"
+#endif
+
 #if MSDOS
 # include <process.h>
 #endif
@@ -1549,7 +1555,7 @@
 		  pid_t child;
 		  const char *shell = getenv ("SHELL");
 		  if (! shell)
-		    shell = "/bin/sh";
+		    shell = _PATH_BSHELL;
 		  child = xfork ();
 		  if (child == 0)
 		    {

==== //depot/projects/hammer/etc/Makefile#12 (text+ko) ====

@@ -1,13 +1,13 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $
+# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
 .endif
 
 BIN1=	amd.map apmd.conf auth.conf \
-	crontab csh.cshrc csh.login csh.logout \
-	devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \
+	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
+	dhclient.conf disktab fbtab ftpusers gettytab group \
 	hosts hosts.allow hosts.equiv hosts.lpd \
 	inetd.conf login.access login.conf \
 	mac.conf motd netconfig network.subr networks newsyslog.conf \

==== //depot/projects/hammer/etc/devd.conf#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -64,9 +64,10 @@
 };
 
 # Don't even try to second guess what to do about drivers that don't
-# match here.  Instead, pass it off to a smart script to deal.
+# match here.  Instead, pass it off to syslog.  Commented out for the
+# moment, as pnpinfo isn't set in devd yet
 nomatch 0 {
-	action "logger Unknown device: $pnpinfo $location $bus";
+	// action "logger Unknown device: $pnpinfo $location $bus";
 };
 
 /* EXAMPLES TO END OF FILE

==== //depot/projects/hammer/etc/rc.d/apm#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $
+# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $
 #
 
 # PROVIDE: apm
@@ -19,7 +19,7 @@
 apm_precmd()
 {
 	case `${SYSCTL_N} hw.machine_arch` in
-	i386|amd64)
+	i386)
 		return 0
 		;;
 	esac

==== //depot/projects/hammer/etc/rc.d/apmd#5 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $
+# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $
 #
 
 # PROVIDE: apmd
@@ -24,7 +24,7 @@
 apmd_prestart()
 {
 	case `${SYSCTL_N} hw.machine_arch` in
-	i386|amd64)
+	i386)
 		# Start apm if it is not already running
 		/etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart
 		;;

==== //depot/projects/hammer/etc/rc.d/archdep#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $
+# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $
 #
 
 # PROVIDE: archdep
@@ -56,7 +56,7 @@
 _arch=`${SYSCTL_N} hw.machine`
 echo -n "Initial $_arch initialization:"
 case $_arch in
-i386|amd64)
+i386)
 	ibcs2_compat
 	;;
 alpha)

==== //depot/projects/hammer/etc/rc.d/devfs#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $
+# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $
 #
 
 # PROVIDE: devfs
@@ -11,18 +11,31 @@
 . /etc/rc.subr
 
 name="devfs"
+start_cmd='read_devfs_conf'
+stop_cmd=':'
 
+read_devfs_conf()
+{
+	if [ -r /etc/devfs.conf ]; then
+		cd /dev
+		while read action device parameter; do
+			case "${action}" in
+			l*)	if [ -c ${device} -a ! -e ${parameter} ]; then
+					ln -fs ${device} ${parameter}
+				fi
+				;;
+			o*)	if [ -c ${device} ]; then
+					chown ${parameter} ${device}
+				fi
+				;;
+			p*)	if [ -c ${device} ]; then
+					chmod ${parameter} ${device}
+				fi
+				;;
+			esac
+		done < /etc/devfs.conf
+	fi
+}
+
 load_rc_config $name
-
-# Setup DEVFS, ie permissions, links etc.
-#
-if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then
-	ln -fs /dev/ttyv0 /dev/vga
-fi
-
-# XXX - in case the user has a customized /etc/rc.devfs we need to keep
-#	pulling it in until we have a better way of doing this in rc.d.
-#
-if [ -r /etc/rc.devfs ]; then
-	sh /etc/rc.devfs
-fi
+run_rc_command "$1"

==== //depot/projects/hammer/etc/rc.d/kpasswdd#2 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $
+# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $
 #
 
 # PROVIDE: kpasswdd
-# REQUIRE: kadmind5
+# REQUIRE: kadmin
 # BEFORE: DAEMON
 # KEYWORD: FreeBSD
 

==== //depot/projects/hammer/include/paths.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $
+ * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $
  */
 
 #ifndef _PATHS_H_
@@ -59,6 +59,8 @@
 #define	_PATH_DRUM	"/dev/drum"
 #define	_PATH_ETC	"/etc"
 #define	_PATH_FTPUSERS	"/etc/ftpusers"
+#define	_PATH_HALT	"/sbin/halt"
+#define	_PATH_IFCONFIG	"/sbin/ifconfig"
 #define	_PATH_KMEM	"/dev/kmem"
 #define	_PATH_LIBMAP_CONF	"/etc/libmap.conf"
 #define	_PATH_LOGIN	"/usr/bin/login"
@@ -67,7 +69,9 @@
 #define	_PATH_MEM	"/dev/mem"
 #define	_PATH_NOLOGIN	"/var/run/nologin"
 #define	_PATH_RCP	"/bin/rcp"
+#define	_PATH_REBOOT	"/sbin/reboot"
 #define	_PATH_RLOGIN	"/usr/bin/rlogin"
+#define	_PATH_RM	"/bin/rm"
 #define	_PATH_RSH	"/usr/bin/rsh"
 #define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
 #define	_PATH_SHELLS	"/etc/shells"

==== //depot/projects/hammer/lib/libc/i386/gen/rfork_thread.S#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
@@ -109,5 +109,9 @@
 	 * Branch here if the thread creation fails:
 	 */
 2:
+	addl	$8, %esp
+	popl	%esi
+	movl	%ebp, %esp
+	popl	%ebp
 	PIC_PROLOGUE
 	jmp	PIC_PLT(HIDENAME(cerror))

==== //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#5 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * David Leonard <d at openbsd.org>, 1999. Public domain.
- * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
@@ -64,16 +64,7 @@
 				break;
 
 			case PS_JOIN:
-				/*
-				 * Disconnect the thread from the joinee:
-				 */
-				if (pthread->join_status.thread != NULL) {
-					pthread->join_status.thread->joiner
-					    = NULL;
-					pthread->join_status.thread = NULL;
-				}
 				pthread->cancelflags |= THR_CANCELLING;
-				_thr_setrunnable_unlocked(pthread);
 				break;
 
 			case PS_SUSPENDED:

==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ====

@@ -23,7 +23,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/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $
+ * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $
  */
 
 #include <sys/types.h>
@@ -62,7 +62,10 @@
 void
 _retire_thread(void *entry)
 {
-	*(void **)entry = *ldt_free;
+	if (ldt_free == NULL)
+		*(void **)entry = NULL;
+	else
+		*(void **)entry = *ldt_free;
 	ldt_free = entry;
 }
 

==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
@@ -471,7 +471,7 @@
 	int	ret = 0;
 
 	PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL),
-	    "Uninitialized mutex in pthread_mutex_trylock_basic");
+	    "Uninitialized mutex in mutex_lock_common");
 
 	/*
 	 * Enter a loop waiting to become the mutex owner.  We need a

==== //depot/projects/hammer/lib/libthr/thread/thr_sig.c#2 (text+ko) ====

@@ -24,7 +24,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/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $
  */
 
 #include <sys/param.h>
@@ -124,28 +124,25 @@
 	curthread->state = psd.psd_state;
 	curthread->flags = psd.psd_flags;
 
-	/* Check the threads previous state: */
-	if (psd.psd_state != PS_RUNNING) {
-		/*
-		 * Do a little cleanup handling for those threads in
-		 * queues before calling the signal handler.  Signals
-		 * for these threads are temporarily blocked until
-		 * after cleanup handling.
-		 */
-		switch (psd.psd_state) {
-		case PS_COND_WAIT:
-			_cond_wait_backout(curthread);
-			psd.psd_state = PS_RUNNING;
-			break;
+	/*
+	 * Do a little cleanup handling for those threads in
+	 * queues before calling the signal handler.  Signals
+	 * for these threads are temporarily blocked until
+	 * after cleanup handling.
+	 */
+	switch (psd.psd_state) {
+	case PS_COND_WAIT:
+		_cond_wait_backout(curthread);
+		psd.psd_state = PS_RUNNING;
+		break;
 
-		case PS_MUTEX_WAIT:
-			/* _mutex_lock_backout(curthread); XXXTHR */
-			psd.psd_state = PS_RUNNING;
-			break;
+	case PS_MUTEX_WAIT:
+		/* _mutex_lock_backout(curthread); XXXTHR */
+		psd.psd_state = PS_RUNNING;
+		break;
 
-		default:
-			break;
-		}
+	default:
+		break;
 	}
 
 	if (_thread_sigact[sig -1].sa_handler != NULL) {

==== //depot/projects/hammer/release/alpha/dokern.sh#5 (text+ko) ====

@@ -1,60 +1,64 @@
 #!/bin/sh
 #
-# $FreeBSD: src/release/alpha/dokern.sh,v 1.66 2003/03/22 14:23:23 ru Exp $
+# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $
 #
 
+#	XXX sort by order in GENERIC, not alphabetical
+
 sed	\
-	-e '/DDB/d' \
+	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
 	-e '/DEBUG/d' \
 	-e '/DEC_KN8AE/d' \
-	-e '/INVARIANTS/d' \
-	-e '/INVARIANT_SUPPORT/d' \
-	-e '/KTRACE/d' \
-	-e '/MSDOSFS/d' \
+	-e '/SOFTUPDATES/d' \
+	-e '/UFS_ACL/d' \
+	-e '/UFS_DIRHASH/d' \
 	-e '/NFSSERVER/d' \
 	-e '/NFS_ROOT/d' \
+	-e '/MSDOSFS/d' \
 	-e '/PROCFS/d' \
 	-e '/PSEUDOFS/d' \
-	-e '/SMP/d' \
-	-e '/SOFTUPDATES/d' \
+	-e '/KTRACE/d' \
 	-e '/SYSV/d' \
-	-e '/UFS_ACL/d' \
-	-e '/UFS_DIRHASH/d' \
 	-e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
+	-e '/DDB/d' \
+	-e '/INVARIANTS/d' \
+	-e '/INVARIANT_SUPPORT/d' \
+	-e '/WITNESS/d' \
+	-e '/SMP/d' \
 	-e '/	atapifd	/d' \
 	-e '/	atapist	/d' \
-	-e '/	aue	/d' \
 	-e '/	ch	/d' \
-	-e '/	cue	/d' \
-	-e '/	faith	/d' \
-	-e '/	gif	/d' \
-	-e '/	kue	/d' \
-	-e '/	lpt	/d' \
-	-e '/	ohci	/d' \
 	-e '/	pass	/d' \
+	-e '/	sa	/d' \
+	-e '/	ses	/d' \
+	-e '/	splash	/d' \
+	-e '/	ppc$/d' \
 	-e '/	ppbus	/d' \
-	-e '/	ppc$/d' \
+	-e '/	lpt	/d' \
 	-e '/	ppi	/d' \
-	-e '/	ppp	/d' \
-	-e '/	pty	/d' \
-	-e '/	random	/d' \
-	-e '/	sa	/d' \
-	-e '/	ses	/d' \
 	-e '/	sf	/d' \
 	-e '/	sis	/d' \
+	-e '/	ste	/d' \
+	-e '/	wb	/d' \
+	-e '/	random	/d' \
 	-e '/	sl	/d' \
-	-e '/	splash	/d' \
-	-e '/	ste	/d' \
+	-e '/	ppp	/d' \
+	-e '/	pty	/d' \
+	-e '/	gif	/d' \
+	-e '/	faith	/d' \
+	-e '/	uhci	/d' \
+	-e '/	ohci	/d' \
+	-e '/	usb	/d' \
 	-e '/	ugen	/d' \
-	-e '/	uhci	/d' \
 	-e '/	uhid	/d' \
 	-e '/	ukbd	/d' \
 	-e '/	ulpt	/d' \
 	-e '/	umass	/d' \
 	-e '/	ums	/d' \
-	-e '/	usb	/d' \
-	-e '/	wb	/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
+	-e '/	aue	/d' \
+	-e '/	axe	/d' \
+	-e '/	cue	/d' \
+	-e '/	kue	/d' \
 
 echo "options  SCSI_NO_OP_STRINGS" 
 echo "options  SCSI_NO_SENSE_STRINGS"

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#5 (text+ko) ====

@@ -17,7 +17,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.25 2003/04/29 18:27:38 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.26 2003/05/06 20:01:07 bmah Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -47,8 +47,11 @@
 
       <para>&os; is an operating system based on 4.4 BSD Lite for
 	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC
-	hardware, Compaq (formerly DEC) Alpha computers, and UltraSPARC machines.  Versions
-	for the IA64 and PowerPC architectures are currently under
+	hardware (i386), NEC PC-9801/9821 series PCs and compatibles
+	(pc98), DEC/Compaq/HP Alpha computers (alpha), 
+	and UltraSPARC machines (sparc64).  Versions
+	for the IA64 (ia64), PowerPC (powerpc), and AMD
+	<quote>Hammer</quote> (amd64) architectures are currently under
 	development as well.  &os; works with a wide variety of
 	peripherals and configurations and can be used for everything
 	from software development to games to Internet Service
@@ -64,14 +67,14 @@
 
       <para>A large collection of third-party ported software (the
 	<quote>Ports Collection</quote>) is also provided to make it
-	easy to obtain and install all your favorite traditional UNIX
+	easy to obtain and install all your favorite traditional &unix;
 	utilities for &os;.  Each <quote>port</quote> consists of a
 	set of scripts to retrieve, configure, build, and install a
 	piece of software, with a single command.  Over &os.numports;
 	ports, from editors to programming languages to graphical
 	applications, make &os; a powerful and comprehensive operating
 	environment that extends far beyond what's provided by many
-	commercial versions of UNIX.  Most ports are also available as
+	commercial versions of &unix;.  Most ports are also available as
 	pre-compiled <quote>packages</quote>, which can be quickly
 	installed from the installation program.</para>
     </sect2>
@@ -198,18 +201,18 @@
 	preferable to subscribe instead to the &a.announce;.</para>
 
       <para>All of the mailing lists can be freely joined by anyone
-	wishing to do so.  Visit <ulink url="http://www.FreeBSD.org/mailman/listinfo">
+	wishing to do so.  Visit the <ulink url="http://www.FreeBSD.org/mailman/listinfo">
 	FreeBSD Mailman Info Page</ulink>.  This will give you more
 	information on joining the various lists, accessing archives,
 	etc.  There are a number of mailing lists targeted at special
 	interest groups not mentioned here; more information can be
-	obtained either through majordomo or the <ulink
+	obtained either from the Mailman pages or the <ulink
 	url="http://www.FreeBSD.org/support.html#mailing-list">mailing
 	lists section</ulink> of the &os; Web site.</para>
 
       <important>
 	<para>Do <emphasis>not</emphasis> send email to the lists
-	  asking to be subscribed.  Use the &a.majordomo; address
+	  asking to be subscribed.  Use the Mailman interface
 	  instead.</para>
       </important>
     </sect2>
@@ -224,8 +227,7 @@
 
       <para>The preferred method to submit bug reports from a machine
 	with Internet mail connectivity is to use the &man.send-pr.1;
-	command or use the Web form at <ulink
-	url="http://www.FreeBSD.org/send-pr.html">http://www.FreeBSD.org/send-pr.html</ulink>.
+	command.
 	<quote>Problem Reports</quote> (PRs) submitted in this way
 	will be filed and their progress tracked; the &os; developers
 	will do their best to respond to all reported bugs as soon as
@@ -278,7 +280,7 @@
 
 	  <listitem>
 	    <para><filename>EARLY.TXT</filename>: A guide for early
-	      adopters of &os; 5.0-RELEASE.  Highly recommended
+	      adopters of &os; &release.current;.  Highly recommended
 	      reading for users new to &os; &release.branch; and/or the
 	      5.<replaceable>X</replaceable> series of releases.</para>
 	  </listitem>
@@ -329,7 +331,7 @@
       </para>
 
       <para>On platforms that support &man.sysinstall.8; (currently
-	the i386 and alpha), these documents are generally available via the
+	alpha, i386, ia64, pc98, and sparc64), these documents are generally available via the
 	Documentation menu during installation.  Once the system is
 	installed, you can revisit this menu by re-running the
 	&man.sysinstall.8; utility.</para>
@@ -352,7 +354,7 @@
     <sect2>
       <title>Manual Pages</title>
 
-      <para>As with almost all UNIX-like operating systems, &os; comes
+      <para>As with almost all &unix;-like operating systems, &os; comes
 	with a set of on-line manual pages, accessed through the
 	&man.man.1; command or through the <ulink
 	url="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual
@@ -395,8 +397,8 @@
       <para>A listing of other books and documents about &os; can be
         found in the <ulink
         url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/bibliography.html">bibliography</ulink>
-        of the &os; Handbook.  Because of &os;'s strong UNIX heritage,
-        many other articles and books written for UNIX systems are
+        of the &os; Handbook.  Because of &os;'s strong &unix; heritage,
+        many other articles and books written for &unix; systems are
         applicable as well, some of which are also listed in the
         bibliography.</para>
     </sect2>

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.562 2003/05/04 02:02:48 nyan Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -886,6 +886,13 @@
       utilities have been renamed to
       <literal>k<replaceable>program</replaceable></literal>.</para>
 
+    <para><application>Kerberos 5</application> is now built by
+      default in <literal>buildworld</literal> operations.  Setting
+      <varname>MAKE_KERBEROS5</varname> no longer has any effect.
+      Disabling the base system Kerberos 5 now requires the
+      <varname>NO_KERBEROS</varname> Makefile variable to be
+      set.</para>
+
     <para><application>libpcap</application> now has support for
       selecting among multiple data link types on an interface.</para>
 
@@ -966,6 +973,11 @@
     <para>The supported release of <application>KDE</application>
       has been updated to 3.1.1a. &merged;</para>
 
+    <para>There is no longer a separate <filename>krb5</filename>
+      distribution.  The Kerberos 5 libraries and utilities have been
+      incorporated into the <filename>crypto</filename>
+      distribution.</para>
+
     <para>&man.sysinstall.8; once again supports installing individual
       components of <application>XFree86</application>.  Supporting
       changes (not user-visible) generalize the concept of installing

==== //depot/projects/hammer/release/doc/share/sgml/release.ent#3 (text+ko) ====

@@ -1,12 +1,12 @@
 <!-- -*- sgml -*-
 
-     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.8 2003/01/19 23:15:19 bmah Exp $
+     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.10 2003/05/06 21:30:16 bmah Exp $
 
      OS Release Information -->
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "5.0-CURRENT">
+<!ENTITY release.current "5.1-BETA">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -16,7 +16,7 @@
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "4.7-RELEASE">
+<!ENTITY release.prev.stable "4.8-RELEASE">
 
 <!-- The previous historical release.  Used only to tell what was
      the cutoff point for "historic" release notes. -->

==== //depot/projects/hammer/sbin/dump/main.c#8 (text+ko) ====

@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/dump/main.c,v 1.52 2003/05/01 21:18:35 ru Exp $";
+  "$FreeBSD: src/sbin/dump/main.c,v 1.53 2003/05/07 18:27:09 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -388,6 +388,7 @@
 	sync();
 	sblock = (struct fs *)sblock_buf;
 	for (i = 0; sblock_try[i] != -1; i++) {
+		sblock->fs_fsize = SBLOCKSIZE; /* needed in bread */
 		bread(sblock_try[i] >> dev_bshift, (char *) sblock, SBLOCKSIZE);
 		if ((sblock->fs_magic == FS_UFS1_MAGIC ||
 		     (sblock->fs_magic == FS_UFS2_MAGIC &&

==== //depot/projects/hammer/sbin/dump/traverse.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/dump/traverse.c,v 1.31 2003/01/13 19:42:41 dillon Exp $";
+  "$FreeBSD: src/sbin/dump/traverse.c,v 1.32 2003/05/07 18:27:09 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -736,12 +736,55 @@
 void
 bread(ufs2_daddr_t blkno, char *buf, int size)
 {
-	int cnt, i;
+	int secsize, bytes, resid, xfer, base, cnt, i;
+	static char *tmpbuf;
+	off_t offset;
 
 loop:
-	cnt = cread(diskfd, buf, size, ((off_t)blkno << dev_bshift));
-	if (cnt == size)
-		return;
+	offset = blkno << dev_bshift;
+	secsize = sblock->fs_fsize;
+	base = offset % secsize;
+	resid = size % secsize;
+	/*
+	 * If the transfer request starts or ends on a non-sector
+	 * boundary, we must read the entire sector and copy out
+	 * just the part that we need.
+	 */
+	if (base == 0 && resid == 0) {
+		cnt = cread(diskfd, buf, size, offset);
+		if (cnt == size)
+			return;
+	} else {
+		if (tmpbuf == NULL && (tmpbuf = malloc(secsize)) == 0)
+			quit("buffer malloc failed\n");
+		xfer = 0;
+		bytes = size;
+		if (base != 0) {
+			cnt = cread(diskfd, tmpbuf, secsize, offset - base);
+			if (cnt != secsize)
+				goto bad;
+			xfer = secsize - base;
+			offset += xfer;
+			bytes -= xfer;
+			resid = bytes % secsize;
+			memcpy(buf, &tmpbuf[base], xfer);
+		}
+		if (bytes >= secsize) {
+			cnt = cread(diskfd, &buf[xfer], bytes - resid, offset);
+			if (cnt != bytes - resid)
+				goto bad;
+			xfer += cnt;
+			offset += cnt;
+		}
+		if (resid == 0)
+			return;
+		cnt = cread(diskfd, tmpbuf, secsize, offset);
+		if (cnt == secsize) {
+			memcpy(&buf[xfer], tmpbuf, resid);
+			return;
+		}
+	}
+bad:
 	if (blkno + (size / dev_bsize) > fsbtodb(sblock, sblock->fs_size)) {
 		/*
 		 * Trying to read the final fragment.

==== //depot/projects/hammer/sbin/dumpon/dumpon.8#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.27 2002/08/21 18:10:01 trhodes Exp $
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.28 2003/05/07 19:37:51 hmp Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
@@ -72,7 +72,7 @@
 flag causes
 .Nm
 to be verbose about its activity.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 Since a
 .Xr panic 9
 condition may occur in a situation
@@ -86,18 +86,23 @@
 .Pp
 The
 .Nm
-utility operates by setting the
-.Xr sysctl 3
-MIB variable
-.Dq kern.dumpdev
-to the device number of the designated
+utility operates by opening
 .Ar special_file
-or to
-.Dv NODEV
-(meaning that no dumps are to be taken) if
+and making a
+.Dv DIOCSKERNELDUMP
+.Xr ioctl 2
+request on it to save kernel crash dumps.
+If
 .Ar special_file
 is the text string:
-.Dq Li off .
+.Dq Li off ,
+.Nm
+performs a
+.Dv DIOCSKERNELDUMP
+.Xr ioctl 2
+on
+.Pa /dev/null
+and thus instructs the kernel not to save crash dumps.
 .Pp
 Since
 .Nm
@@ -108,7 +113,6 @@
 must be used to enable dumps for system panics which occur
 during kernel initialization.
 .Sh SEE ALSO

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

More information about the p4-projects mailing list