Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2002 14:47:16 -0800 (PST)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 22766 for review
Message-ID:  <200212262247.gBQMlGSw034667@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help

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

Change 22766 by marcel@marcel_vaio on 2002/12/26 14:47:08

	IFC @22765

Affected files ...

.. //depot/projects/ia64/bin/sh/builtins.def#5 integrate
.. //depot/projects/ia64/bin/sh/expand.c#7 integrate
.. //depot/projects/ia64/bin/sh/expand.h#3 integrate
.. //depot/projects/ia64/bin/sh/sh.1#18 integrate
.. //depot/projects/ia64/include/Makefile#21 integrate
.. //depot/projects/ia64/include/wordexp.h#1 branch
.. //depot/projects/ia64/lib/libc/gen/Makefile.inc#16 integrate
.. //depot/projects/ia64/lib/libc/gen/wordexp.3#1 branch
.. //depot/projects/ia64/lib/libc/gen/wordexp.c#1 branch
.. //depot/projects/ia64/lib/libc/locale/mbrune.3#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/mktemp.3#3 integrate
.. //depot/projects/ia64/lib/libc/stdlib/malloc.3#12 integrate
.. //depot/projects/ia64/lib/libc/sys/fcntl.2#7 integrate
.. //depot/projects/ia64/lib/libc/sys/mmap.2#9 integrate
.. //depot/projects/ia64/lib/libc/sys/vfork.2#3 integrate
.. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/ia64/lib/libdisk/disk.c#14 integrate
.. //depot/projects/ia64/lib/libkvm/kvm.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/ia64/libexec/atrun/atrun.man#2 integrate
.. //depot/projects/ia64/libexec/mknetid/netid.5#3 integrate
.. //depot/projects/ia64/release/Makefile#31 integrate
.. //depot/projects/ia64/sbin/disklabel/disklabel.8#10 integrate
.. //depot/projects/ia64/sbin/ping/ping.8#5 integrate
.. //depot/projects/ia64/share/man/man4/ccd.4#5 integrate
.. //depot/projects/ia64/share/man/man4/ieee80211.4#2 integrate
.. //depot/projects/ia64/share/man/man4/tcp.4#10 integrate
.. //depot/projects/ia64/share/man/man4/worm.4#2 integrate
.. //depot/projects/ia64/share/man/man7/hier.7#15 integrate
.. //depot/projects/ia64/share/man/man7/ports.7#6 integrate
.. //depot/projects/ia64/share/man/man7/security.7#5 integrate
.. //depot/projects/ia64/share/man/man7/tuning.7#17 integrate
.. //depot/projects/ia64/share/man/man9/DEVICE_PROBE.9#4 integrate
.. //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#9 integrate
.. //depot/projects/ia64/share/man/man9/VOP_INACTIVE.9#4 integrate
.. //depot/projects/ia64/share/man/man9/VOP_LINK.9#4 integrate
.. //depot/projects/ia64/share/man/man9/VOP_OPENCLOSE.9#4 integrate
.. //depot/projects/ia64/share/man/man9/accf_data.9#2 integrate
.. //depot/projects/ia64/share/man/man9/accf_http.9#4 integrate
.. //depot/projects/ia64/share/man/man9/device_add_child.9#2 integrate
.. //depot/projects/ia64/share/man/man9/device_enable.9#3 integrate
.. //depot/projects/ia64/share/man/man9/device_get_state.9#2 integrate
.. //depot/projects/ia64/share/man/man9/device_quiet.9#3 integrate
.. //depot/projects/ia64/share/man/man9/device_set_desc.9#2 integrate
.. //depot/projects/ia64/share/man/man9/device_set_flags.9#2 integrate
.. //depot/projects/ia64/share/man/man9/malloc.9#4 integrate
.. //depot/projects/ia64/share/man/man9/vget.9#3 integrate
.. //depot/projects/ia64/share/man/man9/vref.9#2 integrate
.. //depot/projects/ia64/share/man/man9/vrele.9#2 integrate
.. //depot/projects/ia64/sys/dev/an/if_an.c#13 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.h#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwmem.c#3 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci.c#4 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#5 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#4 integrate
.. //depot/projects/ia64/sys/dev/firewire/sbp.c#5 integrate
.. //depot/projects/ia64/sys/dev/usb/uhci.c#11 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi.c#26 integrate
.. //depot/projects/ia64/sys/geom/geom_dev.c#20 integrate
.. //depot/projects/ia64/sys/geom/geom_io.c#13 integrate
.. //depot/projects/ia64/sys/geom/geom_kern.c#10 integrate
.. //depot/projects/ia64/sys/geom/geom_subr.c#16 integrate
.. //depot/projects/ia64/sys/i386/isa/vesa.c#3 integrate
.. //depot/projects/ia64/sys/kern/kern_descrip.c#39 integrate
.. //depot/projects/ia64/sys/kern/kern_event.c#11 integrate
.. //depot/projects/ia64/sys/kern/sys_pipe.c#25 integrate
.. //depot/projects/ia64/sys/kern/uipc_usrreq.c#18 integrate
.. //depot/projects/ia64/sys/kern/vfs_vnops.c#22 integrate
.. //depot/projects/ia64/sys/kern/vnode_if.src#10 integrate
.. //depot/projects/ia64/sys/net/radix.c#8 integrate
.. //depot/projects/ia64/sys/net/route.c#8 integrate
.. //depot/projects/ia64/sys/net/rtsock.c#16 integrate
.. //depot/projects/ia64/sys/netinet/ip_dummynet.c#13 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#12 integrate
.. //depot/projects/ia64/sys/netinet/tcp_subr.c#24 integrate
.. //depot/projects/ia64/sys/netinet/tcp_timer.c#9 integrate
.. //depot/projects/ia64/sys/netinet6/in6.c#7 integrate
.. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#5 integrate
.. //depot/projects/ia64/sys/sys/file.h#14 integrate
.. //depot/projects/ia64/sys/vm/vm_fault.c#23 integrate
.. //depot/projects/ia64/sys/vm/vm_kern.c#17 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#7 integrate
.. //depot/projects/ia64/usr.bin/chpass/chpass.1#5 integrate
.. //depot/projects/ia64/usr.bin/finger/finger.1#6 integrate
.. //depot/projects/ia64/usr.bin/passwd/passwd.1#4 integrate
.. //depot/projects/ia64/usr.bin/talk/talk.1#6 integrate
.. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#3 integrate
.. //depot/projects/ia64/usr.bin/tip/tip/tip.1#7 integrate
.. //depot/projects/ia64/usr.sbin/apm/apm.8#5 integrate
.. //depot/projects/ia64/usr.sbin/arp/arp.4#3 integrate
.. //depot/projects/ia64/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#3 integrate
.. //depot/projects/ia64/usr.sbin/ntp/doc/ntpq.8#5 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsold.8#3 integrate
.. //depot/projects/ia64/usr.sbin/sicontrol/sicontrol.8#4 integrate
.. //depot/projects/ia64/usr.sbin/usbd/usbd.c#4 integrate

Differences ...

==== //depot/projects/ia64/bin/sh/builtins.def#5 (text+ko) ====

@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD: src/bin/sh/builtins.def,v 1.12 2002/07/23 11:50:53 tjr Exp $
+# $FreeBSD: src/bin/sh/builtins.def,v 1.13 2002/12/26 14:28:54 tjr Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
@@ -93,3 +93,4 @@
 ulimitcmd	ulimit
 testcmd		test [
 bindcmd		bind
+wordexpcmd	wordexp

==== //depot/projects/ia64/bin/sh/expand.c#7 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.39 2002/10/08 11:22:49 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.40 2002/12/26 14:28:54 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
+#include <string.h>
 
 /*
  * Routines to expand arguments to commands.  We have to deal with
@@ -1521,3 +1522,24 @@
 		STPUTC(*p++, buf);
 	return buf;
 }
+
+/*
+ * Do most of the work for wordexp(3).
+ */
+
+int
+wordexpcmd(int argc, char **argv)
+{
+	size_t len;
+	int i;
+
+	out1fmt("%08x", argc - 1);
+	for (i = 1, len = 0; i < argc; i++)
+		len += strlen(argv[i]);
+	out1fmt("%08x", (int)len);
+	for (i = 1; i < argc; i++) {
+		out1str(argv[i]);
+		out1c('\0');
+	}
+        return (0);
+}

==== //depot/projects/ia64/bin/sh/expand.h#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/expand.h,v 1.10 2002/02/02 06:50:46 imp Exp $
+ * $FreeBSD: src/bin/sh/expand.h,v 1.11 2002/12/26 14:28:54 tjr Exp $
  */
 
 struct strlist {
@@ -65,3 +65,4 @@
 int patmatch(char *, char *, int);
 void rmescapes(char *);
 int casematch(union node *, char *);
+int wordexpcmd(int, char **);

==== //depot/projects/ia64/bin/sh/sh.1#18 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.82 2002/12/23 15:21:38 ru Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.83 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd May 5, 1995
 .Dt SH 1
@@ -158,7 +158,7 @@
 The long name for an option may be specified as an argument to the
 .Fl /+o
 option of
-.Xr sh 1 .
+.Nm .
 Once the shell is running,
 the long name for an option may be specified as an argument to the
 .Fl /+o

==== //depot/projects/ia64/include/Makefile#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.191 2002/12/03 15:05:32 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -18,7 +18,8 @@
 	resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \
 	strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \
-	ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h
+	ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h \
+	wordexp.h
 
 MHDRS=	float.h floatingpoint.h stdarg.h varargs.h
 

==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#16 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.99 2002/12/26 14:34:18 tjr Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -29,7 +29,7 @@
 	sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
 	syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \
 	ttyslot.c ualarm.c ulimit.c uname.c unvis.c usleep.c utime.c \
-	valloc.c vis.c wait.c wait3.c waitpid.c
+	valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c
 
 # machine-dependent gen sources
 .if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc)
@@ -56,7 +56,7 @@
 	strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \
 	tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \
 	ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \
-	unvis.3 usleep.3 utime.3 valloc.3 vis.3
+	unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3
 
 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3
 MLINKS+=ctermid.3 ctermid_r.3
@@ -131,3 +131,4 @@
 MLINKS+=tzset.3 tzsetwall.3
 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
+MLINKS+=wordexp.3 wordfree.3

==== //depot/projects/ia64/lib/libc/locale/mbrune.3#5 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mbrune.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.13 2002/12/18 13:33:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.14 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt MBRUNE 3
@@ -157,7 +157,6 @@
 .Fa pattern
 does not appear in the string.
 .Sh "SEE ALSO
-.Xr mbrune 3 ,
 .Xr rune 3 ,
 .Xr setlocale 3 ,
 .Xr euc 4 ,

==== //depot/projects/ia64/lib/libc/stdio/mktemp.3#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.18 2002/12/18 12:45:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.19 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
@@ -102,7 +102,7 @@
 The
 .Fn mkdtemp
 function makes the same replacement to the template as in
-.Xr mktemp 3
+.Fn mktemp
 and creates the template directory, mode 0700.
 .Sh RETURN VALUES
 The

==== //depot/projects/ia64/lib/libc/stdlib/malloc.3#12 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.59 2002/12/20 01:01:24 trhodes Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.60 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd August 27, 1996
 .Dt MALLOC 3
@@ -487,7 +487,7 @@
 .Fx 2.2 .
 .Pp
 The
-.Xr reallocf 3
+.Fn reallocf
 function first appeared in
 .Fx 3.0 .
 .Sh AUTHORS

==== //depot/projects/ia64/lib/libc/sys/fcntl.2#7 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.40 2002/12/19 09:40:24 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.41 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd January 12, 1994
 .Dt FCNTL 2
@@ -343,7 +343,7 @@
 Note that
 .Xr flock 2
 and
-.Xr fcntl 2
+.Fn fcntl
 locks may be safely used concurrently but
 .Fn fcntl F_GETLK
 returns \-1 in

==== //depot/projects/ia64/lib/libc/sys/mmap.2#9 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.47 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.48 2002/12/24 16:52:30 ru Exp $
 .\"
 .Dd November 17, 2001
 .Dt MMAP 2
@@ -136,7 +136,7 @@
 Region is not included in a core file.
 .It Dv MAP_NOSYNC
 Causes data dirtied via this VM map to be flushed to physical media
-only when necessary (usually by the pager) rather then gratuitously.
+only when necessary (usually by the pager) rather than gratuitously.
 Typically this prevents the update daemons from flushing pages dirtied
 through such maps and thus allows efficient sharing of memory across
 unassociated processes using a file-backed shared memory map.
@@ -175,7 +175,7 @@
 to implement a file-based shared memory store.
 It is recommended that you create the backing store by
 .Fn write Ns ing
-zero's to the backing file rather then
+zero's to the backing file rather than
 .Fn ftruncate Ns ing
 it.
 You can test file fragmentation by observing the KB/t (kilobytes per
@@ -200,7 +200,7 @@
 implements a coherent file system buffer cache.
 However, it may be
 used to associate dirty VM pages with file system buffers and thus cause
-them to be flushed to physical media sooner rather then later.
+them to be flushed to physical media sooner rather than later.
 .It Dv MAP_PRIVATE
 Modifications are private.
 .It Dv MAP_SHARED

==== //depot/projects/ia64/lib/libc/sys/vfork.2#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.19 2002/12/18 09:22:32 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.20 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
@@ -115,7 +115,7 @@
 mechanisms are implemented.
 Users should not depend on the memory
 sharing semantics of
-.Xr vfork 2
+.Fn vfork
 as it will, in that case, be made synonymous to
 .Xr fork 2 .
 .Pp

==== //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_wrlock.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_wrlock.3,v 1.4 2001/10/01 16:09:09 ru Exp $
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_wrlock.3,v 1.5 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
@@ -61,9 +61,10 @@
 functions will return zero.  Otherwise an error number will be returned
 to indicate the error.
 .Sh SEE ALSO
-.Xr pthread_rwlock_trywrlock 3 ,
-.Xr pthread_rwlock_unlock 3 ,
-.Xr pthread_rwlock_wrlock 3
+.Xr pthread_rwlock_init 3 ,
+.Xr pthread_rwlock_rdlock 3 ,
+.Xr pthread_rwlock_tryrdlock 3 ,
+.Xr pthread_rwlock_unlock 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlock_wrlock

==== //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_setpshared.3,v 1.7 2001/10/01 16:09:09 ru Exp $
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_setpshared.3,v 1.8 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
@@ -60,8 +60,8 @@
 function will return zero.  Otherwise an error number will be returned
 to indicate the error.
 .Sh SEE ALSO
+.Xr pthread_rwlockattr_getpshared 3 ,
 .Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
 .Xr pthread_rwlock_init 3
 .Sh STANDARDS
 The

==== //depot/projects/ia64/lib/libdisk/disk.c#14 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.110 2002/11/17 13:51:22 nyan Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.111 2002/12/26 15:50:45 nyan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -166,6 +166,8 @@
 		exit (0);
 	}
 
+	if (s == 0)
+		return (NULL);
 	d->sector_size = s;
 	len /= s;	/* media size in number of sectors. */
 
@@ -481,6 +483,8 @@
 {
 #if !defined(__ia64__)
 #ifdef PC98
+	if (d->sector_size == 0)
+		return;
 	if (bootipl_size % d->sector_size != 0)
 		return;
 	if (d->bootipl)
@@ -509,6 +513,8 @@
 		memcpy(d->bootmenu, bootmenu, bootmenu_size);
 	}
 #else
+	if (d->sector_size == 0)
+		return;
 	if (s % d->sector_size != 0)
 		return;
 	if (d->bootmgr)

==== //depot/projects/ia64/lib/libkvm/kvm.3#3 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.10 2002/12/04 18:57:45 ru Exp $
+.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.11 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM 3
@@ -46,7 +46,7 @@
 .Lb libkvm
 .Sh DESCRIPTION
 The
-.Xr kvm 3
+.Nm
 library provides a uniform interface for accessing kernel virtual memory
 images, including live systems and crash dumps.
 Access to live systems is via

==== //depot/projects/ia64/lib/libpthread/man/pthread_rwlock_wrlock.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlock_wrlock.3,v 1.5 2002/09/16 19:29:29 mini Exp $
+.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlock_wrlock.3,v 1.6 2002/12/24 13:41:45 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
@@ -61,9 +61,9 @@
 functions will return zero.  Otherwise an error number will be returned
 to indicate the error.
 .Sh SEE ALSO
-.Xr pthread_rwlock_trywrlock 3 ,
-.Xr pthread_rwlock_unlock 3 ,
-.Xr pthread_rwlock_wrlock 3
+.Xr pthread_rwlock_rdlock 3 ,
+.Xr pthread_rwlock_tryrdlock 3 ,
+.Xr pthread_rwlock_unlock 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlock_wrlock

==== //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlockattr_setpshared.3,v 1.8 2002/09/16 19:29:29 mini Exp $
+.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlockattr_setpshared.3,v 1.9 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
@@ -60,8 +60,8 @@
 function will return zero.  Otherwise an error number will be returned
 to indicate the error.
 .Sh SEE ALSO
+.Xr pthread_rwlockattr_getpshared 3 ,
 .Xr pthread_rwlockattr_init 3 ,
-.Xr pthread_rwlockattr_setpshared 3 ,
 .Xr pthread_rwlock_init 3
 .Sh STANDARDS
 The

==== //depot/projects/ia64/libexec/atrun/atrun.man#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.10 2001/07/10 10:49:45 ru Exp $
+.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.11 2002/12/24 13:41:46 ru Exp $
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os
@@ -24,7 +24,7 @@
 .Ed
 .Pp
 so that
-.Xr atrun 8
+.Nm
 gets invoked every five minutes.
 .Pp
 At every invocation, 

==== //depot/projects/ia64/libexec/mknetid/netid.5#3 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.2 2002/01/14 16:59:01 ru Exp $
+.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.3 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd January 13, 1996
 .Dt NETID 5
@@ -70,7 +70,7 @@
 .Sm on
 .Pp
 The third type refers to records from a
-.Xr netid 5
+.Nm
 file other than the two types above.
 .Sh EXAMPLES
 A configuration file might look like the following:

==== //depot/projects/ia64/release/Makefile#31 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.738 2002/12/17 20:19:37 obrien Exp $
+# $FreeBSD: src/release/Makefile,v 1.739 2002/12/26 12:20:25 ru Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \
 #	[ RELEASETAG=tag ]
@@ -421,12 +421,33 @@
 	echo "trap 'umount /dev || true' 0"	>> ${CHROOTDIR}/mk
 	echo "_RELTARGET=\$${1:-doRELEASE}"	>> ${CHROOTDIR}/mk
 .for var in \
-	AUTO_KEYBOARD_DETECT BOOT_CONFIG BUILDNAME \
-	CD_EXTRA_BITS DISTRIBUTIONS DOC_LANG DOMINIMALDOCPORTS \
-	EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \
-	MAKE_ISOS NOCDROM NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \
-	NOSRC NO_CPU_CFLAGS NO_CPU_COPTFLAGS NO_SENDMAIL RELEASETAG \
-	RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS
+	AUTO_KEYBOARD_DETECT \
+	BOOT_CONFIG \
+	BUILDNAME \
+	CD_EXTRA_BITS \
+	DISTRIBUTIONS \
+	DOC_LANG \
+	DOMINIMALDOCPORTS \
+	EXTRA_SRC \
+	FIXCRYPTO \
+	KERNELS \
+	KERNEL_FLAGS \
+	MAKE_ISOS \
+	NOCDROM \
+	NODOC \
+	NOKERBEROS \
+	NOPORTS \
+	NOSHARED \
+	NOSRC \
+	NO_CPU_CFLAGS \
+	NO_CPU_COPTFLAGS \
+	NO_FLOPPIES \
+	NO_SENDMAIL \
+	RELEASETAG \
+	RELNOTES_LANG \
+	TARGET \
+	TARGET_ARCH \
+	WORLD_FLAGS
 .if defined(${var})
 	echo "export ${var}=\"${${var}}\""	>> ${CHROOTDIR}/mk
 .endif

==== //depot/projects/ia64/sbin/disklabel/disklabel.8#10 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.42 2002/11/25 15:43:18 ru Exp $
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.43 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
@@ -470,7 +470,7 @@
 Here you will define disk slices for your system.
 .It
 Use
-.Xr disklabel 8
+.Nm
 to define and write partitions and mount points.
 You are not required to define the mount points here though,
 they can be defined later using

==== //depot/projects/ia64/sbin/ping/ping.8#5 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/ping/ping.8,v 1.36 2002/10/02 03:24:27 dd Exp $
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.37 2002/12/24 16:52:30 ru Exp $
 .\"
 .Dd October 2, 2002
 .Dt PING 8
@@ -134,7 +134,7 @@
 .Em between sending each packet .
 The default is to wait for one second between each packet.
 The wait time may be fractional, but only the super-user may specify
-values less then 1 second.
+values less than 1 second.
 This option is incompatible with the
 .Fl f
 option.

==== //depot/projects/ia64/share/man/man4/ccd.4#5 (text+ko) ====

@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.25 2002/12/12 17:25:56 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.26 2002/12/24 16:52:30 ru Exp $
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
@@ -164,7 +164,7 @@
 Currently
 .Nm
 uses a dual seek zone model to optimize reads for a multi-tasking load
-rather then a sequential load.
+rather than a sequential load.
 .Pp
 In an event of a disk
 failure, you can use

==== //depot/projects/ia64/share/man/man4/ieee80211.4#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.4 2001/10/03 03:05:26 bde Exp $
+.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.5 2002/12/24 16:52:30 ru Exp $
 .\"
 .Dd February 23, 2001
 .Dt IEEE80211 4
@@ -172,7 +172,7 @@
 .Va i_data
 and
 .Va i_len .
-The length should be no longer then 32 characters.
+The length should be no longer than 32 characters.
 .It Dv IEEE80211_IOC_WEP
 Set the current WEP mode to the value given in
 .Va i_val .

==== //depot/projects/ia64/share/man/man4/tcp.4#10 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.31 2002/12/23 14:51:18 ru Exp $
+.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.32 2002/12/24 16:52:30 ru Exp $
 .\"
 .Dd February 14, 1995
 .Dt TCP 4
@@ -341,7 +341,7 @@
 This puts an upper bound on the bandwidth delay product window, in bytes.
 This value should not generally be modified but may be used to set a
 global per-connection limit on queued data, potentially allowing you to
-intentionally set a less then optimum limit to smooth data flow over a
+intentionally set a less than optimum limit to smooth data flow over a
 network while still being able to specify huge internal TCP buffers.
 .It tcp.inflight_stab
 The bandwidth delay product algorithm requires a slightly larger window

==== //depot/projects/ia64/share/man/man4/worm.4#2 (text+ko) ====

@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/worm.4,v 1.25 2001/08/17 06:42:31 kris Exp $
+.\" $FreeBSD: src/share/man/man4/worm.4,v 1.26 2002/12/24 13:41:46 ru Exp $
 .\" "
 .Dd October 15, 1998
 .Dt WORM 4
@@ -60,7 +60,7 @@
 layer.  The new
 .Tn SCSI
 layer doesn't include a
-.Xr worm 4
+.Nm
 driver, and isn't likely to include one in the future.  Future in-kernel
 support for CD-R/CD-RW/DVD drives will likely be implemented through the
 .Xr cd 4

==== //depot/projects/ia64/share/man/man7/hier.7#15 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man7/hier.7,v 1.79 2002/12/12 17:25:57 ru Exp $
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.80 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -408,7 +408,7 @@
 .Fx
 ports framework.
 Within local/, the general layout sketched out by
-.Xr hier 7
+.Nm
 for /usr
 should be used.  Exceptions are the man directory (directly under local/
 rather than under local/share/), ports documentation (in share/doc/<port>/),

==== //depot/projects/ia64/share/man/man7/ports.7#6 (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/share/man/man7/ports.7,v 1.34 2002/10/22 23:11:38 keramida Exp $
+.\" $FreeBSD: src/share/man/man7/ports.7,v 1.35 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
@@ -380,6 +380,6 @@
 chapter of
 .%B "The FreeBSD Handbook" ,
 and
-.Xr ports 7 .
+this man page.
 .Pp
 This man page is too long.

==== //depot/projects/ia64/share/man/man7/security.7#5 (text+ko) ====

@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\" $FreeBSD: src/share/man/man7/security.7,v 1.29 2002/12/12 17:25:57 ru Exp $
+.\" $FreeBSD: src/share/man/man7/security.7,v 1.30 2002/12/24 16:52:31 ru Exp $
 .\"
 .Dd September 18, 1999
 .Dt SECURITY 7
@@ -74,7 +74,7 @@
 It may not be able to take your machine down, but it can fill up Internet
 pipe.
 .Pp
-A user account compromise is even more common then a D.O.S. attack.  Many
+A user account compromise is even more common than a D.O.S. attack.  Many
 sysadmins still run standard telnetd, rlogind, rshd, and ftpd servers on their
 machines.  These servers, by default, do not operate over encrypted
 connections.  The result is that if you have any moderate-sized user base,
@@ -174,7 +174,7 @@
 may be the better solution since the wheel mechanism still allows an
 intruder to break root if the intruder has gotten hold of your password
 file and can break into a staff account.  While having the wheel mechanism
-is better then having nothing at all, it isn't necessarily the safest
+is better than having nothing at all, it isn't necessarily the safest
 option.
 .Pp
 An indirect way to secure the root account is to secure your staff accounts
@@ -276,7 +276,7 @@
 was found in Xlib in 1998 that made xterm
 (which is typically suid)
 vulnerable.
-It is better to be safe then sorry and the prudent sysadmin will restrict suid
+It is better to be safe than sorry and the prudent sysadmin will restrict suid
 binaries that only staff should run to a special group that only staff can
 access, and get rid of
 .Pq Li "chmod 000"
@@ -369,7 +369,7 @@
 last layer of your security onion is perhaps the most important - detection.
 The rest of your security is pretty much useless (or, worse, presents you with
 a false sense of safety) if you cannot detect potential incursions.  Half
-the job of the onion is to slow down the attacker rather then stop him
+the job of the onion is to slow down the attacker rather than stop him
 in order to give the detection side of the equation a chance to catch him in
 the act.
 .Pp
@@ -413,7 +413,7 @@
 and
 .Pa /usr
 .Pp
-When using ssh rather then NFS, writing the security script is much more
+When using ssh rather than NFS, writing the security script is much more
 difficult.   You essentially have to
 .Pa scp
 the scripts to the client box in order to run them, making them visible, and
@@ -608,7 +608,7 @@
 These routes typically timeout in 1600
 seconds or so.  If the kernel detects that the cached route table has gotten
 too big it will dynamically reduce the rtexpire but will never decrease it to
-less then rtminexpire.  There are two problems:  (1) The kernel does not react
+less than rtminexpire.  There are two problems:  (1) The kernel does not react
 quickly enough when a lightly loaded server is suddenly attacked, and (2) The
 rtminexpire is not low enough for the kernel to survive a sustained attack.
 If your servers are connected to the internet via a T3 or better it may be

==== //depot/projects/ia64/share/man/man7/tuning.7#17 (text+ko) ====

@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.57 2002/12/23 15:05:18 ru Exp $
+.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.58 2002/12/24 16:52:31 ru Exp $
 .\"
 .Dd June 25, 2002
 .Dt TUNING 7
@@ -496,7 +496,7 @@
 bandwidth limitations in order to ensure that they are not charged for
 using too much bandwidth.
 .Pp
-Setting the send or receive TCP buffer to values larger then 65535 will result
+Setting the send or receive TCP buffer to values larger than 65535 will result
 in a marginal performance improvement unless both hosts support the window
 scaling extension of the TCP protocol, which is controlled by the
 .Va net.inet.tcp.rfc1323

==== //depot/projects/ia64/share/man/man9/DEVICE_PROBE.9#4 (text+ko) ====

@@ -26,7 +26,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/share/man/man9/DEVICE_PROBE.9,v 1.13 2002/03/18 10:43:49 ru Exp $
+.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.15 2002/12/24 16:52:31 ru Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_PROBE 9
@@ -75,13 +75,12 @@
 A value equal to or less than zero indicates success, greater than
 zero indicates an error (errno). For values equal to or less than
 zero: zero indicates highest priority, no further probing is done;
-for a value less then zero, the lower the value the lower the
+for a value less than zero, the lower the value the lower the
 priority, e.g. -100 indicates a lower priority than -50.
 .Sh SEE ALSO
 .Xr device 9 ,
 .Xr DEVICE_DETACH 9 ,
 .Xr DEVICE_IDENTIFY 9 ,
-.Xr DEVICE_PROBE 9 ,
 .Xr DEVICE_SHUTDOWN 9
 .Sh AUTHORS
 This man page was written by

==== //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#9 (text+ko) ====

@@ -26,7 +26,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/share/man/man9/VOP_ATTRIB.9,v 1.22 2002/12/12 17:25:58 ru Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.23 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
@@ -60,7 +60,7 @@
 .El
 .Pp
 Attributes which are not being modified by
-.Xr VOP_SETATTR 9
+.Fn VOP_SETATTR
 should be set to the value
 .Dv VNOVAL ;
 .Fn VATTR_NULL
@@ -69,21 +69,21 @@
 .Fa *vap
 prior to setting specific values.
 .Sh LOCKS
-.Xr VOP_GETATTR 9
+.Fn VOP_GETATTR
 expects the vnode to be locked on entry and will leave the vnode locked on
 return.
 The lock type can be either shared or exclusive.
 .Pp
-.Xr VOP_SETATTR 9
+.Fn VOP_SETATTR
 expects the vnode to be locked on entry and will leave the vnode locked on
 return.
 The lock type must be exclusive.
 .Sh RETURN VALUES
-.Xr VOP_GETATTR 9
+.Fn VOP_GETATTR
 returns 0 if it was able to retrieve the attribute data via
 .Fa *vap ,
 otherwise an appropriate error is returned.
-.Xr VOP_SETATTR 9
+.Fn VOP_SETATTR
 returns zero if the attributes were changed successfully, otherwise an
 appropriate error is returned.
 .Sh PSEUDOCODE

==== //depot/projects/ia64/share/man/man9/VOP_INACTIVE.9#4 (text+ko) ====

@@ -26,7 +26,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/share/man/man9/VOP_INACTIVE.9,v 1.10 2002/12/12 17:25:58 ru Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_INACTIVE.9,v 1.11 2002/12/24 13:41:46 ru Exp $
 .\"
 .Dd July 24, 1996
 .Os
@@ -49,12 +49,12 @@
 the vnode being reclaimed
 .El
 .Pp
-.Xr VOP_INACTIVE 9
+.Fn VOP_INACTIVE
 is called when the kernel is no longer using the vnode.  This may be
 because the reference count reaches zero or it may be that the
 file system is being forcibly unmounted while there are open files.
 It can be used to reclaim space for 'open but deleted' files.
-.Xr VOP_RECLAIM 9
+.Fn VOP_RECLAIM

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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212262247.gBQMlGSw034667>