PERFORCE change 52858 for review
Peter Wemm
peter at FreeBSD.org
Sun May 16 11:07:29 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52858
Change 52858 by peter at peter_overcee on 2004/05/16 11:06:51
IFC @52857
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#51 integrate
.. //depot/projects/hammer/bin/pax/Makefile#4 integrate
.. //depot/projects/hammer/contrib/amd/FREEBSD-Xlist#2 integrate
.. //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#3 integrate
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete
.. //depot/projects/hammer/lib/Makefile#35 integrate
.. //depot/projects/hammer/lib/csu/arm/Makefile#1 branch
.. //depot/projects/hammer/lib/csu/arm/crt1.c#1 branch
.. //depot/projects/hammer/lib/csu/arm/crti.S#1 branch
.. //depot/projects/hammer/lib/csu/arm/crtn.S#1 branch
.. //depot/projects/hammer/lib/libarchive/Makefile#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive.h#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_private.h#8 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read.3#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#5 integrate
.. //depot/projects/hammer/lib/libatm/Makefile#6 integrate
.. //depot/projects/hammer/lib/libc/Makefile#16 integrate
.. //depot/projects/hammer/lib/libc/arm/SYS.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/_fpmath.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/arith.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/_ctx_start.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/alloca.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/divsi3.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/fabs.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/frexp.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/infinity.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/isinf.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/ldexp.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/makecontext.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/modf.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/signalcontext.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/sigsetjmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/net/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/arm/net/htonl.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/net/htons.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/net/ntohl.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/net/ntohs.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/softfloat/arm-gcc.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/softfloat/milieu.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/softfloat/softfloat.h#1 branch
.. //depot/projects/hammer/lib/libc/arm/stdlib/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/arm/stdlib/gdtoa.mk#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/bcopy.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/bzero.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/ffs.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memcmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memcpy.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memcpy_arm.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memcpy_xscale.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memmove.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/memset.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/strcmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/string/strncmp.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/Ovfork.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/brk.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/cerror.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/fork.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/getcontext.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/pipe.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/ptrace.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/sbrk.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/shmat.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/sigreturn.S#1 branch
.. //depot/projects/hammer/lib/libc/arm/sys/syscall.S#1 branch
.. //depot/projects/hammer/lib/libc/gen/fts.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/big5.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/gbk.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/mblocal.h#2 integrate
.. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/mbstowcs.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/mskanji.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/none.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#13 integrate
.. //depot/projects/hammer/lib/libc/locale/table.c#8 integrate
.. //depot/projects/hammer/lib/libc/locale/wcsrtombs.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/wcstombs.c#6 integrate
.. //depot/projects/hammer/lib/libc/softfloat/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/README.NetBSD#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/README.txt#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat-macros#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/bits64/softfloat-macros#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/bits64/softfloat.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/eqdf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/eqsf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpgetmask.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpgetround.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpgetsticky.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpsetmask.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpsetround.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/fpsetsticky.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/gedf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/gesf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/gtdf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/gtsf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/ledf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/lesf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/ltdf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/ltsf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/nedf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/negdf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/negsf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/nesf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/softfloat-for-gcc.h#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/softfloat-history.txt#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/softfloat-source.txt#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/softfloat-specialize#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/softfloat.txt#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/templates/milieu.h#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/templates/softfloat-specialize#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/templates/softfloat.h#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/timesoftfloat.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/timesoftfloat.txt#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/unorddf2.c#1 branch
.. //depot/projects/hammer/lib/libc/softfloat/unordsf2.c#1 branch
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#15 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_float.c#4 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_arm.c#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/arm/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/arm/arm/context.S#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libstand/arm/_setjmp.S#1 branch
.. //depot/projects/hammer/lib/libstand/zalloc_defs.h#4 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#13 integrate
.. //depot/projects/hammer/libexec/rtld-elf/Makefile#11 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/Makefile.inc#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/arm/lockdflt.c#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/arm/reloc.c#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_machdep.h#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_start.S#1 branch
.. //depot/projects/hammer/sbin/atm/atm/Makefile#4 integrate
.. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#3 integrate
.. //depot/projects/hammer/sbin/atm/ilmid/Makefile#5 integrate
.. //depot/projects/hammer/sbin/camcontrol/Makefile#6 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/opensslconf-arm.h#1 branch
.. //depot/projects/hammer/secure/lib/libssl/Makefile#5 integrate
.. //depot/projects/hammer/share/man/man4/aue.4#6 integrate
.. //depot/projects/hammer/share/man/man4/bktr.4#4 integrate
.. //depot/projects/hammer/share/man/man4/digi.4#3 integrate
.. //depot/projects/hammer/share/man/man4/fxp.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ng_sppp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/null.4#2 integrate
.. //depot/projects/hammer/share/man/man4/route.4#3 integrate
.. //depot/projects/hammer/share/man/man4/smbus.4#2 integrate
.. //depot/projects/hammer/share/man/man4/tcp.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ttcp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/tun.4#4 integrate
.. //depot/projects/hammer/share/man/man5/config.5#3 integrate
.. //depot/projects/hammer/share/man/man7/release.7#18 integrate
.. //depot/projects/hammer/share/man/man9/BUS_ADD_CHILD.9#1 branch
.. //depot/projects/hammer/share/man/man9/DEVICE_IDENTIFY.9#3 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#32 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#7 integrate
.. //depot/projects/hammer/share/man/man9/device_add_child.9#4 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#17 integrate
.. //depot/projects/hammer/share/mk/sys.mk#14 integrate
.. //depot/projects/hammer/sys/Makefile#7 integrate
.. //depot/projects/hammer/sys/arm/arm/autoconf.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/blockio.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/bootconfig.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/bus_space_asm_generic.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/copystr.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm10.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm3.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm67.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm8.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_armv4.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa1.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_xscale.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/critical.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/db_disasm.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/db_interface.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/db_trace.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/disassem.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/dump_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/exception.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/fiq.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/fiq_subr.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/fusu.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/genassym.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/identcpu.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/in_cksum.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/intr.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/locore.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/nexus.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/nexus_io.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/nexus_io_asm.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/pmap.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/setcpsr.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/setstack.s#1 branch
.. //depot/projects/hammer/sys/arm/arm/support.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/swtch.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/sys_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/trap.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/undefined.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/vectors.S#1 branch
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/conf/SIMICS#1 branch
.. //depot/projects/hammer/sys/arm/include/_inttypes.h#1 branch
.. //depot/projects/hammer/sys/arm/include/armreg.h#1 branch
.. //depot/projects/hammer/sys/arm/include/asm.h#1 branch
.. //depot/projects/hammer/sys/arm/include/asmacros.h#1 branch
.. //depot/projects/hammer/sys/arm/include/atomic.h#1 branch
.. //depot/projects/hammer/sys/arm/include/blockio.h#1 branch
.. //depot/projects/hammer/sys/arm/include/bootconfig.h#1 branch
.. //depot/projects/hammer/sys/arm/include/bus.h#1 branch
.. //depot/projects/hammer/sys/arm/include/clock.h#1 branch
.. //depot/projects/hammer/sys/arm/include/cpu.h#1 branch
.. //depot/projects/hammer/sys/arm/include/cpuconf.h#1 branch
.. //depot/projects/hammer/sys/arm/include/cpufunc.h#1 branch
.. //depot/projects/hammer/sys/arm/include/critical.h#1 branch
.. //depot/projects/hammer/sys/arm/include/db_machdep.h#1 branch
.. //depot/projects/hammer/sys/arm/include/disassem.h#1 branch
.. //depot/projects/hammer/sys/arm/include/fiq.h#1 branch
.. //depot/projects/hammer/sys/arm/include/float.h#1 branch
.. //depot/projects/hammer/sys/arm/include/floatingpoint.h#1 branch
.. //depot/projects/hammer/sys/arm/include/fp.h#1 branch
.. //depot/projects/hammer/sys/arm/include/frame.h#1 branch
.. //depot/projects/hammer/sys/arm/include/ieee.h#1 branch
.. //depot/projects/hammer/sys/arm/include/ieeefp.h#1 branch
.. //depot/projects/hammer/sys/arm/include/in_cksum.h#1 branch
.. //depot/projects/hammer/sys/arm/include/intr.h#1 branch
.. //depot/projects/hammer/sys/arm/include/katelib.h#1 branch
.. //depot/projects/hammer/sys/arm/include/machdep.h#1 branch
.. //depot/projects/hammer/sys/arm/include/md_var.h#1 branch
.. //depot/projects/hammer/sys/arm/include/metadata.h#1 branch
.. //depot/projects/hammer/sys/arm/include/mutex.h#1 branch
.. //depot/projects/hammer/sys/arm/include/param.h#3 integrate
.. //depot/projects/hammer/sys/arm/include/pcb.h#1 branch
.. //depot/projects/hammer/sys/arm/include/pcpu.h#1 branch
.. //depot/projects/hammer/sys/arm/include/pmap.h#1 branch
.. //depot/projects/hammer/sys/arm/include/proc.h#1 branch
.. //depot/projects/hammer/sys/arm/include/profile.h#1 branch
.. //depot/projects/hammer/sys/arm/include/psl.h#1 branch
.. //depot/projects/hammer/sys/arm/include/pte.h#1 branch
.. //depot/projects/hammer/sys/arm/include/ptrace.h#1 branch
.. //depot/projects/hammer/sys/arm/include/reg.h#1 branch
.. //depot/projects/hammer/sys/arm/include/reloc.h#1 branch
.. //depot/projects/hammer/sys/arm/include/resource.h#1 branch
.. //depot/projects/hammer/sys/arm/include/runq.h#1 branch
.. //depot/projects/hammer/sys/arm/include/setjmp.h#1 branch
.. //depot/projects/hammer/sys/arm/include/sf_buf.h#1 branch
.. //depot/projects/hammer/sys/arm/include/sigframe.h#1 branch
.. //depot/projects/hammer/sys/arm/include/smp.h#1 branch
.. //depot/projects/hammer/sys/arm/include/stdarg.h#1 branch
.. //depot/projects/hammer/sys/arm/include/swi.h#1 branch
.. //depot/projects/hammer/sys/arm/include/trap.h#1 branch
.. //depot/projects/hammer/sys/arm/include/ucontext.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/undefined.h#1 branch
.. //depot/projects/hammer/sys/arm/include/utrap.h#1 branch
.. //depot/projects/hammer/sys/arm/include/vmparam.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/files.sa11x0#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irq.S#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ost.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_reg.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_var.h#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/std.sa11x0#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch
.. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch
.. //depot/projects/hammer/sys/boot/Makefile#12 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#3 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/sio.S#3 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#3 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#7 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#5 integrate
.. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_16550.S#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_8251.S#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#1 branch
.. //depot/projects/hammer/sys/conf/files.arm#1 branch
.. //depot/projects/hammer/sys/conf/files.pc98#28 integrate
.. //depot/projects/hammer/sys/conf/kern.mk#18 integrate
.. //depot/projects/hammer/sys/conf/ldscript.arm#1 branch
.. //depot/projects/hammer/sys/conf/options#38 integrate
.. //depot/projects/hammer/sys/conf/options.arm#1 branch
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#19 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#25 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#24 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#24 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#5 integrate
.. //depot/projects/hammer/sys/dev/twa/twa.h#2 integrate
.. //depot/projects/hammer/sys/dev/twa/twa_cam.c#2 integrate
.. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/umodem.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#30 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/hammer/sys/libkern/arm/divsi3.S#1 branch
.. //depot/projects/hammer/sys/libkern/arm/ffs.S#1 branch
.. //depot/projects/hammer/sys/libkern/arm/muldi3.c#1 branch
.. //depot/projects/hammer/sys/modules/Makefile#43 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#22 integrate
.. //depot/projects/hammer/sys/pci/agp_via.c#9 integrate
.. //depot/projects/hammer/sys/pci/agpreg.h#7 integrate
.. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#4 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#10 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#14 integrate
.. //depot/projects/hammer/usr.bin/Makefile#30 integrate
.. //depot/projects/hammer/usr.bin/enigma/enigma.1#2 integrate
.. //depot/projects/hammer/usr.bin/find/find.1#8 integrate
.. //depot/projects/hammer/usr.bin/gprof/arm.c#1 branch
.. //depot/projects/hammer/usr.bin/gprof/arm.h#1 branch
.. //depot/projects/hammer/usr.bin/gprof/gprof.h#5 integrate
.. //depot/projects/hammer/usr.bin/xlint/lint1/param.h#5 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#47 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi_user.c#5 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.h#6 integrate
.. //depot/projects/hammer/usr.sbin/gstat/gstat.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ip.c#3 integrate
.. //depot/projects/hammer/usr.sbin/setkey/parse.y#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#20 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#12 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#51 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.425 2004/05/12 07:02:17 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.426 2004/05/13 07:51:46 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -909,6 +909,7 @@
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
lib/libradius__L: secure/lib/libssl__L
+secure/lib/libssl__L: secure/lib/libcrypto__L
.if !defined(NO_OPENSSH)
_prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
==== //depot/projects/hammer/bin/pax/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.11 2003/06/13 07:04:02 markm Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet Exp $
# To install on versions prior to BSD 4.4 the following may have to be
# defined with CFLAGS +=
@@ -33,4 +33,8 @@
#MAN= pax.1 tar.1 cpio.1
#LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
+.if ${MACHINE_ARCH} == "arm"
+WARNS?= 3
+.endif
+
.include <bsd.prog.mk>
==== //depot/projects/hammer/contrib/amd/FREEBSD-Xlist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.3 2001/09/02 20:15:13 obrien Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.4 2004/05/14 13:28:37 mbr Exp $
*LSM.am-utils
*Makefile.*
*README.autofs
@@ -58,8 +58,10 @@
*conf/nfs_prot/nfs_prot_aix4.h
*conf/nfs_prot/nfs_prot_aix4_2.h
*conf/nfs_prot/nfs_prot_aix4_3.h
+*conf/nfs_prot/nfs_prot_aix5_1.h
*conf/nfs_prot/nfs_prot_bsdi2.h
*conf/nfs_prot/nfs_prot_bsdi3.h
+*conf/nfs_prot/nfs_prot_darwin.h
*conf/nfs_prot/nfs_prot_default.h
*conf/nfs_prot/nfs_prot_hpux.h
*conf/nfs_prot/nfs_prot_hpux11.h
@@ -74,6 +76,7 @@
*conf/nfs_prot/nfs_prot_openbsd.h
*conf/nfs_prot/nfs_prot_osf2.h
*conf/nfs_prot/nfs_prot_osf4.h
+*conf/nfs_prot/nfs_prot_osf5.h
*conf/nfs_prot/nfs_prot_osf5_1.h
*conf/nfs_prot/nfs_prot_sunos3.h
*conf/nfs_prot/nfs_prot_sunos4.h
==== //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#3 (text+ko) ====
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.14 2003/09/03 00:46:21 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
AMD (am-utils) 6.0.9
originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
@@ -28,6 +28,72 @@
All local changes should be submitted to "amd-dev at majordomo.cs.columbia.edu"
for inclusion in the next vendor release.
+Local changes:
+
+ amd/amd.8
+ r1.17 Uniformly refer to a file system as "file system"
+ r1.16 Add the am-utils homepage to SEE ALSO
+ r1.15 s/BSD/.Bx/ where appropriate
+ r1.14 Avoid using parenthesis enclosure macros
+ r1.13 split punctuation characters + misc fixes
+ r1.12 mdoc(7)NG
+ r1.11 Catch a left over reference to "/a"
+ r1.10 Document change to the default mount dir.
+ r1.9 Mention "amd -H" in the synopsis
+ r1.8 Fix miscellaneous mdoc macro argument limit infringements
+ r1.7 Don't refer to non-existent automount(8)
+ r1.6 Fix errors in .Xr usage
+ r1.3 un-mandocafied, un4.4BSD'ed
+ r1.2 sort cross references
+ amd/amd.c
+ r1.7 use /.amd_mnt as default for -a
+ amq/amq.8
+ r1.9 Uniformly refer to a file system as "file system".
+ r1.8 s/BSD/.Bx/ where appropriate.
+ r1.6 mdoc(7)NG.
+ r1.5 Remove reference to non-existent manpage
+ r1.4 Fix typos
+ r1.3 un-mandocafied, un4.4BSD'ed
+ amq/pawd.1
+ r1.3 un-mandocafied, un4.4BSD'ed
+ r1.2 sorting of references
+ conf/nfs_prot/nfs_prot_freebsd3.h
+ r1.11 Userland part of nfs client/server split and cleanup
+ r1.6 restore the standard name nfs_fh3
+ r1.3 Fully use our own generated files for NFSv3
+ r1.2 rpcgen our own files for NFSv3 support
+ fixmount/fixmount.8
+ r1.8 Uniformly refer to a file system as "file system"
+ r1.6 split punctuation characters + misc fixes.
+ r1.5 mdoc(7)NG.
+ r1.4 ".Mn mountd" -> ".Nm mountd"
+ r1.3 un-mandocafied, un4.4BSD'ed
+ r1.2 More sorting of references.
+ fsinfo/fsinfo.8
+ r1.9 add section number to .Xr directive
+ r1.7 Uniformly refer to a file system as "file system"
+ r1.6 split punctuation characters + misc fixes
+ r1.5 mdoc(7)NG
+ r1.3 describe all of the command line options
+ r1.2 un-mandocafied, un4.4BSD'ed
+ mk-amd-map/mk-amd-map.8
+ r1.4 removed HISTORY info from the .Os call.
+ r1.2 un-mandocafied, un4.4BSD'ed
+ scripts/amd.conf.5
+ r1.15 Bring man page back in shape
+ r1.13 Uniformly refer to a file system as "file system"
+ r1.12 Avoid using parenthesis enclosure macros
+ r1.11 mdoc(7)NG
+ r1.10 Fix miscellaneous mdoc macro argument limit infringements
+ r1.8 Fix a bunch of broken cross-references
+ r1.7 Bad reference of uname(2) -> uname(3)
+ r1.6 Grammer fix and style nits.
+ r1.5 xfer typo
+ r1.4 un-mandocafied, un4.4BSD'ed
+ r1.3 More sorting of references.
+ wire-test/wire-test.8
+ r1.2 un-mandocafied, un4.4BSD'ed
+
mbr at FreeBSD.org
obrien at NUXI.com
05-November-1999
==== //depot/projects/hammer/lib/Makefile#35 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.182 2004/04/21 23:23:05 grehan Exp $
+# $FreeBSD: src/lib/Makefile,v 1.185 2004/05/14 19:52:35 bde Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -26,7 +26,7 @@
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \
${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
- libcalendar libcam libcompat libdevinfo libdevstat libdisk \
+ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \
${_libngatm} libopie libpam libpanel libpcap \
@@ -42,13 +42,6 @@
_csu=csu
.endif
-# libc_r is obsolete on ia64.
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc"
-.if !defined(NOLIBC_R)
-_libc_r= libc_r
-.endif
-.endif
-
.if !defined(NOATM)
_libatm= libatm
_libngatm= libngatm
@@ -58,17 +51,6 @@
_libbind= libbind
.endif
-.if !defined(NO_SENDMAIL)
-_libmilter= libmilter
-_libsm= libsm
-_libsmdb= libsmdb
-_libsmutil= libsmutil
-.endif
-
-.if !defined(NO_USB)
-_libusbhid= libusbhid
-.endif
-
.if ${MACHINE_ARCH} == "i386"
.if !defined(NO_BLUETOOTH)
_libbluetooth= libbluetooth
@@ -80,30 +62,47 @@
_libvgl= libvgl
.endif
+.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
+ ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBC_R)
+_libc_r= libc_r
+.endif
+
+.if ${MACHINE_ARCH} != "arm"
+_libdisk= libdisk
+.endif
+
.if ${MACHINE_ARCH} == "alpha"
_libio= libio
_compat= compat
.endif
+.if !defined(NO_SENDMAIL)
+_libmilter= libmilter
+_libsm= libsm
+_libsmdb= libsmdb
+_libsmutil= libsmutil
+.endif
+
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+_libmp= libmp
+.endif
+
.if ${MACHINE_ARCH} == "amd64"
_libncp= libncp
_libsmb= libsmb
.endif
-.if ${MACHINE_ARCH} != "powerpc"
-.if !defined(NOLIBPTHREAD)
+.if ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBPTHREAD)
_libpthread= libpthread
.endif
-.endif
-.if ${MACHINE_ARCH} != "amd64"
-.if !defined(NOLIBTHR)
+.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \
+ !defined(NOLIBTHR)
_libthr= libthr
.endif
-.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
-_libmp= libmp
+.if !defined(NO_USB)
+_libusbhid= libusbhid
.endif
.if !defined(NO_YP_LIBC)
==== //depot/projects/hammer/lib/libarchive/Makefile#7 (text+ko) ====
@@ -1,9 +1,13 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.8 2004/04/28 04:34:07 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.10 2004/05/14 13:31:19 cognet Exp $
LIB= archive
SHLIB_MAJOR= 1
+.if ${MACHINE_ARCH} == "arm"
+WARNS?= 3
+.else
WARNS?= 6
+.endif
# I'm not yet ready for a shared version of this library, as
# there are a couple of API changes still in the works.
@@ -91,6 +95,7 @@
MLINKS+= archive_read.3 archive_read_data_into_file.3
MLINKS+= archive_read.3 archive_read_data_skip.3
MLINKS+= archive_read.3 archive_read_extract.3
+MLINKS+= archive_read.3 archive_read_extract_set_progress_callback.3
MLINKS+= archive_read.3 archive_read_finish.3
MLINKS+= archive_read.3 archive_read_new.3
MLINKS+= archive_read.3 archive_read_next_header.3
==== //depot/projects/hammer/lib/libarchive/archive.h#7 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.9 2004/05/13 06:01:14 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -200,6 +200,8 @@
int archive_read_extract(struct archive *, struct archive_entry *,
int flags);
+void archive_read_extract_set_progress_callback(struct archive *,
+ void (*_progress_func)(void *), void *_user_data);
/* Close the file, release any resources, and destroy the object. */
void archive_read_finish(struct archive *);
==== //depot/projects/hammer/lib/libarchive/archive_private.h#8 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.9 2004/05/13 06:01:14 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -192,6 +192,8 @@
*/
struct archive_string extract_mkdirpath;
struct archive_extract_dir_entry *archive_extract_dir_list;
+ void (*extract_progress)(void *);
+ void *extract_progress_user_data;
void (*cleanup_archive_extract)(struct archive *);
int archive_error_number;
==== //depot/projects/hammer/lib/libarchive/archive_read.3#4 (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_read.3,v 1.3 2004/04/05 21:12:29 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.4 2004/05/13 06:01:14 kientzle Exp $
.\"
.Dd October 1, 2003
.Dt archive_read 3
@@ -47,6 +47,7 @@
.Nm archive_read_data_into_buffer ,
.Nm archive_read_data_into_file ,
.Nm archive_read_extract ,
+.Nm archive_read_extract_set_progress_callback ,
.Nm archive_read_finish
.Nd functions for reading tar archives
.Sh SYNOPSIS
@@ -90,6 +91,8 @@
.Ft int
.Fn archive_read_extract "struct archive *" "int flags"
.Ft void
+.Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data"
+.Ft void
.Fn archive_read_finish "struct archive *"
.Sh DESCRIPTION
These functions provide a complete API for reading streaming archives.
@@ -202,6 +205,15 @@
the file is not recreated.
In particular, the default behavior does not break existing hard links.
.El
+.It Fn archive_read_extract_set_progress_callback
+Sets a pointer to a user-defined callback that can be used
+for updating progress displays during extraction.
+The progress function will be invoked during the extraction of large
+regular files.
+The progress function will be invoked with the pointer provided to this call.
+Generally, the data pointed to should include a reference to the archive
+object and the archive_entry object so that various statistics
+can be retrieved for the progress display.
.It Fn archive_read_finish
Complete the archive, invoke the close callback, and release
all resources.
==== //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.4 2004/04/12 01:16:16 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.5 2004/05/13 06:01:14 kientzle Exp $");
#include <sys/types.h>
#include <unistd.h>
@@ -44,12 +44,16 @@
total_written = 0;
while (a->entry_bytes_remaining > 0) {
- bytes_read = (a->compression_read_ahead)(a, &buff,
- a->entry_bytes_remaining);
+ /* Remember: '1' here is minimum, not maximum. */
+ /* Read-ahead function will return as much as is convenient. */
+ bytes_read = (a->compression_read_ahead)(a, &buff, 1);
if (bytes_read < 0)
return (-1);
if (bytes_read > a->entry_bytes_remaining)
bytes_read = (ssize_t)a->entry_bytes_remaining;
+ /* Don't copy more than 1 megabyte at a time. */
+ if (bytes_read > (1024*1024))
+ bytes_read = 1024*1024;
bytes_written = write(fd, buff, bytes_read);
if (bytes_written < 0)
@@ -57,6 +61,8 @@
(a->compression_read_consume)(a, bytes_written);
total_written += bytes_written;
a->entry_bytes_remaining -= bytes_written;
+ if (a->extract_progress != NULL)
+ (*a->extract_progress)(a->extract_progress_user_data);
}
return (total_written);
}
==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.11 2004/04/30 01:31:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.12 2004/05/13 06:01:14 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -1078,3 +1078,11 @@
}
return (uid);
}
+
+void
+archive_read_extract_set_progress_callback(struct archive *a,
+ void (*progress_func)(void *), void *user_data)
+{
+ a->extract_progress = progress_func;
+ a->extract_progress_user_data = user_data;
+}
==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.4 2004/04/28 04:41:27 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.5 2004/05/13 06:38:30 kientzle Exp $");
#include <errno.h>
#include <stdlib.h>
@@ -351,7 +351,7 @@
state->compressed + ret,
state->compressed_buffer_size - ret);
}
-
+ a->raw_position += ret;
state->stream.next_out
= state->compressed +
state->compressed_buffer_size - ret;
==== //depot/projects/hammer/lib/libatm/Makefile#6 (text+ko) ====
@@ -21,7 +21,7 @@
# notice must be reproduced on all copies.
#
# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD: src/lib/libatm/Makefile,v 1.10 2004/02/05 22:44:22 ru Exp $
+# $FreeBSD: src/lib/libatm/Makefile,v 1.11 2004/05/14 13:31:20 cognet Exp $
LIB= atm
SHLIBDIR?= /lib
@@ -30,6 +30,11 @@
LDADD= -lmd
DPADD= ${LIBMD}
+
+.if ${MACHINE_ARCH} == "arm"
+WARNS?= 3
+.else
WARNS?= 6
+.endif
.include <bsd.lib.mk>
==== //depot/projects/hammer/lib/libc/Makefile#16 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.51 2004/05/02 10:55:07 das Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.52 2004/05/14 12:04:29 cognet Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -57,6 +57,9 @@
.include "${.CURDIR}/rpc/Makefile.inc"
.include "${.CURDIR}/uuid/Makefile.inc"
.include "${.CURDIR}/xdr/Makefile.inc"
+.if ${MACHINE_ARCH} == "arm"
+.include "${.CURDIR}/softfloat/Makefile.inc"
+.endif
.if !defined(NO_YP_LIBC)
CFLAGS+= -DYP
.include "${.CURDIR}/yp/Makefile.inc"
==== //depot/projects/hammer/lib/libc/gen/fts.c#6 (text+ko) ====
@@ -33,11 +33,14 @@
* $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
*/
+#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
+#endif
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.25 2004/05/12 21:38:39 peadar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.26 2004/05/13 15:59:38 bde Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -126,7 +129,7 @@
return (NULL);
}
- /* Allocate/initialize the stream */
+ /* Allocate/initialize the stream. */
if ((priv = malloc(sizeof(*priv))) == NULL)
return (NULL);
memset(priv, 0, sizeof(*priv));
@@ -384,7 +387,7 @@
if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
p->fts_errno = errno;
p->fts_flags |= FTS_DONTCHDIR;
- for (p = sp->fts_child; p != NULL;
+ for (p = sp->fts_child; p != NULL;
p = p->fts_link)
p->fts_accpath =
p->fts_parent->fts_accpath;
@@ -480,7 +483,7 @@
}
(void)_close(p->fts_symfd);
} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
- fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
+ fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
SET(FTS_STOP);
return (NULL);
}
@@ -645,9 +648,9 @@
*/
#ifdef FTS_WHITEOUT
if (ISSET(FTS_WHITEOUT))
- oflag = DTF_NODUP|DTF_REWIND;
+ oflag = DTF_NODUP | DTF_REWIND;
else
- oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
+ oflag = DTF_HIDEW | DTF_NODUP | DTF_REWIND;
#else
#define __opendir2(path, flag) opendir(path)
#endif
@@ -904,10 +907,10 @@
sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
#ifdef FTS_WHITEOUT
- /* check for whiteout */
+ /* Check for whiteout. */
if (p->fts_flags & FTS_ISW) {
if (sbp != &sb) {
- memset(sbp, '\0', sizeof (*sbp));
+ memset(sbp, '\0', sizeof(*sbp));
sbp->st_mode = S_IFWHT;
}
return (FTS_W);
==== //depot/projects/hammer/lib/libc/locale/big5.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.14 2004/05/12 14:09:04 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.15 2004/05/13 03:08:28 tjr Exp $");
#include <errno.h>
#include <runetype.h>
@@ -118,7 +118,7 @@
if (n == 0 || (size_t)(len = _big5_check(*s)) > n)
/* Incomplete multibyte sequence */
return ((size_t)-2);
- if (n == 2 && s[1] == '\0') {
+ if (len == 2 && s[1] == '\0') {
errno = EILSEQ;
return ((size_t)-1);
}
==== //depot/projects/hammer/lib/libc/locale/gbk.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.9 2004/05/12 14:09:04 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.10 2004/05/13 03:08:28 tjr Exp $");
#include <errno.h>
#include <runetype.h>
@@ -115,7 +115,7 @@
if (n == 0 || (size_t)(len = _gbk_check(*s)) > n)
/* Incomplete multibyte sequence */
return ((size_t)-2);
- if (n == 2 && s[1] == '\0') {
+ if (len == 2 && s[1] == '\0') {
errno = EILSEQ;
return ((size_t)-1);
}
==== //depot/projects/hammer/lib/libc/locale/mblocal.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: src/lib/libc/locale/mblocal.h,v 1.1 2004/05/12 14:09:04 tjr Exp $
+ * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.2 2004/05/13 11:20:27 tjr Exp $
*/
#ifndef _MBLOCAL_H_
@@ -37,7 +37,11 @@
extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
extern int (*__mbsinit)(const mbstate_t *);
+extern size_t (*__mbsrtowcs)(wchar_t * __restrict, const char ** __restrict,
+ size_t, mbstate_t * __restrict);
extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+extern size_t (*__wcsrtombs)(char * __restrict, const wchar_t ** __restrict,
+ size_t, mbstate_t * __restrict);
/*
* Conversion functions for "NONE"/C/POSIX encoding.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list