Date: Sat, 15 Mar 2008 20:36:49 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 137799 for review Message-ID: <200803152036.m2FKanjp068199@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=137799 Change 137799 by kmacy@pandemonium:kmacy:xen31 on 2008/03/15 20:36:30 IFC 137789 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#12 integrate .. //depot/projects/xen31/UPDATING#7 integrate .. //depot/projects/xen31/bin/Makefile#2 integrate .. //depot/projects/xen31/bin/cp/cp.1#2 integrate .. //depot/projects/xen31/bin/cp/cp.c#3 integrate .. //depot/projects/xen31/bin/cp/utils.c#2 integrate .. //depot/projects/xen31/bin/ps/ps.1#2 integrate .. //depot/projects/xen31/bin/uuidgen/Makefile#1 branch .. //depot/projects/xen31/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/xen31/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/xen31/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/xen31/etc/rc.d/mountlate#3 integrate .. //depot/projects/xen31/etc/rc.d/root#3 integrate .. //depot/projects/xen31/lib/Makefile#6 integrate .. //depot/projects/xen31/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/xen31/lib/libarchive/Makefile#4 integrate .. //depot/projects/xen31/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/xen31/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/xen31/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/xen31/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/xen31/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/xen31/lib/libarchive/test/main.c#4 integrate .. //depot/projects/xen31/lib/libarchive/test/test.h#4 integrate .. //depot/projects/xen31/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/xen31/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/xen31/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/xen31/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/xen31/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/xen31/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/xen31/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/xen31/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/xen31/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/xen31/lib/libpmc/pmc.3#5 integrate .. //depot/projects/xen31/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/xen31/lib/libsdp/sdp.h#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/xen31/lib/libthread_db/Makefile#2 integrate .. //depot/projects/xen31/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/xen31/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/xen31/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/xen31/sbin/mount/mount.8#3 integrate .. //depot/projects/xen31/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/xen31/share/man/man4/uart.4#2 integrate .. //depot/projects/xen31/share/man/man4/vr.4#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#9 integrate .. //depot/projects/xen31/share/man/man9/stack.9#3 integrate .. //depot/projects/xen31/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/xen31/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/xen31/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/xen31/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/xen31/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/xen31/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/xen31/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/xen31/sys/arm/arm/intr.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/trap.c#3 integrate .. //depot/projects/xen31/sys/arm/conf/AVILA#4 integrate .. //depot/projects/xen31/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/xen31/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/metadata.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/xen31/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/xen31/sys/conf/files#19 integrate .. //depot/projects/xen31/sys/conf/options#11 integrate .. //depot/projects/xen31/sys/dev/aac/aac.c#6 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/xen31/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/xen31/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/xen31/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/xen31/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/xen31/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/xen31/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/xen31/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/xen31/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart.h#3 integrate .. //depot/projects/xen31/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/ums.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/xen31/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/xen31/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/xen31/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/xen31/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/xen31/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/xen31/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/xen31/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/xen31/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/xen31/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/xen31/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/trap.c#12 integrate .. //depot/projects/xen31/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/xen31/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/xen31/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/xen31/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/xen31/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/xen31/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/xen31/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/xen31/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/xen31/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/xen31/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/xen31/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/xen31/sys/kern/init_sysent.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_clock.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_exec.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_fork.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_intr.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_kse.c#4 delete .. //depot/projects/xen31/sys/kern/kern_proc.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_resource.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_sig.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_switch.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_sx.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_synch.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/xen31/sys/kern/link_elf.c#4 integrate .. //depot/projects/xen31/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/xen31/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#10 integrate .. //depot/projects/xen31/sys/kern/subr_bus.c#6 integrate .. //depot/projects/xen31/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/xen31/sys/kern/subr_smp.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_trap.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_witness.c#5 integrate .. //depot/projects/xen31/sys/kern/sys_process.c#3 integrate .. //depot/projects/xen31/sys/kern/syscalls.c#5 integrate .. //depot/projects/xen31/sys/kern/syscalls.master#5 integrate .. //depot/projects/xen31/sys/kern/systrace_args.c#5 integrate .. //depot/projects/xen31/sys/modules/vr/Makefile#2 integrate .. //depot/projects/xen31/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/xen31/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/xen31/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/xen31/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/xen31/sys/netipsec/key.c#3 integrate .. //depot/projects/xen31/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/xen31/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/xen31/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/xen31/sys/pc98/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/xen31/sys/pci/if_vr.c#3 delete .. //depot/projects/xen31/sys/pci/if_vrreg.h#2 delete .. //depot/projects/xen31/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/xen31/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/xen31/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/xen31/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/xen31/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/xen31/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/xen31/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/xen31/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/xen31/sys/sys/bus_dma.h#2 integrate .. //depot/projects/xen31/sys/sys/condvar.h#2 integrate .. //depot/projects/xen31/sys/sys/cpuset.h#2 integrate .. //depot/projects/xen31/sys/sys/disklabel.h#3 integrate .. //depot/projects/xen31/sys/sys/interrupt.h#2 integrate .. //depot/projects/xen31/sys/sys/kse.h#2 delete .. //depot/projects/xen31/sys/sys/param.h#15 integrate .. //depot/projects/xen31/sys/sys/proc.h#10 integrate .. //depot/projects/xen31/sys/sys/sched.h#3 integrate .. //depot/projects/xen31/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/xen31/sys/sys/syscall.h#5 integrate .. //depot/projects/xen31/sys/sys/syscall.mk#5 integrate .. //depot/projects/xen31/sys/sys/sysproto.h#5 integrate .. //depot/projects/xen31/sys/sys/systm.h#4 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/xen31/sys/vm/vm_glue.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_map.c#5 integrate .. //depot/projects/xen31/sys/vm/vm_meter.c#2 integrate .. //depot/projects/xen31/tools/tools/editing/freebsd.vim#1 branch .. //depot/projects/xen31/usr.bin/Makefile#6 integrate .. //depot/projects/xen31/usr.bin/ar/ar.1#2 integrate .. //depot/projects/xen31/usr.bin/ar/ar.c#2 integrate .. //depot/projects/xen31/usr.bin/ar/ar.h#2 integrate .. //depot/projects/xen31/usr.bin/ar/write.c#3 integrate .. //depot/projects/xen31/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/xen31/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/xen31/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/xen31/usr.bin/make/globals.h#2 integrate .. //depot/projects/xen31/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/xen31/usr.bin/make/main.c#4 integrate .. //depot/projects/xen31/usr.bin/make/make.1#4 integrate .. //depot/projects/xen31/usr.bin/make/parse.c#2 integrate .. //depot/projects/xen31/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/xen31/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/xen31/usr.bin/tar/read.c#3 integrate .. //depot/projects/xen31/usr.bin/tar/write.c#3 integrate .. //depot/projects/xen31/usr.bin/uuidgen/Makefile#2 delete .. //depot/projects/xen31/usr.bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/xen31/usr.bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/xen31/usr.sbin/Makefile#4 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/xen31/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/xen31/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -27,6 +27,8 @@ # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat +# 20071201: Removal of XRPU driver +OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/xen31/UPDATING#7 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/xen31/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $ +# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ .include <bsd.own.mk> @@ -37,7 +37,8 @@ sleep \ stty \ sync \ - test + test \ + uuidgen .if ${MK_RCMDS} != "no" _rcp= rcp ==== //depot/projects/xen31/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/xen31/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/xen31/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/xen31/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/xen31/contrib/tcsh/sh.lex.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/xen31/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/xen31/etc/rc.d/root#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/xen31/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include <bsd.own.mk> @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/xen31/lib/libalias/libalias/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/xen31/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.80 2008/01/23 05:48:07 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -81,6 +81,7 @@ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_set_compression_bzip2.c \ + archive_write_set_compression_compress.c \ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ archive_write_set_compression_program.c \ @@ -120,6 +121,8 @@ MLINKS+= archive_entry.3 archive_entry_copy_gname.3 MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_link.3 +MLINKS+= archive_entry.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 ==== //depot/projects/xen31/lib/libarchive/archive.h.in#3 (text+ko) ==== @@ -22,18 +22,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.47 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.49 2008/03/14 22:19:50 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED #define ARCHIVE_H_INCLUDED -/* - * This header file corresponds to: - * Library version @ARCHIVE_VERSION@ - * Shared library version @SHLIB_MAJOR@ - */ - #include <sys/types.h> /* Linux requires this for off_t */ @ARCHIVE_H_INCLUDE_INTTYPES_H@ #include <stdio.h> /* For FILE * */ @@ -51,58 +45,59 @@ #endif /* - * Each of the version identifiers comes as a macro and a function. + * The version number is provided as both a macro and a function. * The macro identifies the installed header; the function identifies * the library version (which may not be the same if you're using a * dynamically-linked version of the library). */ /* - * Textual name/version of the library, useful for version displays. - */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" -const char * archive_version(void); - -/* - * The "version stamp" is a single integer that makes it easy to check - * the exact version: for version a.b.c, the version stamp is - * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has - * version stamp 2012108. + * The version number is expressed as a single integer that makes it + * easy to compare versions at build time: for version a.b.c, the + * version number is printf("%d%03d%03d",a,b,c). For example, if you + * know your application requires version 2.12.108 or later, you can + * assert that ARCHIVE_VERSION >= 2012108. * - * This was introduced with libarchive 1.9.0 in the libarchive 1.x family - * and libarchive 2.2.4 in the libarchive 2.x family. The following - * may be useful if you really want to do feature detection for earlier - * libarchive versions (which defined API_VERSION and API_FEATURE): + * This single-number format was introduced with libarchive 1.9.0 in + * the libarchive 1.x family and libarchive 2.2.4 in the libarchive + * 2.x family. The following may be useful if you really want to do + * feature detection for earlier libarchive versions (which defined + * ARCHIVE_API_VERSION and ARCHIVE_API_FEATURE instead): * - * #ifndef ARCHIVE_VERSION_STAMP - * #define ARCHIVE_VERSION_STAMP \ + * #ifndef ARCHIVE_VERSION_NUMBER + * #define ARCHIVE_VERSION_NUMBER \ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_STAMP @LIBARCHIVE_VERSION@ -int archive_version_stamp(void); +#define ARCHIVE_VERSION_NUMBER @LIBARCHIVE_VERSION@ +int archive_version_number(void); /* - * Major version number: If ARCHIVE_API_VERSION != - * archive_api_version(), then the library you were linked with is - * using an incompatible API to the one you were compiled with. This - * is almost certainly a fatal problem. - * This is deprecated and will be removed; use ARCHIVE_VERSION_STAMP - * instead. + * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_STAMP / 1000000) -int archive_api_version(void); +const char * archive_version_string(void); +#if ARCHIVE_VERSION_NUMBER < 3000000 /* - * Minor version number. This is deprecated and will be removed. - * Use ARCHIVE_VERSION_STAMP to adapt to libarchive API variations. + * Deprecated; these are older names that will be removed in favor of + * the simpler definitions above. */ -#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_STAMP / 1000) % 1000) +#define ARCHIVE_VERSION_STAMP ARCHIVE_VERSION_NUMBER +int archive_version_stamp(void); +#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" +const char * archive_version(void); +#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_NUMBER / 1000000) +int archive_api_version(void); +#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_NUMBER / 1000) % 1000) int archive_api_feature(void); +#endif - +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* This should never have been here in the first place. */ +/* Legacy of old tar assumptions, will be removed in libarchive 3.0. */ #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 +#endif /* Declare our basic types. */ struct archive; @@ -119,6 +114,7 @@ #define ARCHIVE_WARN (-20) /* Partial success. */ /* For example, if write_header "fails", then you can't push data. */ #define ARCHIVE_FAILED (-25) /* Current operation cannot complete. */ +/* But if write_header is "fatal," then this archive is dead and useless. */ #define ARCHIVE_FATAL (-30) /* No more operations are possible. */ /* @@ -146,7 +142,7 @@ typedef ssize_t archive_read_callback(struct archive *, void *_client_data, const void **_buffer); /* Skips at most request bytes from archive and returns the skipped amount */ -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 typedef ssize_t archive_skip_callback(struct archive *, void *_client_data, size_t request); #else @@ -370,7 +366,7 @@ int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ /* Note that archive_read_finish will call archive_read_close for you. */ -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_read_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -407,6 +403,7 @@ int archive_write_set_skip_file(struct archive *, dev_t, ino_t); int archive_write_set_compression_bzip2(struct archive *); +int archive_write_set_compression_compress(struct archive *); int archive_write_set_compression_gzip(struct archive *); int archive_write_set_compression_none(struct archive *); int archive_write_set_compression_program(struct archive *, @@ -445,7 +442,7 @@ */ int archive_write_header(struct archive *, struct archive_entry *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 ssize_t archive_write_data(struct archive *, const void *, size_t); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -455,7 +452,7 @@ ssize_t archive_write_data_block(struct archive *, const void *, size_t, off_t); int archive_write_finish_entry(struct archive *); int archive_write_close(struct archive *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_write_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ ==== //depot/projects/xen31/lib/libarchive/archive_entry.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.17 2008/03/14 23:00:53 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -45,6 +45,8 @@ .Nm archive_entry_copy_gname_w , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , +.Nm archive_entry_copy_link , +.Nm archive_entry_copy_link_w , .Nm archive_entry_copy_pathname_w , .Nm archive_entry_copy_stat , .Nm archive_entry_copy_symlink , @@ -101,17 +103,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +187,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +231,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/xen31/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.51 2008/03/14 23:19:46 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -207,6 +207,8 @@ static const wchar_t * aes_get_wcs(struct aes *aes) { + int r; + if (aes->aes_wcs == NULL && aes->aes_mbs == NULL) return NULL; if (aes->aes_wcs == NULL && aes->aes_mbs != NULL) { @@ -221,8 +223,13 @@ aes->aes_wcs = aes->aes_wcs_alloc; if (aes->aes_wcs == NULL) __archive_errx(1, "No memory for aes_get_wcs()"); - mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); + r = mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); aes->aes_wcs_alloc[wcs_length] = 0; + if (r == -1) { + /* Conversion failed, don't lie to our clients. */ + free(aes->aes_wcs_alloc); + aes->aes_wcs = aes->aes_wcs_alloc = NULL; + } } return (aes->aes_wcs); } @@ -307,6 +314,8 @@ struct archive_entry * archive_entry_clear(struct archive_entry *entry) { + if (entry == NULL) + return (NULL); aes_clean(&entry->ae_fflags_text); aes_clean(&entry->ae_gname); aes_clean(&entry->ae_hardlink); @@ -752,6 +761,28 @@ aes_set_mbs(&entry->ae_hardlink, target); } +/* Set symlink if symlink is already set, else set hardlink. */ +void +archive_entry_copy_link(struct archive_entry *entry, const char *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_mbs(&entry->ae_symlink, target); + else + aes_copy_mbs(&entry->ae_hardlink, target); +} + +/* Set symlink if symlink is already set, else set hardlink. */ +void +archive_entry_copy_link_w(struct archive_entry *entry, const wchar_t *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_wcs(&entry->ae_symlink, target); + else + aes_copy_wcs(&entry->ae_hardlink, target); +} + void archive_entry_set_mode(struct archive_entry *entry, mode_t m) { @@ -1124,6 +1155,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1143,7 +1179,7 @@ archive_entry_acl_text_w(struct archive_entry *entry, int flags) { int count; - int length; + size_t length; const wchar_t *wname; const wchar_t *prefix; wchar_t separator; @@ -1505,7 +1541,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803152036.m2FKanjp068199>