Date: Fri, 14 Mar 2008 03:30:02 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 137670 for review Message-ID: <200803140330.m2E3U2OZ077521@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=137670 Change 137670 by kmacy@pandemonium:kmacy:iwarp on 2008/03/14 03:29:23 IFC 137655 Affected files ... .. //depot/projects/iwarp/ObsoleteFiles.inc#11 integrate .. //depot/projects/iwarp/UPDATING#9 integrate .. //depot/projects/iwarp/bin/Makefile#2 integrate .. //depot/projects/iwarp/bin/ps/ps.1#2 integrate .. //depot/projects/iwarp/bin/uuidgen/Makefile#2 integrate .. //depot/projects/iwarp/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/iwarp/etc/rc.d/mountlate#3 integrate .. //depot/projects/iwarp/etc/rc.d/root#3 integrate .. //depot/projects/iwarp/lib/Makefile#5 integrate .. //depot/projects/iwarp/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/main.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/test.h#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/iwarp/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/iwarp/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/iwarp/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/iwarp/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/iwarp/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/iwarp/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/iwarp/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/iwarp/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/iwarp/lib/libthread_db/Makefile#2 integrate .. //depot/projects/iwarp/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/iwarp/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/iwarp/sbin/mount/mount.8#5 integrate .. //depot/projects/iwarp/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/iwarp/share/man/man4/uart.4#2 integrate .. //depot/projects/iwarp/share/man/man4/vr.4#2 integrate .. //depot/projects/iwarp/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/iwarp/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/iwarp/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/iwarp/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/iwarp/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/iwarp/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/iwarp/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/iwarp/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/iwarp/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/trap.c#3 integrate .. //depot/projects/iwarp/sys/arm/conf/AVILA#4 integrate .. //depot/projects/iwarp/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/iwarp/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/iwarp/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/iwarp/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/conf/files#14 integrate .. //depot/projects/iwarp/sys/conf/options#7 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/iwarp/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/iwarp/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/iwarp/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/iwarp/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/iwarp/sys/dev/uart/uart.h#3 integrate .. //depot/projects/iwarp/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/ums.c#3 integrate .. //depot/projects/iwarp/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/iwarp/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/iwarp/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/iwarp/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/iwarp/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/iwarp/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/iwarp/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/trap.c#4 integrate .. //depot/projects/iwarp/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/iwarp/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/iwarp/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/iwarp/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/iwarp/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/iwarp/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/iwarp/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/iwarp/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/iwarp/sys/kern/init_sysent.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_clock.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_exec.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_fork.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_intr.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_kse.c#4 delete .. //depot/projects/iwarp/sys/kern/kern_proc.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_resource.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_sig.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_switch.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_sx.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_synch.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_thread.c#8 integrate .. //depot/projects/iwarp/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/iwarp/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/iwarp/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/iwarp/sys/kern/sched_ule.c#7 integrate .. //depot/projects/iwarp/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/iwarp/sys/kern/subr_trap.c#4 integrate .. //depot/projects/iwarp/sys/kern/subr_witness.c#7 integrate .. //depot/projects/iwarp/sys/kern/sys_process.c#3 integrate .. //depot/projects/iwarp/sys/kern/syscalls.c#5 integrate .. //depot/projects/iwarp/sys/kern/syscalls.master#6 integrate .. //depot/projects/iwarp/sys/kern/systrace_args.c#5 integrate .. //depot/projects/iwarp/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/iwarp/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/iwarp/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/iwarp/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/iwarp/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/iwarp/sys/sys/condvar.h#2 integrate .. //depot/projects/iwarp/sys/sys/cpuset.h#2 integrate .. //depot/projects/iwarp/sys/sys/disklabel.h#3 integrate .. //depot/projects/iwarp/sys/sys/kse.h#2 delete .. //depot/projects/iwarp/sys/sys/param.h#12 integrate .. //depot/projects/iwarp/sys/sys/proc.h#11 integrate .. //depot/projects/iwarp/sys/sys/sched.h#3 integrate .. //depot/projects/iwarp/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/iwarp/sys/sys/syscall.h#5 integrate .. //depot/projects/iwarp/sys/sys/syscall.mk#5 integrate .. //depot/projects/iwarp/sys/sys/sysproto.h#5 integrate .. //depot/projects/iwarp/sys/sys/systm.h#3 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/iwarp/sys/vm/vm_glue.c#3 integrate .. //depot/projects/iwarp/sys/vm/vm_map.c#5 integrate .. //depot/projects/iwarp/sys/vm/vm_meter.c#2 integrate .. //depot/projects/iwarp/tools/tools/editing/freebsd.vim#1 branch .. //depot/projects/iwarp/usr.bin/Makefile#6 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.1#2 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.c#2 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.h#2 integrate .. //depot/projects/iwarp/usr.bin/ar/write.c#3 integrate .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/iwarp/usr.bin/make/globals.h#2 integrate .. //depot/projects/iwarp/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/main.c#4 integrate .. //depot/projects/iwarp/usr.bin/make/make.1#4 integrate .. //depot/projects/iwarp/usr.bin/make/parse.c#2 integrate .. //depot/projects/iwarp/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/iwarp/usr.bin/uuidgen/Makefile#2 delete .. //depot/projects/iwarp/usr.bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/iwarp/usr.bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/iwarp/ObsoleteFiles.inc#11 (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/iwarp/UPDATING#9 (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/iwarp/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/iwarp/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/iwarp/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,4 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $ - -BINDIR= /bin +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ PROG= uuidgen WARNS?= 6 ==== //depot/projects/iwarp/contrib/tcsh/sh.lex.c#3 (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/iwarp/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/iwarp/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/iwarp/lib/Makefile#5 (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/iwarp/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/iwarp/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.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -1124,6 +1124,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; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/iwarp/lib/libarchive/archive_read.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/iwarp/lib/libarchive/archive_read_private.h#3 (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/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/iwarp/lib/libarchive/test/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.14 2008/01/31 07:47:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -7,17 +7,6 @@ # Get a list of all libarchive source files LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS -TESTFILES= \ - test_compat_gtar_1.tgz \ - test_compat_tar_hardlink_1.tar \ - test_compat_zip_1.zip \ - test_read_format_gtar_sparse_1_13.tgz \ - test_read_format_gtar_sparse_1_17.tgz \ - test_read_format_gtar_sparse_1_17_posix00.tgz \ - test_read_format_gtar_sparse_1_17_posix01.tgz \ - test_read_format_gtar_sparse_1_17_posix10.tgz \ - test_read_format_gtar_sparse_1_17_posix10_modified.tar - TESTS= \ test_acl_basic.c \ test_acl_pax.c \ @@ -104,13 +93,8 @@ WARNS=6 # Build libarchive_test and run it. -check test: libarchive_test ${TESTFILES} - ./libarchive_test - -.for f in ${TESTFILES} -${f}: ${f}.uu - uudecode -p ${.CURDIR}/${f}.uu >${f} -.endfor +check test: libarchive_test + ./libarchive_test -k -r ${.CURDIR} INCS=archive.h list.h ==== //depot/projects/iwarp/lib/libarchive/test/main.c#4 (text+ko) ==== @@ -24,23 +24,26 @@ */ /* - * This same file is used pretty much verbatim for all test harnesses. - * - * The next line is used to define various environment variables, etc. - * - * The tar and cpio test harnesses are identical except for this line; - * the libarchive test harness omits some code that is needed only for - * testing standalone executables. + * Various utility routines useful for test programs. + * Each test program is linked against this file. */ -#define PROGRAM "LIBARCHIVE" - #include <errno.h> #include <locale.h> #include <stdarg.h> #include <time.h> #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.10 2008/02/19 05:52:30 kientzle Exp $"); + +/* + * This same file is used pretty much verbatim for all test harnesses. + * + * The next few lines are the only differences. + */ +#undef PROGRAM /* Testing a library, not a program. */ +#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ +#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) +#define EXTRA_VERSION archive_version() +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.11 2008/03/12 05:12:23 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -51,7 +54,7 @@ * test functions. */ #undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); +#define DEFINE_TEST(name) void name(void); #include "list.h" /* Interix doesn't define these in a standard header. */ @@ -71,6 +74,9 @@ /* Cumulative count of assertions. */ static int assertions = 0; +/* Directory where uuencoded reference files can be found. */ +static char *refdir; + /* * My own implementation of the standard assert() macro emits the * message in the same format as GCC (file:line: message). @@ -90,7 +96,7 @@ * For each test source file, we remember how many times each * failure was reported. */ -static const char *failed_filename; +static const char *failed_filename = NULL; static struct line { int line; int count; @@ -163,9 +169,13 @@ fprintf(stderr, " Description: %s\n", msg); msg[0] = '\0'; } - if (extra != NULL) { - fprintf(stderr, " archive error: %s\n", archive_error_string((struct archive *)extra)); - } + +#ifdef EXTRA_DUMP + if (extra != NULL) + fprintf(stderr, " detail: %s\n", EXTRA_DUMP(extra)); +#else + (void)extra; /* UNUSED */ +#endif if (dump_on_failure) { fprintf(stderr, @@ -241,27 +251,28 @@ } /* assertEqualInt() displays the values of the two integers. */ -void +int test_assert_equal_int(const char *file, int line, int v1, const char *e1, int v2, const char *e2, void *extra) { ++assertions; if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n", file, line); fprintf(stderr, " %s=%d\n", e1, v1); fprintf(stderr, " %s=%d\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualString() displays the values of the two strings. */ -void +int test_assert_equal_string(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -271,24 +282,25 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (strcmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n", file, line); fprintf(stderr, " %s = \"%s\"\n", e1, v1); fprintf(stderr, " %s = \"%s\"\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualWString() displays the values of the two strings. */ -void +int test_assert_equal_wstring(const char *file, int line, const wchar_t *v1, const char *e1, const wchar_t *v2, const char *e2, @@ -297,16 +309,17 @@ ++assertions; if (wcscmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", file, line); fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); report_failure(extra); + return (0); } /* @@ -326,7 +339,7 @@ for (j = 0; j < 16 && i + j < l; j++) { if (ref != NULL && p[i + j] != ref[i + j]) sep = '_'; - fprintf(stderr, "%c%02x", sep, p[i+j]); + fprintf(stderr, "%c%02x", sep, 0xff & (int)p[i+j]); if (ref != NULL && p[i + j] == ref[i + j]) sep = ' '; } @@ -348,7 +361,7 @@ /* assertEqualMem() displays the values of the two memory blocks. */ /* TODO: For long blocks, hexdump the first bytes that actually differ. */ -void +int test_assert_equal_mem(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -358,15 +371,15 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (memcmp(v1, v2, l) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: memory not equal\n", file, line); fprintf(stderr, " size %s = %d\n", ld, (int)l); @@ -376,14 +389,19 @@ hexdump(v2, v1, l < 32 ? l : 32, 0); fprintf(stderr, "\n"); report_failure(extra); + return (0); } -void +int test_assert_empty_file(const char *f1fmt, ...) { + char buff[1024]; char f1[1024]; struct stat st; va_list ap; + ssize_t s; + int fd; + va_start(ap, f1fmt); vsprintf(f1, f1fmt, ap); @@ -392,16 +410,32 @@ if (stat(f1, &st) != 0) { fprintf(stderr, "%s:%d: Could not stat: %s\n", test_filename, test_line, f1); report_failure(NULL); - } else if (st.st_size > 0) { - fprintf(stderr, "%s:%d: File not empty: %s\n", test_filename, test_line, f1); - fprintf(stderr, " File size: %d\n", (int)st.st_size); - report_failure(NULL); + } + if (st.st_size == 0) + return (1); + + failures ++; + if (previous_failures(test_filename, test_line)) + return (0); + + fprintf(stderr, "%s:%d: File not empty: %s\n", test_filename, test_line, f1); + fprintf(stderr, " File size: %d\n", (int)st.st_size); + fprintf(stderr, " Contents:\n"); + fd = open(f1, O_RDONLY); + if (fd < 0) { + fprintf(stderr, " Unable to open %s\n", f1); + } else { + s = sizeof(buff) < st.st_size ? sizeof(buff) : st.st_size; + s = read(fd, buff, s); + hexdump(buff, NULL, s, 0); } + report_failure(NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803140330.m2E3U2OZ077521>