Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Jun 2004 21:49:29 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 55187 for review
Message-ID:  <200406172149.i5HLnT4o009899@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55187

Change 55187 by peter@peter_hammer on 2004/06/17 21:49:24

	IFC @55185

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#53 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/sparc64/elf64-sparc.c-bad-rtld.diff#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#11 integrate
.. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#9 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac_get.3#6 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#18 integrate
.. //depot/projects/hammer/libexec/Makefile#23 integrate
.. //depot/projects/hammer/libexec/rtld-elf/Makefile#12 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/Makefile.inc#2 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#2 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/hammer/share/man/man4/acpi_video.4#2 integrate
.. //depot/projects/hammer/share/man/man4/bfe.4#3 integrate
.. //depot/projects/hammer/share/man/man4/dcons.4#3 integrate
.. //depot/projects/hammer/share/man/man4/dcons_crom.4#3 integrate
.. //depot/projects/hammer/share/man/man4/en.4#4 integrate
.. //depot/projects/hammer/share/man/man4/fla.4#2 integrate
.. //depot/projects/hammer/share/man/man4/gem.4#2 integrate
.. //depot/projects/hammer/share/man/man4/harp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/hme.4#3 integrate
.. //depot/projects/hammer/share/man/man4/idt.4#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#83 integrate
.. //depot/projects/hammer/sys/arm/arm/nexus_io.c#3 integrate
.. //depot/projects/hammer/sys/arm/include/bus.h#3 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#3 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#7 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#10 integrate
.. //depot/projects/hammer/sys/coda/coda.h#4 integrate
.. //depot/projects/hammer/sys/coda/coda_fbsd.c#9 integrate
.. //depot/projects/hammer/sys/coda/coda_venus.c#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#14 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#11 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#5 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_socket.h#3 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#10 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_types.h#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#9 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#5 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#18 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#36 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#17 integrate
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#5 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#9 integrate
.. //depot/projects/hammer/sys/dev/cy/cy.c#7 integrate
.. //depot/projects/hammer/sys/dev/dcons/dcons.c#6 integrate
.. //depot/projects/hammer/sys/dev/digi/digi.c#11 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdev.c#15 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#9 integrate
.. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#13 integrate
.. //depot/projects/hammer/sys/dev/snp/snp.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#8 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#19 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinum.c#11 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#14 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumio.c#15 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#12 integrate
.. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#21 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#23 integrate
.. //depot/projects/hammer/sys/i386/i386/bios.c#15 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.h#5 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_rrip.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#14 integrate
.. //depot/projects/hammer/sys/kern/tty_cons.c#14 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#16 integrate
.. //depot/projects/hammer/sys/kern/tty_tty.c#8 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#16 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#32 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#27 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#41 integrate
.. //depot/projects/hammer/sys/net/bpf.c#19 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#15 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#17 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate
.. //depot/projects/hammer/sys/netsmb/smb_dev.c#8 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vn_subs.c#2 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#14 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#14 integrate
.. //depot/projects/hammer/sys/sys/_types.h#10 integrate
.. //depot/projects/hammer/sys/sys/acct.h#4 integrate
.. //depot/projects/hammer/sys/sys/conf.h#14 integrate
.. //depot/projects/hammer/sys/sys/param.h#35 integrate
.. //depot/projects/hammer/sys/sys/snoop.h#4 integrate
.. //depot/projects/hammer/sys/sys/stat.h#9 integrate
.. //depot/projects/hammer/sys/sys/systm.h#19 integrate
.. //depot/projects/hammer/sys/sys/tty.h#9 integrate
.. //depot/projects/hammer/sys/sys/types.h#17 integrate
.. //depot/projects/hammer/sys/sys/user.h#11 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#26 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#28 integrate
.. //depot/projects/hammer/sys/vm/vm_param.h#4 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#8 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.h#3 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.c#3 integrate
.. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#5 integrate
.. //depot/projects/hammer/usr.sbin/pw/psdate.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw_user.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw_vpw.c#2 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#53 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.427 2004/05/17 16:19:51 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.430 2004/06/17 08:06:41 obrien Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -62,7 +62,10 @@
 .if !defined(NOSHARE)
 SUBDIR+=share
 .endif
-SUBDIR+=sys usr.bin usr.sbin etc
+.if ${MACHINE_ARCH} != "alpha"
+SUBDIR+=sys
+.endif
+SUBDIR+=usr.bin usr.sbin etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.

==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.5 2004/06/16 23:39:31 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.6 2004/06/17 15:23:51 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -556,7 +556,7 @@
 		    s->src_nodes, "");
 		for (i = 0; i < SCNT_MAX; i++) {
 			printf("  %-25s %14lld ", pf_scounters[i],
-				    s->scounters[i]);
+				   (unsigned long long)s->scounters[i]);
 			if (runtime > 0)
 				printf("%14.1f/s\n",
 				    (double)s->scounters[i] / (double)runtime);

==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.7 2002/12/02 09:59:05 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.8 2004/06/17 16:08:20 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_sparc_vec
 
@@ -7,7 +7,7 @@
 	elf32-sparc.c	\
 	elf32-target.h	\
 	elf32.c		\
-	elf64-sparc.c	\
+	elf64-sparc%FIXED.c	\
 	elf64-target.h	\
 	elf64.c		\
 	elflink.c	\
@@ -25,3 +25,8 @@
 
 elf64-target.h:	elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+=	elf64-sparc%FIXED.c
+elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff
+	cp ${.ALLSRC:M*.c} ${.TARGET}
+	patch -b .orig < ${.ALLSRC:M*.diff}

==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.18 2004/06/15 07:12:04 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.19 2004/06/17 03:09:06 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -336,7 +336,9 @@
 	}
 	set_ownership(a, entry, flags);
 	set_time(a, entry, flags);
-	set_perm(a, entry, archive_entry_mode(entry), flags);
+	/* Always restore permissions for regular files. */
+	set_perm(a, entry, archive_entry_mode(entry),
+	    flags | ARCHIVE_EXTRACT_PERM);
 	set_extended_perm(a, entry, flags);
 	close(fd);
 	return (r);

==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.15 2003/04/20 03:18:44 rwatson Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.16 2004/06/17 16:08:36 rwatson Exp $
 
 MAINTAINER=	rwatson@FreeBSD.org
 
@@ -75,6 +75,7 @@
 	extattr.3 extattr_string_to_namespace.3 \
 	mac_get.3 mac_get_fd.3			\
 	mac_get.3 mac_get_file.3		\
+	mac_get.3 mac_get_link.3		\
 	mac_get.3 mac_get_pid.3			\
 	mac_get.3 mac_get_proc.3		\
 	mac_prepare.3 mac_prepare_file_label.3	\

==== //depot/projects/hammer/lib/libc/posix1e/mac_get.3#6 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2001 Networks Associates Technology, Inc.
+.\" Copyright (c) 2001, 2004 Networks Associates Technology, Inc.
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by Chris
@@ -28,13 +28,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.8 2003/11/16 20:18:24 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.9 2004/06/17 16:08:36 rwatson Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_GET 3
 .Os
 .Sh NAME
 .Nm mac_get_file ,
+.Nm mac_get_link ,
 .Nm mac_get_fd ,
 .Nm mac_get_proc
 .Nd get the label of a file, socket, socket peer or process
@@ -45,6 +46,8 @@
 .Ft int
 .Fn mac_get_file "const char *path" "mac_t label"
 .Ft int
+.Fn mac_get_link "const char *path" "mac_t label"
+.Ft int
 .Fn mac_get_fd "int fd" "mac_t label"
 .Ft int
 .Fn mac_get_peer "int fd" "mac_t label"
@@ -57,6 +60,11 @@
 .Fn mac_get_file
 system call returns the label associated with a file specified by
 pathname.
+The
+.Fn mac_get_link 
+function is the same as
+.Fn mac_get_file ,
+except that it does not follow symlinks.
 .Pp
 The
 .Fn mac_get_fd

==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#18 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.74 2004/06/16 00:34:31 julian Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.75 2004/06/17 17:16:39 phk Exp $");
 
 /*
  * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
@@ -251,7 +251,7 @@
 					 "can't read tty at %x", sess.s_ttyp);
 				return (-1);
 			}
-			kp->ki_tdev = tty.t_dev;
+			kp->ki_tdev = tty.t_dev;	/* XXX: wrong */
 			if (tty.t_pgrp != NULL) {
 				if (KREAD(kd, (u_long)tty.t_pgrp, &pgrp)) {
 					_kvm_err(kd, kd->program,

==== //depot/projects/hammer/libexec/Makefile#23 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.65 2004/03/08 22:03:28 mlaier Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.67 2004/06/17 16:08:19 obrien Exp $
 
 SUBDIR=	atrun \
 	bootpd \

==== //depot/projects/hammer/libexec/rtld-elf/Makefile#12 (text+ko) ====

@@ -1,12 +1,9 @@
-# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.29 2004/05/15 00:13:14 cognet Exp $
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.31 2004/06/17 19:01:53 cognet Exp $
 
 PROG?=		ld-elf.so.1
-# XXX: Hopefully this won't be needed after the next binutils import.
-.if ${MACHINE_ARCH} != "arm"
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \
 		malloc.c xmalloc.c debug.c libmap.c
-.endif
 MAN=		rtld.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD

==== //depot/projects/hammer/libexec/rtld-elf/arm/Makefile.inc#2 (text+ko) ====

@@ -1,3 +1,1 @@
-# $FreeBSD: src/libexec/rtld-elf/arm/Makefile.inc,v 1.2 2004/05/15 00:13:14 cognet Exp $
-SRCS=	reloc.c rtld.c rtld_start.S rtld_lock.c map_object.c \
-	malloc.c xmalloc.c debug.c libmap.c
+# $FreeBSD: src/libexec/rtld-elf/arm/Makefile.inc,v 1.3 2004/06/17 17:53:16 cognet Exp $

==== //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.1 2004/05/20 10:24:22 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.2 2004/06/17 06:04:14 pjd Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
@@ -153,8 +153,8 @@
 		concat_metadata_encode(&md, sector);
 		error = g_metadata_store(name, sector, sizeof(sector));
 		if (error != 0) {
-			fprintf(stderr, "Can't store metadata on %s: %s.", name,
-			    strerror(error));
+			fprintf(stderr, "Can't store metadata on %s: %s.\n",
+			    name, strerror(error));
 			gctl_error(req, "Not fully done.");
 			continue;
 		}
@@ -187,8 +187,8 @@
 
 		error = g_metadata_clear(name, G_CONCAT_MAGIC);
 		if (error != 0) {
-			fprintf(stderr, "Can't clear metadata on %s: %s.", name,
-			    strerror(error));
+			fprintf(stderr, "Can't clear metadata on %s: %s.\n",
+			    name, strerror(error));
 			gctl_error(req, "Not fully done.");
 			continue;
 		}

==== //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.1 2004/05/20 10:24:23 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.2 2004/06/17 06:04:14 pjd Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
@@ -172,8 +172,8 @@
 		stripe_metadata_encode(&md, sector);
 		error = g_metadata_store(name, sector, sizeof(sector));
 		if (error != 0) {
-			fprintf(stderr, "Can't store metadata on %s: %s.", name,
-			    strerror(error));
+			fprintf(stderr, "Can't store metadata on %s: %s.\n",
+			    name, strerror(error));
 			gctl_error(req, "Not fully done.");
 			continue;
 		}
@@ -206,8 +206,8 @@
 
 		error = g_metadata_clear(name, G_STRIPE_MAGIC);
 		if (error != 0) {
-			fprintf(stderr, "Can't clear metadata on %s: %s.", name,
-			    strerror(error));
+			fprintf(stderr, "Can't clear metadata on %s: %s.\n",
+			    name, strerror(error));
 			gctl_error(req, "Not fully done.");
 			continue;
 		}

==== //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#2 (text+ko) ====

@@ -22,15 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_barrier_destroy.3,v 1.1 2004/02/19 13:51:52 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_barrier_destroy.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd February 19, 2004
-.Dt PTHREAD_BARRIER_DESTROY 3 PTHREAD_BARRIER_INIT 3 PTHREAD_BARRIER_WAIT 3
+.Dt PTHREAD_BARRIER 3
 .Os
 .Sh NAME
-.Nm pthread_barrier_destroy pthread_barrier_init pthread_barrier_wait
+.Nm pthread_barrier_destroy , pthread_barrier_init , pthread_barrier_wait
 .Nd "destroy, initialize or wait on a barrier object"
 .Sh LIBRARY
 .Lb libpthread
@@ -50,7 +48,8 @@
 .Fa barrier
 with attributes specified in
 .Fa attr ,
-or if it is NULL,
+or if it is
+.Dv NULL ,
 with default attributes.
 The number of threads that must call
 .Fn pthread_barrier_wait
@@ -76,27 +75,31 @@
 argument to
 .Fn pthread_barrier_init .
 Once the threads have been released the barrier will be reset.
-.Sh DIAGNOSTICS
+.Sh RETURN VALUES
 If successful,
 both
 .Fn pthread_barrier_destroy
 and
 .Fn pthread_barrier_init
 will return zero.
-Otherwise an error number will be returned to indicate the error.
+Otherwise, an error number will be returned to indicate the error.
 If the call to
 .Fn pthread_barrier_wait
-is successful all but one of the threads will return zero.
-That one thread will return PTHREAD_BARRIER_SERIAL_THREAD.
-Otherwise an error number will be returned to indicate the error.
+is successful, all but one of the threads will return zero.
+That one thread will return
+.Dv PTHREAD_BARRIER_SERIAL_THREAD .
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-None of these functions will return EINTR.
+None of these functions will return
+.Er EINTR .
 .Sh IMPLIMENTATION NOTES
 In both
 .Lb libpthread
 and
 .Lb libthr
-the PTHREAD_BARRIER_SERIAL_THREAD return value will
+the
+.Dv PTHREAD_BARRIER_SERIAL_THREAD
+return value will
 always be returned by the last thread to reach the barrier.
 .Sh ERRORS
 The
@@ -139,7 +142,6 @@
 .Fa barrier .
 .El
 .Sh SEE ALSO
-.Xr pthread_barrier_wait 3 ,
 .Xr pthread_barrierattr 3
 .Sh HISTORY
 The

==== //depot/projects/hammer/share/man/man3/pthread_barrierattr.3#2 (text+ko) ====

@@ -22,16 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_barrierattr.3,v 1.1 2004/02/19 13:51:52 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_barrierattr.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd February 19, 2004
-.Dt PTHREAD_BARRIERATTR_DESTROY 3 PTHREAD_BARRIERATTR_GETPSHARED 3 PTHREAD_BARRIERATTR_INIT 3 PTHREAD_BARRIERATTR_SETPSHARED 3
+.Dt PTHREAD_BARRIERATTR 3
 .Os
 .Sh NAME
-.Nm pthread_barrierattr_destroy pthread_barrierattr_getpshared
-.Nm pthread_barrierattr_init pthread_barrierattr_setpshared
+.Nm pthread_barrierattr_destroy , pthread_barrierattr_getpshared ,
+.Nm pthread_barrierattr_init , pthread_barrierattr_setpshared
 .Nd "manipulate a barrier attribute object"
 .Sh LIBRARY
 .Lb libpthread
@@ -69,7 +67,7 @@
 function will set the process-shared attribute of
 .Fa attr
 to the value specified in
-.Fa pshared.
+.Fa pshared .
 The argument
 .Fa pshared
 may have one of the following values:
@@ -81,12 +79,12 @@
 The barrier object it is attached to may be accessed by
 threads in processes other than the one that created the object.
 .El
-.Sh DIAGNOSTICS
-If successful all these functions will return zero.
-Otherwise an error number will be returned to indicate the error.
+.Sh RETURN VALUES
+If successful, all these functions will return zero.
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-None of these functions will return EINTR.
-.Pp
+None of these functions will return
+.Er EINTR .
 .Sh ERRORS
 The
 .Fn pthread_barrierattr_destroy ,
@@ -122,10 +120,10 @@
 .Sh SEE ALSO
 .Xr pthread_barrier_destroy 3 ,
 .Xr pthread_barrier_init 3 ,
-.Xr pthread_barrier_wait 3 ,
+.Xr pthread_barrier_wait 3
 .Sh HISTORY
 The
-.Fn pthread_barrierattr
+.Fn pthread_barrierattr_*
 functions first appeared in
 .Lb libpthread
 in
@@ -136,15 +134,16 @@
 .Fx 5.3 .
 .Sh BUGS
 The implementation of
-.Fn pthread_barriers
+barriers
 does not fully conform to
 .St -p1003.2
 because the process-shared attribute is ignored in
 .Lb libthr ,
 and in
-.Lb libpthread
+.Lb libpthread ;
 if any value other than
 .Dv PTHREAD_PROCESSES_PRIVATE
 is specified in a call to
-.Fn pthread_barrierattr_setpshared
-it will return EINVAL.
+.Fn pthread_barrierattr_setpshared ,
+it will return
+.Er EINVAL .

==== //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#2 (text+ko) ====

@@ -22,14 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedrdlock.3,v 1.1 2004/01/16 10:52:10 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedrdlock.3,v 1.2 2004/06/17 17:49:30 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDRDLOCK 3
 .Os
 .Sh NAME
-.Nm pthread_rwlock_timedrdlock ,
-.Nd acquire a read-write lock for reading or give up after a specified period
+.Nm pthread_rwlock_timedrdlock
+.Nd "acquire a read-write lock for reading or give up after a specified period"
 .Sh LIBRARY
 .Lb libpthread
 .Lb libthr
@@ -47,15 +47,14 @@
 .Fa abs_timeout
 expires.
 .Pp
-.Pp
 A thread may hold multiple concurrent read locks.
 The
-.Fn pthread_rwlock_unlock
+.Xr pthread_rwlock_unlock 3
 function must be called once for each lock acquired.
 .Pp
 If the thread should be interrupted by a signal,
 the
-.Fn pthread_rwlock_wrlock
+.Fn pthread_rwlock_timedrdlock
 function will be automatically restarted after the thread returns from
 the signal handler.
 .Pp
@@ -69,17 +68,18 @@
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_rwlock_timedrdlock
-function will return zero.  Otherwise an error number will be returned
-to indicate the error.
+function will return zero.
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-This function shall not return an error code of EINTR.
+This function shall not return an error code of
+.Er EINTR .
 .Sh ERRORS
 The
 .Fn pthread_rwlock_timedrdlock
 function will fail if:
 .Bl -tag -width Er
 .It Bq Er ETIMEDOUT
-The lock could not be acquired before the specified timeout expired
+The lock could not be acquired before the specified timeout expired.
 .El
 .Pp
 The
@@ -99,13 +99,14 @@
 .Fa rwlock
 does not refer to an initialized read-write lock object,
 or the
-.Fa abs_timeout nanosecond value is less than zero or
+.Fa abs_timeout
+nanosecond value is less than zero or
 greater than or equal to 1 billion.
 .El
 .Sh SEE ALSO
 .Xr pthread_rwlock_init 3 ,
-.Xr pthread_rwlock_timedwrlock 3
-.Xr pthread_rwlock_unlock 3 ,
+.Xr pthread_rwlock_timedwrlock 3 ,
+.Xr pthread_rwlock_unlock 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlock_timedrdlock

==== //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#2 (text+ko) ====

@@ -22,14 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedwrlock.3,v 1.1 2004/01/16 10:52:10 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedwrlock.3,v 1.2 2004/06/17 17:49:30 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDWRLOCK 3
 .Os
 .Sh NAME
-.Nm pthread_rwlock_timedwrlock ,
-.Nd acquire a read-write lock for writing or give up after a specified period
+.Nm pthread_rwlock_timedwrlock
+.Nd "acquire a read-write lock for writing or give up after a specified period"
 .Sh LIBRARY
 .Lb libpthread
 .Lb libthr
@@ -49,9 +49,9 @@
 .Pp
 If the thread should be interrupted by a signal,
 the
-.Fn pthread_rwlock_wrlock
+.Fn pthread_rwlock_timedwrlock
 function will be automatically restarted after the thread returns from
-the signal handler. 
+the signal handler.
 .Pp
 The calling thread may deadlock if
 at the time the call is made it holds
@@ -63,17 +63,18 @@
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_rwlock_timedwrlock
-function will return zero.  Otherwise an error number will be returned
-to indicate the error.
+function will return zero.
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-This function shall not return an error code of EINTR.
+This function shall not return an error code of
+.Er EINTR .
 .Sh ERRORS
 The
 .Fn pthread_rwlock_timedwrlock
 function shall fail if:
 .Bl -tag -width Er
 .It Bq Er ETIMEDOUT
-The lock could not be acquired before the specified timeout expired
+The lock could not be acquired before the specified timeout expired.
 .El
 .Pp
 The
@@ -88,13 +89,14 @@
 .Fa rwlock
 does not refer to an initialized read-write lock object,
 or the
-.Fa abs_timeout nanosecond value is less than zero or
+.Fa abs_timeout
+nanosecond value is less than zero or
 greater than or equal to 1 billion.
 .El
 .Sh SEE ALSO
 .Xr pthread_rwlock_init 3 ,
-.Xr pthread_rwlock_timedrdlock 3
-.Xr pthread_rwlock_unlock 3 ,
+.Xr pthread_rwlock_timedrdlock 3 ,
+.Xr pthread_rwlock_unlock 3
 .Sh STANDARDS
 The
 .Fn pthread_rwlock_timedwrlock

==== //depot/projects/hammer/share/man/man3/pthread_spin_init.3#2 (text+ko) ====

@@ -22,15 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_spin_init.3,v 1.1 2004/01/22 15:31:56 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_spin_init.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd January 22, 2004
-.Dt PTHREAD_SPIN_INIT 3 PTHREAD_SPIN_DESTROY 3
+.Dt PTHREAD_SPIN_INIT 3
 .Os
 .Sh NAME
-.Nm pthread_spin_init pthread_spin_destroy
+.Nm pthread_spin_init , pthread_spin_destroy
 .Nd "initialize or destroy a spin lock"
 .Sh LIBRARY
 .Lb libpthread
@@ -51,15 +49,15 @@
 If
 .Fa pshared
 is set to
-.Dv PTHREAD_PROCESS_SHARED
+.Dv PTHREAD_PROCESS_SHARED ,
 any thread,
 whether belonging to the process in which the spinlock was created or not,
 that has access to the memory area where
 .Fa lock
-resides can use
+resides, can use
 .Fa lock .
 If it is set to
-.Dv PTHREAD_PROCESS_PRIVATE
+.Dv PTHREAD_PROCESS_PRIVATE ,
 it can only be used by threads within the same process.
 .Pp
 The
@@ -67,18 +65,17 @@
 function will destroy
 .Fa lock
 and release any resources that may have been allocated on its behalf.
-.Pp
-.Sh DIAGNOSTICS
+.Sh RETURN VALUES
 If successful,
 both
 .Fn pthread_spin_init
 and
 .Fn pthread_spin_destroy
 will return zero.
-Otherwise an error number will be returned to indicate the error.
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-Neither of these functions will return EINTR.
-.Pp
+Neither of these functions will return
+.Er EINTR .
 .Sh ERRORS
 The
 .Fn pthread_spin_init
@@ -138,4 +135,5 @@
 .Lb libpthread
 if any value other than
 .Dv PTHREAD_PROCESSES_PRIVATE
-is specified it returns EINVAL.
+is specified, it returns
+.Er EINVAL .

==== //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#2 (text+ko) ====

@@ -22,12 +22,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_spin_lock.3,v 1.1 2004/01/22 15:31:56 mtm Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_spin_lock.3,v 1.2 2004/06/17 17:51:17 ru Exp $
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd January 22, 2004
-.Dt PTHREAD_SPIN_LOCK 3 PTHREAD_SPIN_TRYLOCK 3 PTHREAD_SPIN_UNLOCK 3
+.Dt PTHREAD_SPIN_LOCK 3
 .Os
 .Sh NAME
 .Nm pthread_spin_lock pthread_spin_trylock pthread_spin_unlock
@@ -49,7 +47,7 @@
 function will acquire
 .Fa lock
 if it is not currently owned by another thread.
-If the lock cannot be acquired immediately it will
+If the lock cannot be acquired immediately, it will
 spin attempting to acquire the lock (it will not sleep) until
 it becomes available.
 .Pp
@@ -69,12 +67,12 @@
 .Fn pthread_spin_lock
 or
 .Fn pthread_spin_trylock .
-.Sh DIAGNOSTICS
-If successful all these functions will return zero.
-Otherwise an error number will be returned to indicate the error.
+.Sh RETURN VALUES
+If successful, all these functions will return zero.
+Otherwise, an error number will be returned to indicate the error.
 .Pp
-None of these functions will return EINTR.
-.Pp
+None of these functions will return
+.Er EINTR .
 .Sh ERRORS
 The
 .Fn pthread_spin_lock ,
@@ -115,8 +113,8 @@
 .Fa lock .
 .El
 .Sh SEE ALSO
-.Xr pthread_spin_init 3 ,
-.Xr pthread_spin_destroy 3
+.Xr pthread_spin_destroy 3 ,
+.Xr pthread_spin_init 3
 .Sh HISTORY
 The
 .Fn pthread_spin_lock ,

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

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/acpi_video.4,v 1.1 2004/03/03 16:34:03 njl Exp $
+.\" $FreeBSD: src/share/man/man4/acpi_video.4,v 1.2 2004/06/17 19:51:17 ru Exp $
 .\"
-.Dd March 03, 2004
+.Dd March 3, 2004
 .Dt ACPI_VIDEO 4
 .Os
 .Sh NAME
@@ -38,20 +38,25 @@
 backlight brightness.
 The availability of the
 .Xr sysctl 8
-variables depends on the functions offered by the hosts ACPI implementation.
+variables depends on the functions offered by the host's ACPI implementation.
 .Sh SYSCTLS
 The following sysctls are currently implemented,
-where <device> is "crt", "lcd" or "tv":
+where
+.Aq Ar device
+is
+.Va crt , lcd ,
+or
+.Va tv :
 .Bl -tag -width indent
-.It Va hw.acpi.video.<device>.active
+.It Va hw.acpi.video. Ns Ao Ar device Ac Ns Va .active
 Current state of the device.
-.It Va hw.acpi.video.<device>.levels
+.It Va hw.acpi.video. Ns Ao Ar device Ac Ns Va .levels
 List of supported brightness levels.
-.It Va hw.acpi.video.<device>.brightness
+.It Va hw.acpi.video. Ns Ao Ar device Ac Ns Va .brightness
 Current brightness level of the device.
-.It Va hw.acpi.video.<device>.fullpower
+.It Va hw.acpi.video. Ns Ao Ar device Ac Ns Va .fullpower
 Preset brightness level to be used in full power mode.
-.It Va hw.acpi.video.<device>.economy
+.It Va hw.acpi.video. Ns Ao Ar device Ac Ns Va .economy
 Preset brightness level to be used in economy mode.
 .El
 .Pp

==== //depot/projects/hammer/share/man/man4/bfe.4#3 (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/man4/bfe.4,v 1.2 2004/03/02 18:30:25 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/bfe.4,v 1.3 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd September 4, 2003
 .Dt BFE 4
@@ -42,28 +42,25 @@
 The
 .Nm
 driver supports the following media types:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It autoselect
-Enable autoselection of the media type and options
-.It 10baseT/UTP
-Set 10Mbps operation
-.It 100baseTX
-Set 100Mbps (fast ethernet) operation
+.Bl -tag -width ".Cm 10baseT/UTP"
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm 10baseT/UTP
+Set 10Mbps operation.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
 .El
 .Pp
 The
 .Nm
 driver supports the following media options:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It full-duplex
-Set full duplex operation
+.Bl -tag -width ".Cm full-duplex"
+.It Cm full-duplex
+Set full duplex operation.
 .El
 .Pp
 For further information on configuring this device, see
 .Xr ifconfig 8 .
-.Pp
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "bfe%d: couldn't map memory"

==== //depot/projects/hammer/share/man/man4/dcons.4#3 (text+ko) ====

@@ -22,8 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.4 2003/12/27 15:14:58 brueffer Exp $
-.\"
+.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.5 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd February 11, 2003
 .Dt DCONS 4
@@ -42,7 +41,7 @@
 The
 .Nm
 device is a simple console device which just reads from and writes to
-an allocated buffer for input and output respectivly.
+an allocated buffer for input and output respectively.
 It is of no use by itself and it is supposed that the buffer is accessed
 via a bus like
 .Xr firewire 4
@@ -51,17 +50,20 @@
 for interaction.
 .Pp
 The buffer consists of 4 channels.
-There are 2 ports, one for the console tty and other is GDB ports then each port
-has an input channel and an output channel.
-.Sh EXAMPLE
+There are 2 ports, one for the console TTY and another is GDB port,
+then each port has an input channel and an output channel.
+.Sh EXAMPLES
 If you want to run
 .Xr getty 8
-on dcons, insert the following line into 
+on
+.Nm ,
+insert the following line into
 .Xr /etc/ttys 5
-and
-send a HUP signal to
+and send a
+.Dv HUP
+signal to
 .Xr init 8
-using 
+using
 .Xr kill 1 .
 .Bd -literal -offset indent
 dcons	"/usr/libexec/getty std.9600"	vt100	on  secure
@@ -70,12 +72,14 @@
 Once the

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



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