Date: Fri, 21 May 2004 22:05:38 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 53210 for review Message-ID: <200405220505.i4M55cec088951@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=53210 Change 53210 by marcel@marcel_nfs on 2004/05/21 22:05:29 IFC @53208 Affected files ... .. //depot/projects/gdb/MAINTAINERS#10 integrate .. //depot/projects/gdb/contrib/cvs/src/server.c#5 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/gdb/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#5 integrate .. //depot/projects/gdb/etc/rc.d/netif#5 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#5 integrate .. //depot/projects/gdb/include/Makefile#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/gdb/lib/libarchive/tar.5#5 integrate .. //depot/projects/gdb/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/gdb/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_cancel.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_cond.c#4 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_exit.c#4 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_join.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_resume_np.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_setschedparam.c#3 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_sig.c#5 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/share/sgml/catalog#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#1 branch .. //depot/projects/gdb/release/scripts/src-install.sh#2 integrate .. //depot/projects/gdb/sbin/Makefile#8 integrate .. //depot/projects/gdb/sbin/atacontrol/atacontrol.c#4 integrate .. //depot/projects/gdb/sbin/dump/optr.c#3 integrate .. //depot/projects/gdb/sbin/gconcat/Makefile#4 delete .. //depot/projects/gdb/sbin/gconcat/gconcat.8#3 delete .. //depot/projects/gdb/sbin/gconcat/gconcat.c#5 delete .. //depot/projects/gdb/sbin/geom/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/Makefile.inc#1 branch .. //depot/projects/gdb/sbin/geom/class/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/gdb/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/gdb/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/gdb/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/gdb/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/gdb/sbin/geom/core/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/core/geom.c#1 branch .. //depot/projects/gdb/sbin/geom/core/geom.h#1 branch .. //depot/projects/gdb/sbin/geom/misc/subr.c#1 branch .. //depot/projects/gdb/sbin/geom/misc/subr.h#1 branch .. //depot/projects/gdb/sbin/ggate/Makefile.inc#1 branch .. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#3 integrate .. //depot/projects/gdb/sbin/ggate/ggated/Makefile#3 integrate .. //depot/projects/gdb/sbin/sconfig/sconfig.8#4 integrate .. //depot/projects/gdb/share/man/man4/bpf.4#2 integrate .. //depot/projects/gdb/share/man/man7/hier.7#4 integrate .. //depot/projects/gdb/share/man/man9/Makefile#8 integrate .. //depot/projects/gdb/share/man/man9/bpf.9#1 branch .. //depot/projects/gdb/share/man/man9/mbuf.9#7 integrate .. //depot/projects/gdb/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/gdb/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/gdb/sys/amd64/include/profile.h#4 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_16550.S#4 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_8251.S#4 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/gdb/sys/conf/NOTES#20 integrate .. //depot/projects/gdb/sys/conf/files#24 integrate .. //depot/projects/gdb/sys/conf/options#20 integrate .. //depot/projects/gdb/sys/ddb/db_elf.c#4 branch .. //depot/projects/gdb/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#5 integrate .. //depot/projects/gdb/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/gdb/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/gdb/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#10 integrate .. //depot/projects/gdb/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/gdb/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/gdb/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/gdb/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/gdb/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/gdb/sys/i386/i386/support.s#4 integrate .. //depot/projects/gdb/sys/i386/include/profile.h#5 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_jail.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#10 integrate .. //depot/projects/gdb/sys/kern/subr_prof.c#4 integrate .. //depot/projects/gdb/sys/modules/geom/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/geom/geom_nop/Makefile#1 branch .. //depot/projects/gdb/sys/modules/geom/geom_stripe/Makefile#1 branch .. //depot/projects/gdb/sys/net/if_vlan.c#4 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/gdb/sys/pci/agp.c#6 integrate .. //depot/projects/gdb/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/gdb/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/sys/ata.h#3 integrate .. //depot/projects/gdb/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/gdb/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/gdb/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/gdb/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/gdb/sys/vm/vm_extern.h#5 integrate .. //depot/projects/gdb/sys/vm/vm_fault.c#5 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#9 integrate .. //depot/projects/gdb/usr.bin/id/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/id/id.c#3 integrate .. //depot/projects/gdb/usr.bin/ktrdump/ktrdump.8#2 integrate .. //depot/projects/gdb/usr.bin/ktrdump/ktrdump.c#3 integrate .. //depot/projects/gdb/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/gdb/usr.bin/rusers/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/rusers/rusers.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#10 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/gdb/usr.sbin/pccard/pccardd/pccard.conf.5#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/radius.c#2 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.90 2004/05/16 22:05:25 njl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.91 2004/05/20 12:44:23 pjd Exp $ subsystem login notes ----------------------------- @@ -93,6 +93,9 @@ binutils obrien Insists on BU blocked from unapproved commits geom_concat pjd Pre-commit review requested. geom_gate pjd Pre-commit review requested. +geom_nop pjd Pre-commit review requested. +geom_stripe pjd Pre-commit review requested. +sbin/geom pjd Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. ==== //depot/projects/gdb/contrib/cvs/src/server.c#5 (text+ko) ==== @@ -9,7 +9,7 @@ GNU General Public License for more details. */ /* - * $FreeBSD: src/contrib/cvs/src/server.c,v 1.22 2004/05/19 06:17:52 des Exp $ + * $FreeBSD: src/contrib/cvs/src/server.c,v 1.23 2004/05/20 13:12:46 des Exp $ */ #include <assert.h> @@ -1645,8 +1645,18 @@ && strncmp (arg, name, cp - name) == 0) { timefield = strchr (cp + 1, '/') + 1; + /* If the time field is not currently empty, then one of + * serve_modified, serve_is_modified, & serve_unchanged were + * already called for this file. We would like to ignore the + * reinvocation silently or, better yet, exit with an error + * message, but we just avoid the copy-forward and overwrite the + * value from the last invocation instead. See the comment below + * for more. + */ if (*timefield == '/') { + /* Copy forward one character. Space was allocated for this + * already in serve_entry(). */ cp = timefield + strlen (timefield); cp[1] = '\0'; while (cp > timefield) @@ -1654,8 +1664,17 @@ *cp = cp[-1]; --cp; } - *timefield = '='; } + /* If *TIMEFIELD wasn't "/", we assume that it was because of + * multiple calls to Is-Modified & Unchanged by the client and + * just overwrite the value from the last call. Technically, we + * should probably either ignore calls after the first or send the + * client an error, since the client/server protocol specification + * specifies that only one call to either Is-Modified or Unchanged + * is allowed, but broken versions of WinCVS & TortoiseCVS rely on + * this behavior. + */ + *timefield = '='; break; } } @@ -1689,8 +1708,18 @@ && strncmp (arg, name, cp - name) == 0) { timefield = strchr (cp + 1, '/') + 1; + /* If the time field is not currently empty, then one of + * serve_modified, serve_is_modified, & serve_unchanged were + * already called for this file. We would like to ignore the + * reinvocation silently or, better yet, exit with an error + * message, but we just avoid the copy-forward and overwrite the + * value from the last invocation instead. See the comment below + * for more. + */ if (*timefield == '/') { + /* Copy forward one character. Space was allocated for this + * already in serve_entry(). */ cp = timefield + strlen (timefield); cp[1] = '\0'; while (cp > timefield) @@ -1698,8 +1727,17 @@ *cp = cp[-1]; --cp; } - *timefield = 'M'; } + /* If *TIMEFIELD wasn't "/", we assume that it was because of + * multiple calls to Is-Modified & Unchanged by the client and + * just overwrite the value from the last call. Technically, we + * should probably either ignore calls after the first or send the + * client an error, since the client/server protocol specification + * specifies that only one call to either Is-Modified or Unchanged + * is allowed, but broken versions of WinCVS & TortoiseCVS rely on + * this behavior. + */ + *timefield = 'M'; if (kopt != NULL) { if (alloc_pending (strlen (name) + 80)) ==== //depot/projects/gdb/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.81 2004/04/30 16:21:39 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.82 2004/05/20 10:29:26 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -82,6 +82,10 @@ .. gate .. + nop + .. + stripe + .. .. gnu posix ==== //depot/projects/gdb/etc/mtree/BSD.root.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.65 2003/10/26 19:09:11 emax Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.66 2004/05/20 10:29:26 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -62,6 +62,8 @@ .. .. lib + geom + .. .. libexec .. ==== //depot/projects/gdb/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.15 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.16 2004/05/20 14:16:04 mtm Exp $ # # PROVIDE: dhclient @@ -37,8 +37,7 @@ if [ -n "$_cmdifn" ]; then eval _cooked_list=\"`expr "$dhcp_list" : ".*\($_cmdifn\).*"`\" if [ -z "$_cooked_list" ]; then - err "No such network interface: $_cmdifn" - return 1 + err 1 "No such network interface: $_cmdifn" fi fi } ==== //depot/projects/gdb/etc/rc.d/netif#5 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.7 2004/04/28 13:20:15 phk Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.9 2004/05/20 15:53:49 mtm Exp $ # # PROVIDE: netif @@ -85,7 +85,7 @@ _verbose= if [ -z "$1" ]; then - err "network_common(): No function name specified." + err 1 "network_common(): No function name specified." else _func="$1" fi @@ -100,8 +100,7 @@ if [ -n "$_cmdifn" ]; then eval _cooked_list=\"`expr "$_ifn_list" : ".*\($_cmdifn\).*"`\" if [ -z "$_cooked_list" ]; then - err "No such network interface: $_cmdifn" - return 1 + err 1 "No such network interface: $_cmdifn" fi fi ==== //depot/projects/gdb/games/fortune/datfiles/fortunes2#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.69 2004/05/11 17:43:36 fanf Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.70 2004/05/20 08:15:58 schweikh Exp $ % ======================================================================= || || @@ -48213,27 +48213,27 @@ To a Californian, a person must prove himself criminally insane before he is allowed to drive a taxi in New York. For New York cabbies, honesty and stopping at red lights are both optional. - -- From "East vs. West: The War Between the Coasts + -- From "East vs. West: The War Between the Coasts" % To a Californian, all New Yorkers are cold; even in heat they rarely go above fifty-eight degrees. If you collapse on a street in New York, plan to spend a few days there. - -- From "East vs. West: The War Between the Coasts + -- From "East vs. West: The War Between the Coasts" % To a Californian, the basic difference between the people and the pigeons in New York is that the pigeons don't shit on each other. - -- From "East vs. West: The War Between the Coasts + -- From "East vs. West: The War Between the Coasts" % To a New Yorker, all Californians are blond, even the blacks. There are, in fact, whole neighborhoods that are zoned only for blond people. The only way to tell the difference between California and Sweden is that the -Swedes speak better English." - -- From "East vs. West: The War Between the Coasts +Swedes speak better English. + -- From "East vs. West: The War Between the Coasts" % To a New Yorker, the only California houses on the market for less than a million dollars are those on fire. These generally go for six hundred thousand. - -- From "East vs. West: The War Between the Coasts + -- From "East vs. West: The War Between the Coasts" % To accuse others for one's own misfortunes is a sign of want of education. To accuse oneself shows that one's education has begun. To accuse neither ==== //depot/projects/gdb/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.212 2004/04/30 16:23:08 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.213 2004/05/20 10:29:26 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -35,7 +35,7 @@ dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ - geom/concat geom/gate \ + geom/concat geom/gate geom/nop geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm security/mac_biba security/mac_bsdextended \ security/mac_lomac security/mac_mls security/mac_partition \ ==== //depot/projects/gdb/lib/libarchive/archive_entry.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.12 2004/05/03 01:40:34 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.13 2004/05/21 09:01:13 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -1058,11 +1058,13 @@ if (sep != L':') goto fail; - if (prefix_w(start, end, L"default")) { + /* + * Solaris extension: "defaultuser::rwx" is the + * default ACL corresponding to "user::rwx", etc. + */ + if (end-start > 7 && wmemcmp(start, L"default", 7) == 0) { type = ARCHIVE_ENTRY_ACL_TYPE_DEFAULT; - next_field_w(&text, &start, &end, &sep); - if (sep != L':') - goto fail; + start += 7; } else type = default_type; ==== //depot/projects/gdb/lib/libarchive/tar.5#5 (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/libarchive/tar.5,v 1.4 2004/05/19 06:38:38 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.6 2004/05/20 06:22:42 kientzle Exp $ .\" .Dd May 20, 2004 .Dt TAR 5 @@ -34,7 +34,7 @@ The .Nm archive format collects any number of files, directories, and other -filesystem objects (symbolic links, device nodes, etc.) into a single +filesystem objects (symbolic links, device nodes, etc.) into a single stream of bytes. The format was originally designed to be used with tape drives that operate with fixed-size blocks, but is widely used as @@ -55,8 +55,8 @@ These .Dq blocks are always a multiple of the record size. -The most common block size---and the maximum supported by historical -implementations---is 10240 bytes or 20 records. +The most common block size\(emand the maximum supported by historic +implementations\(emis 10240 bytes or 20 records. (Note: the terms .Dq block and @@ -69,33 +69,36 @@ include additional information that various implementors found necessary. This section describes the variant implemented by the tar command -included in Seventh Edition Unix. +included in +.At v7 , +which is one of the earliest widely-used versions of the tar program. .Pp The header record for an old-style .Nm archive consists of the following: .Bd -literal -offset indent -struct tarfile_header_old { -char name[100]; -char mode[8]; -char uid[8]; -char gid[8]; -char size[12]; -char mtime[12]; -char checksum[8]; -char linkflag[1]; -char linkname[100]; +struct header_old_tar { + char name[100]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char checksum[8]; + char linkflag[1]; + char linkname[100]; + char pad[255]; }; .Ed All unused bytes in the header record are filled with nulls. .Bl -tag -width indent .It Va name Pathname, stored as a null-terminated string. -The Unix V7 tar command only stored regular files (including +Early tar implementations only stored regular files (including hardlinks to those files). -One common early convention added -a trailing "/" character to indicate a directory name, allowing -directory permissions and owner information to be archived and restored. +One common early convention used a trailing "/" character to indicate +a directory name, allowing directory permissions and owner information +to be archived and restored. .It Va mode File mode, stored as an octal number in ASCII. .It Va uid , Va gid @@ -140,53 +143,75 @@ field.) .El .Pp -Early implementations of -.Nm -varied in how they terminated these fields. -The -.Nm -command in Seventh Edition Unix used the following conventions -(this is also documented in early BSD manpages): +Early tar implementations varied in how they terminated these fields. +The tar command in +.At v7 +used the following conventions (this is also documented in early BSD manpages): the pathname must be null-terminated; the mode, uid, and gid fields must end in a space and a null byte; the size and mtime fields must end in a space; the checksum is terminated by a null and a space. -For best portability, writers of -.Nm -archives should fill the numeric fields with leading zeros. -.Ss POSIX Standard Archives -POSIX 1003.1 defines a standard -.Nm -file format that is read and written -by POSIX-compliant implementations -of +Early implementations filled the numeric fields with leading spaces. +This seems to have been common practice until the +.St -p1003.1 +standard was released. +For best portability, modern implementations should fill the numeric +fields with leading zeros. +.Ss Pre-POSIX Archives +An early draft of +.St -p1003.1-88 +served as the basis for John Gilmore's +.Nm pdtar +program and many system implementations from the late 1980s +and early 1990s. +These archives generally follow the POSIX ustar +format described below with the following variations: +.Bl -bullet -compact -width indent +.It +The magic value is +.Dq ustar\ \& +(note the following space). +The version field contains a space character followed by a null. +.It +The numeric fields are generally filled with leading spaces +(not leading zeros as recommended in the final standard). +.It +The prefix field is often not used, limiting pathnames to +the 100 characters of old-style archives. +.El +.Ss POSIX ustar Archives +.St -p1003.1-88 +defined a standard tar file format to be read and written +by compliant implementations of +.Xr tar 1 +and .Xr pax 1 . This format is often called the .Dq ustar format, after the magic value used in the header. (The name is an acronym for -.Dq Unix Standard TAR . ) -It extends the format above -with new fields: +.Dq Unix Standard TAR. ) +It extends the historic format with new fields: .Bd -literal -offset indent -struct tarfile_entry_posix { -char name[100]; -char mode[8]; -char uid[8]; -char gid[8]; -char size[12]; -char mtime[12]; -char checksum[8]; -char typeflag[1]; -char linkname[100]; -char magic[6]; -char version[2]; -char uname[32]; -char gname[32]; -char devmajor[8]; -char devminor[8]; -char prefix[155]; +struct header_posix_ustar { + char name[100]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char checksum[8]; + char typeflag[1]; + char linkname[100]; + char magic[6]; + char version[2]; + char uname[32]; + char gname[32]; + char devmajor[8]; + char devminor[8]; + char prefix[155]; + char pad[12]; }; .Ed .Bl -tag -width indent @@ -236,13 +261,10 @@ .Dq ustar followed by a NULL byte to indicate that this is a POSIX standard archive. Full compliance requires the uname and gname fields be properly set. -(Note that GNU tar archives uses a trailing space rather than a trailing -NULL here and are therefore not POSIX standard archives.) .It Va version Version. This should be .Dq 00 (two copies of the ASCII digit zero) for POSIX standard archives. -(Note that GNU tar archives fill this with a space and a null.) .It Va uname , Va gname User and group names, as null-terminated ASCII strings. These should be used in preference to the uid/gid values @@ -290,10 +312,15 @@ them to be terminated with either space or .Dv NULL characters. +.Pp +Currently, most tar implementations comply with the ustar +format, occasionally extending it by adding new fields to the +blank area at the end of the header record. .Ss Pax Interchange Format There are many attributes that cannot be portably stored in a POSIX ustar archive. -POSIX defined a +.St -p1003.1-2001 +defined a .Dq pax interchange format that uses two new types of entries to hold text-formatted metadata that applies to following entries. @@ -309,9 +336,9 @@ metadata can be examined as necessary. .Pp An entry in a pax interchange format archive consists of one or -two standard entries, each with its own header and data. +two standard ustar entries, each with its own header and data. The first optional entry stores the extended attributes -for the second entry. +for the following entry. This optional first entry has an "x" typeflag and a size field that indicates the total size of the extended attributes. The extended attributes themselves are stored as a series of text-format @@ -320,32 +347,34 @@ sign, a value string, and a new line. The decimal number indicates the length of the entire line, including the initial length field and the trailing newline. -Keys are always encoded in portable 7-bit ASCII. -Keys in all lowercase are reserved for future standardization. +An example of such a field is: +.Dl 25 ctime=1084839148.1212\en +Keys in all lowercase are standard keys. Vendors can add their own keys by prefixing them with an all uppercase vendor name and a period. Note that, unlike the historic header, numeric values are stored using decimal, not octal. +A description of some common keys follows: .Bl -tag -width indent .It Cm atime , Cm ctime , Cm mtime File access, inode change, and modification times. These fields can be negative or include a decimal point and a fractional value. .It Cm uname , Cm uid , Cm gname , Cm gid -User name, group name, and numeric UID and GID values. The user name -and group name stored here are encoded in UTF8 and can thus include -non-ASCII characters. The UID and GID fields can be of arbitrary length. +User name, group name, and numeric UID and GID values. +The user name and group name stored here are encoded in UTF8 +and can thus include non-ASCII characters. +The UID and GID fields can be of arbitrary length. .It Cm linkpath -The full path of the linked-to file. Note that this is encoded in UTF8 -and can thus include non-ASCII characters. +The full path of the linked-to file. +Note that this is encoded in UTF8 and can thus include non-ASCII characters. .It Cm path -The full pathname of the entry. Note that this is encoded in UTF8 -and can thus include non-ASCII characters. +The full pathname of the entry. +Note that this is encoded in UTF8 and can thus include non-ASCII characters. .It Cm realtime.* , Cm security.* -These keys are reserved by SUSv3 and may be used for future standardization. +These keys are reserved and may be used for future standardization. .It Cm size -The size of the file. Note that there is no length limit on this field, -allowing -.Nm +The size of the file. +Note that there is no length limit on this field, allowing conforming archives to store files much larger than the historic 8GB limit. .It Cm SCHILY.* Vendor-specific attributes used by Joerg Schilling's @@ -353,16 +382,21 @@ implementation. .It Cm SCHILY.acl.access , Cm SCHILY.acl.default Stores the access and default ACLs as textual strings in a format -that's an extension of the format specified by POSIX XXXX draft 17. +that's an extension of the format specified by POSIX.1e draft 17. In particular, each user or group access specification can include a fourth -field with the integer UID or GID. +colon-separated field with the numeric UID or GID. This allows ACLs to be restored on systems that may not have complete user or group information available (such as when NIS/YP or LDAP services are temporarily unavailable). .It Cm SCHILY.devminor , Cm SCHILY.devmajor The full minor and major numbers for device nodes. -.It Cm SCHILY.ino -The inode number for the entry. +.It Cm SCHILY.dev, Cm SCHILY.ino , Cm SCHILY.nlinks +The device number, inode number, and link count for the entry. +In particular, note that a pax interchange format archive using Joerg +Schilling's +Cm SCHILY.* +extensions can store all of the data from +.Va struct stat . .It Cm VENDOR.* XXX document other vendor-specific extensions XXX .El @@ -404,16 +438,15 @@ data following them. This allows readers to restore any hardlink to a file without having to rewind the archive to find an earlier entry. -However, it creates complications for robust readers, as it is -no longer clear whether or not they should ignore the size -field for hardlink entries. +However, it creates complications for robust readers, as it is no longer +clear whether or not they should ignore the size field for hardlink entries. .Ss GNU Tar Archives -The GNU tar program has used a variety of different extension -mechanisms over the years: -They added new fields to the empty space in the header (some of which was later +The GNU tar program started with a pre-POSIX format similar to that +described earlier and has extended it using several different mechanisms: +It added new fields to the empty space in the header (some of which was later used by POSIX for conflicting purposes); -they allowed the header to be continued over multiple records; -and they defined new entries that modify following entries +it allowed the header to be continued over multiple records; +and it defined new entries that modify following entries (similar in principle to the .Cm x entry described above, but each GNU special entry is single-purpose, @@ -424,33 +457,34 @@ more lenient POSIX-compliant readers can successfully extract most GNU tar archives. .Bd -literal -offset indent -struct tarfile_entry_gnu { -char name[100]; -char mode[8]; -char uid[8]; -char gid[8]; -char size[12]; -char mtime[12]; -char checksum[8]; -char typeflag[1]; -char linkname[100]; -char magic[6]; -char version[2]; -char uname[32]; -char gname[32]; -char devmajor[8]; -char devminor[8]; -char atime[12]; -char ctime[12]; -char offset[12]; -char longnames[4]; -char unused[1]; -struct { -char offset[12]; -char numbytes[12]; -} sparse[4]; -char isextended[1]; -char realsize[12]; +struct header_gnu_tar { + char name[100]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char checksum[8]; + char typeflag[1]; + char linkname[100]; + char magic[6]; + char version[2]; + char uname[32]; + char gname[32]; + char devmajor[8]; + char devminor[8]; + char atime[12]; + char ctime[12]; + char offset[12]; + char longnames[4]; + char unused[1]; + struct { + char offset[12]; + char numbytes[12]; + } sparse[4]; + char isextended[1]; + char realsize[12]; + char pad[17]; }; .Ed .Bl -tag -width indent @@ -483,12 +517,11 @@ The data for this entry is a long pathname for the following regular entry. .It "M" This is a continuation of the last file on the previous volume. -GNU multi-volume archives gaurantee that each volume begins with a valid +GNU multi-volume archives guarantee that each volume begins with a valid entry header. To ensure this, a file may be split, with part stored at the end of one volume, and part stored at the beginning of the next volume. -The "M" typeflag indicates that this entry continues -an existing file. +The "M" typeflag indicates that this entry continues an existing file. Such entries can only occur as the first or second entry in an archive (the latter only if the first entry is a volume label). The @@ -508,7 +541,7 @@ expecting, that the header offset is in the correct sequence, and that the sum of offset and size is equal to realsize. FreeBSD's version of GNU tar does not handle the corner case of an -archive being continued in the middle of a long name or other +archive's being continued in the middle of a long name or other extension header. .It "N" Type "N" records are no longer generated by GNU tar. They contained a @@ -545,7 +578,7 @@ Note that POSIX ustar archives have a trailing null. .It Va version The version field holds a space character followed by a null. -Note that POSIX ustar archive use two copies of the ASCII digit +Note that POSIX ustar archives use two copies of the ASCII digit .Dq 0 . .It Va atime , Va ctime The time the file was last accessed and the time of @@ -582,7 +615,7 @@ .Ss Solaris Tar XXX More Details Needed XXX .Pp -Solaris tar supports an +Solaris tar (beginning with SunOS XXX 5.7 ?? XXX) supports an .Dq extended format that is fundamentally similar to pax interchange format, with the following differences: @@ -636,13 +669,10 @@ .Nm tar utility is no longer a part of POSIX or the Single Unix Standard. It last appeared in -.St -p 1003.1-1997 -(SUSv2). +.St -susv2 . It has been supplanted in subsequent standards by .Xr pax 1 . -The ustar format is defined in -.St -p1003.1 -as part of the specification for the +The ustar format is currently part of the specification for the .Xr pax 1 utility. The pax interchange file format is new with ==== //depot/projects/gdb/lib/libc/sys/mlock.2#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mlock.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.15 2004/05/19 03:25:17 alc Exp $ +.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.16 2004/05/20 18:47:15 alc Exp $ .\" -.Dd June 2, 1993 +.Dd May 18, 2004 .Dt MLOCK 2 .Os .Sh NAME ==== //depot/projects/gdb/lib/libthr/thread/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.6 2004/03/28 14:05:28 mtm Exp $ +# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.7 2004/05/20 12:06:16 mtm Exp $ # thr sources .PATH: ${.CURDIR}/thread @@ -20,7 +20,6 @@ thr_exit.c \ thr_find_thread.c \ thr_getprio.c \ - thr_info.c \ thr_init.c \ thr_join.c \ thr_kern.c \ ==== //depot/projects/gdb/lib/libthr/thread/thr_barrier.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.1 2004/02/19 13:51:52 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.2 2004/05/20 12:06:16 mtm Exp $ */ #include <pthread.h> @@ -85,11 +85,12 @@ UMTX_LOCK(&b->b_lock); if (b->b_subtotal == (b->b_total - 1)) { TAILQ_FOREACH(ptd, &b->b_barrq, sqe) { - _thread_critical_enter(ptd); - PTHREAD_NEW_STATE(ptd, PS_RUNNING); + PTHREAD_LOCK(ptd); TAILQ_REMOVE(&b->b_barrq, ptd, sqe); + ptd->flags &= ~PTHREAD_FLAGS_IN_BARRQ; ptd->flags |= PTHREAD_FLAGS_BARR_REL; - _thread_critical_exit(ptd); + PTHREAD_WAKE(ptd); + PTHREAD_UNLOCK(ptd); } b->b_subtotal = 0; UMTX_UNLOCK(&b->b_lock); @@ -99,10 +100,10 @@ /* * More threads need to reach the barrier. Suspend this thread. */ - _thread_critical_enter(curthread); + PTHREAD_LOCK(curthread); TAILQ_INSERT_HEAD(&b->b_barrq, curthread, sqe); - PTHREAD_NEW_STATE(curthread, PS_BARRIER_WAIT); - _thread_critical_exit(curthread); + curthread->flags |= PTHREAD_FLAGS_IN_BARRQ; + PTHREAD_UNLOCK(curthread); b->b_subtotal++; PTHREAD_ASSERT(b->b_subtotal < b->b_total, "the number of threads waiting at a barrier is too large"); @@ -114,15 +115,14 @@ * Make sure this thread wasn't released from * the barrier while it was handling the signal. */ - _thread_critical_enter(curthread); + PTHREAD_LOCK(curthread); if ((curthread->flags & PTHREAD_FLAGS_BARR_REL) != 0) { curthread->flags &= ~PTHREAD_FLAGS_BARR_REL; - _thread_critical_exit(curthread); + PTHREAD_UNLOCK(curthread); error = 0; break; } - PTHREAD_NEW_STATE(curthread, PS_BARRIER_WAIT); - _thread_critical_exit(curthread); + PTHREAD_UNLOCK(curthread); } } while (error == EINTR); return (error); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405220505.i4M55cec088951>