PERFORCE change 142157 for review

LiQun Li lqlee at FreeBSD.org
Fri May 23 20:57:40 UTC 2008


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

Change 142157 by lqlee at fbsd on 2008/05/23 20:57:14

	synchronize some update from DTrace.

Affected files ...

.. //depot/projects/soc2008/lqlee-dtrace/src/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/Makefile.inc1#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/drti/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libctf/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/errno.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/net.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/nfs.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/psinfo.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/sched.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/signal.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/unistd.d#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfconvert/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfdump/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfmerge/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/sgsmsg/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libarchive/archive_entry_strmode.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libarchive/archive_read_data_into_fd.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/_libdwarf.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_abbrev.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_attr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_attrval.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_cu.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_dealloc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_die.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_dump.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_errmsg.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_errno.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_finish.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_form.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_init.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_loc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/libdwarf.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/elf_dump.c#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/elf_dump_argv.c#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/elf_strptr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/libelf_align.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/libelf_dump.c#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/_libproc.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/libproc.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_create.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_sym.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_util.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sbin/restore/tape.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/secure/README.Non-US#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man3/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man3/queue.3#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/pmap.9#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/pmap_addr_hint.9#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/taskqueue.9#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/share/misc/committers-src.dot#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/arm/conf/Makefile#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/arm/conf/NOTES#2 delete
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/arm/include/param.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/compat/opensolaris/sys/sema.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtmalloc/dtmalloc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/dtrace/i386/instr_size.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/fbt/fbt.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/profile/profile.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/prototype.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/sdt/sdt.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/dev/atkbdc/psm.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/dev/random/randomdev_soft.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/ia64/include/param.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/kern_ctf.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/kern_dtrace.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/kern_sdt.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/link_elf.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/linker_if.m#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/modules/iwn/Makefile#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net/if_gre.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net/if_gre.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net/if_lagg.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/net80211/ieee80211_wds.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/conf.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/kdb.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/linker.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/malloc.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/queue.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/sys/sys/smp.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/usr.bin/tar/bsdtar.h#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/usr.bin/tar/siginfo.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/usr.bin/tar/write.c#2 integrate
.. //depot/projects/soc2008/lqlee-dtrace/src/usr.sbin/config/mkmakefile.c#2 integrate

Differences ...

==== //depot/projects/soc2008/lqlee-dtrace/src/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.348 2008/04/29 09:08:33 rwatson Exp $
+# $FreeBSD: src/Makefile,v 1.349 2008/05/23 04:20:59 jb Exp $
 #
 # The user-driven targets are:
 #

==== //depot/projects/soc2008/lqlee-dtrace/src/Makefile.inc1#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.604 2008/05/07 13:52:56 dfr Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.9 2008/05/22 04:26:42 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/drti/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/drti/Makefile,v 1.1 2008/05/22 04:26:42 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libctf/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.1 2008/05/22 04:26:42 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.1 2008/05/22 04:26:42 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/errno.d#2 (text+ko) ====

@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/errno.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/net.d#2 (text+ko) ====

@@ -17,6 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
+ *
+ * $FreeBSD: src/cddl/lib/libdtrace/net.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 
 /*

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/nfs.d#2 (text+ko) ====

@@ -17,6 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
+ *
+ * $FreeBSD: src/cddl/lib/libdtrace/nfs.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 
 /*

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/psinfo.d#2 (text+ko) ====

@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2006 John Birrell jb at freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/psinfo.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/sched.d#2 (text+ko) ====

@@ -17,6 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
+ *
+ * $FreeBSD: src/cddl/lib/libdtrace/sched.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/signal.d#2 (text+ko) ====

@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2008 John Birrell jb at freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/signal.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 
 inline int SIGHUP = 1;

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/lib/libdtrace/unistd.d#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/unistd.d,v 1.1 2008/05/22 04:26:42 jb Exp $
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.9 2008/05/22 08:04:48 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfconvert/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1 2008/05/22 08:04:48 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfdump/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfdump/Makefile,v 1.1 2008/05/22 08:04:48 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/ctfmerge/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1 2008/05/22 08:04:49 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.bin/sgsmsg/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/sgsmsg/Makefile,v 1.1 2008/05/22 08:04:49 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.sbin/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.9 2008/05/22 23:06:19 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/cddl/usr.sbin/dtrace/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1 2008/05/22 23:06:19 jb Exp $
 
 .include	"../../Makefile.inc"
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $
+# $FreeBSD: src/lib/Makefile,v 1.230 2008/05/22 04:22:43 jb Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libarchive/archive_entry_strmode.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.2 2008/02/19 05:49:02 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.3 2008/05/23 04:57:28 cperciva Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -39,7 +39,6 @@
 const char *
 archive_entry_strmode(struct archive_entry *entry)
 {
-	static const char *perms = "?rwxrwxrwx ";
 	static const mode_t permbits[] =
 	    { 0400, 0200, 0100, 0040, 0020, 0010, 0004, 0002, 0001 };
 	char *bp = entry->strmode;
@@ -47,7 +46,7 @@
 	int i;
 
 	/* Fill in a default string, then selectively override. */
-	strcpy(bp, perms);
+	strcpy(bp, "?rwxrwxrwx ");
 
 	mode = archive_entry_mode(entry);
 	switch (archive_entry_filetype(entry)) {

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libarchive/archive_read_data_into_fd.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.15 2007/04/02 00:21:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -64,8 +64,12 @@
 	    ARCHIVE_OK) {
 		const char *p = buff;
 		if (offset > output_offset) {
-			lseek(fd, offset - output_offset, SEEK_CUR);
-			output_offset = offset;
+			output_offset = lseek(fd,
+			    offset - output_offset, SEEK_CUR);
+			if (output_offset != offset) {
+				archive_set_error(a, errno, "Seek error");
+				return (ARCHIVE_FATAL);
+			}
 		}
 		while (size > 0) {
 			bytes_to_write = size;
@@ -74,7 +78,7 @@
 			bytes_written = write(fd, p, bytes_to_write);
 			if (bytes_written < 0) {
 				archive_set_error(a, errno, "Write error");
-				return (-1);
+				return (ARCHIVE_FATAL);
 			}
 			output_offset += bytes_written;
 			total_written += bytes_written;

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdwarf/Makefile,v 1.1 2008/05/22 02:14:23 jb Exp $
 
 LIB=	dwarf
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/_libdwarf.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdwarf/_libdwarf.h,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #ifndef	__LIBDWARF_H_

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdwarf/dwarf.h,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #ifndef	_DWARF_H_

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_abbrev.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_abbrev.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_attr.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_attr.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_attrval.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_attrval.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_cu.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_cu.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include "_libdwarf.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_dealloc.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_dealloc.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include "_libdwarf.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_die.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_die.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_dump.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_dump.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_errmsg.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_errmsg.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdio.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_errno.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_errno.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include "_libdwarf.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_finish.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_finish.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_form.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_form.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include "_libdwarf.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_init.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_init.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/dwarf_loc.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$
+ * $FreeBSD: src/lib/libdwarf/dwarf_loc.c,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #include <stdlib.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libdwarf/libdwarf.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdwarf/libdwarf.h,v 1.1 2008/05/22 02:14:23 jb Exp $
  */
 
 #ifndef	_LIBDWARF_H_

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/elf_strptr.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.2 2008/05/23 07:35:36 jb Exp $");
 
 #include <sys/param.h>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/libelf_align.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.3 2008/05/23 07:33:45 jb Exp $");
 
 #include <sys/types.h>
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libelf/libelf_data.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.3 2007/11/23 11:29:36 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.4 2008/05/23 07:32:19 jb Exp $");
 
 #include <libelf.h>
 #include <osreldate.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libproc/Makefile,v 1.1 2008/05/22 02:10:14 jb Exp $
 
 LIB=	proc
 

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/_libproc.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libproc/_libproc.h,v 1.1 2008/05/22 02:09:21 jb Exp $
  */
 
 #include <sys/cdefs.h>

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/libproc.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libproc/libproc.h,v 1.1 2008/05/22 02:09:21 jb Exp $
  */
 
 #ifndef	_LIBPROC_H_

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_create.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$
+ * $FreeBSD: src/lib/libproc/proc_create.c,v 1.1 2008/05/22 02:09:21 jb Exp $
  */
 
 #include "_libproc.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_sym.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$
+ * $FreeBSD: src/lib/libproc/proc_sym.c,v 1.1 2008/05/22 02:09:21 jb Exp $
  */
 
 #include "_libproc.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/lib/libproc/proc_util.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$
+ * $FreeBSD: src/lib/libproc/proc_util.c,v 1.1 2008/05/22 02:09:21 jb Exp $
  */
 
 #include "_libproc.h"

==== //depot/projects/soc2008/lqlee-dtrace/src/sbin/restore/tape.c#2 (text+ko) ====

@@ -39,7 +39,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $");
+__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.53 2008/05/22 22:19:33 mckusick Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
@@ -1379,8 +1379,6 @@
 	}
 	if (checksum((int *)buf) == FAIL)
 		return (FAIL);
-	if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate)
-		fprintf(stderr, "Header with wrong dumpdate.\n");
 	if (Bcvt) {
 		swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf);
 		swabst((u_char *)"l",(u_char *) &buf->c_level);
@@ -1395,28 +1393,25 @@
 		/*
 		 * Have to patch up missing information in bit map headers
 		 */
-		buf->c_inumber = 0;
 		buf->c_size = buf->c_count * TP_BSIZE;
 		if (buf->c_count > TP_NINDIR)
 			readmapflag = 1;
 		else 
 			for (i = 0; i < buf->c_count; i++)
 				buf->c_addr[i]++;
-		break;
+		/* FALL THROUGH */
 
 	case TS_TAPE:
-		if (buf->c_magic == NFS_MAGIC) {
-			if ((buf->c_flags & NFS_DR_NEWINODEFMT) == 0)
-				oldinofmt = 1;
-			buf->c_date = _time32_to_time(buf->c_old_date);
-			buf->c_ddate = _time32_to_time(buf->c_old_ddate);
-			buf->c_tapea = buf->c_old_tapea;
-			buf->c_firstrec = buf->c_old_firstrec;
-		}
+		if (buf->c_magic == NFS_MAGIC &&
+		    (buf->c_flags & NFS_DR_NEWINODEFMT) == 0)
+			oldinofmt = 1;
+		/* FALL THROUGH */
+
 	case TS_END:
 		buf->c_inumber = 0;
-		break;
+		/* FALL THROUGH */
 
+	case TS_ADDR:
 	case TS_INODE:
 		/*
 		 * For old dump tapes, have to copy up old fields to
@@ -1429,16 +1424,18 @@
 			buf->c_ddate = _time32_to_time(buf->c_old_ddate);
 			buf->c_atime = _time32_to_time(buf->c_old_atime);
 			buf->c_mtime = _time32_to_time(buf->c_old_mtime);
+			buf->c_birthtime = 0;
+			buf->c_birthtimensec = 0;
+			buf->c_extsize = 0;
 		}
 		break;
 
-	case TS_ADDR:
-		break;
-
 	default:
 		panic("gethead: unknown inode type %d\n", buf->c_type);
 		break;
 	}
+	if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate)
+		fprintf(stderr, "Header with wrong dumpdate.\n");
 	/*
 	 * If we're restoring a filesystem with the old (FreeBSD 1)
 	 * format inodes, copy the uid/gid to the new location

==== //depot/projects/soc2008/lqlee-dtrace/src/share/man/man3/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-# $FreeBSD: src/share/man/man3/Makefile,v 1.47 2008/03/29 17:44:39 ru Exp $
+# $FreeBSD: src/share/man/man3/Makefile,v 1.48 2008/05/22 14:40:03 ed Exp $
 
 .include <bsd.own.mk>
 
@@ -63,6 +63,7 @@
 		queue.3 SLIST_NEXT.3 \
 		queue.3 SLIST_REMOVE.3 \
 		queue.3 SLIST_REMOVE_HEAD.3 \
+		queue.3 SLIST_REMOVE_NEXT.3 \
 		queue.3 STAILQ_CONCAT.3 \
 		queue.3 STAILQ_EMPTY.3 \
 		queue.3 STAILQ_ENTRY.3 \
@@ -79,6 +80,7 @@
 		queue.3 STAILQ_NEXT.3 \
 		queue.3 STAILQ_REMOVE.3 \
 		queue.3 STAILQ_REMOVE_HEAD.3 \
+		queue.3 STAILQ_REMOVE_NEXT.3 \
 		queue.3 TAILQ_CONCAT.3 \
 		queue.3 TAILQ_EMPTY.3 \
 		queue.3 TAILQ_ENTRY.3 \

==== //depot/projects/soc2008/lqlee-dtrace/src/share/man/man3/queue.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
-.\" $FreeBSD: src/share/man/man3/queue.3,v 1.41 2007/11/02 00:34:44 obrien Exp $
+.\" $FreeBSD: src/share/man/man3/queue.3,v 1.42 2008/05/22 14:40:03 ed Exp $
 .\"
 .Dd March 24, 2006
 .Dt QUEUE 3
@@ -48,6 +48,7 @@
 .Nm SLIST_INSERT_HEAD ,
 .Nm SLIST_NEXT ,
 .Nm SLIST_REMOVE_HEAD ,
+.Nm SLIST_REMOVE_NEXT ,
 .Nm SLIST_REMOVE ,
 .Nm STAILQ_CONCAT ,
 .Nm STAILQ_EMPTY ,
@@ -64,6 +65,7 @@
 .Nm STAILQ_LAST ,
 .Nm STAILQ_NEXT ,
 .Nm STAILQ_REMOVE_HEAD ,
+.Nm STAILQ_REMOVE_NEXT ,
 .Nm STAILQ_REMOVE ,
 .Nm LIST_EMPTY ,
 .Nm LIST_ENTRY ,
@@ -114,6 +116,7 @@
 .Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME"
 .Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME"
 .Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME"
+.Fn SLIST_REMOVE_NEXT "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME"
 .Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME"
 .\"
 .Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2"
@@ -131,6 +134,7 @@
 .Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME"
 .Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME"
+.Fn STAILQ_REMOVE_NEXT "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME"
 .\"
 .Fn LIST_EMPTY "LIST_HEAD *head"
@@ -387,6 +391,14 @@
 macro.
 .Pp
 The macro
+.Nm SLIST_REMOVE_NEXT
+removes the element after
+.Fa elm
+from the list. Unlike
+.Fa SLIST_REMOVE ,
+this macro does not traverse the entire list.
+.Pp
+The macro
 .Nm SLIST_REMOVE
 removes the element
 .Fa elm
@@ -561,6 +573,14 @@
 macro.
 .Pp
 The macro
+.Nm STAILQ_REMOVE_NEXT
+removes the element after
+.Fa elm
+from the tail queue. Unlike
+.Fa STAILQ_REMOVE ,
+this macro does not traverse the entire tail queue.
+.Pp
+The macro
 .Nm STAILQ_REMOVE
 removes the element
 .Fa elm

==== //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.335 2008/04/06 21:22:12 attilio Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.336 2008/05/22 16:25:25 alc Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -169,7 +169,6 @@
 	physio.9 \
 	pmap.9 \
 	pmap_activate.9 \
-	pmap_addr_hint.9 \
 	pmap_change_wiring.9 \
 	pmap_clear_modify.9 \
 	pmap_copy.9 \

==== //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/pmap.9#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/share/man/man9/pmap.9,v 1.10 2005/06/15 00:21:02 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pmap.9,v 1.11 2008/05/22 16:25:25 alc Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP 9
@@ -89,7 +89,6 @@
 .Sh SEE ALSO
 .Xr pmap 9 ,
 .Xr pmap_activate 9 ,
-.Xr pmap_addr_hint 9 ,
 .Xr pmap_change_wiring 9 ,
 .Xr pmap_clear_modify 9 ,
 .Xr pmap_clear_reference 9 ,

==== //depot/projects/soc2008/lqlee-dtrace/src/share/man/man9/taskqueue.9#2 (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.
 .\"

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


More information about the p4-projects mailing list