Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Mar 2008 17:27:02 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 136677 for review
Message-ID:  <200803021727.m22HR2Cs009577@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=136677

Change 136677 by marcel@marcel_cluster on 2008/03/02 17:26:19

	IFC @136675

Affected files ...

.. //depot/projects/powerpc/Makefile.inc1#13 integrate
.. //depot/projects/powerpc/UPDATING#16 integrate
.. //depot/projects/powerpc/bin/sh/cd.c#2 integrate
.. //depot/projects/powerpc/contrib/tcpdump/print-802_11.c#4 integrate
.. //depot/projects/powerpc/games/fortune/datfiles/fortunes#11 integrate
.. //depot/projects/powerpc/gnu/lib/libgcc/Makefile#4 integrate
.. //depot/projects/powerpc/gnu/usr.bin/binutils/ar/Makefile#3 integrate
.. //depot/projects/powerpc/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate
.. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kgdb.h#7 integrate
.. //depot/projects/powerpc/include/unistd.h#5 integrate
.. //depot/projects/powerpc/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#10 integrate
.. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#9 integrate
.. //depot/projects/powerpc/lib/libc/gen/sysconf.c#5 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/flt_rounds.c#2 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/fpgetmask.c#2 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/fpgetround.c#2 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/fpsetmask.c#2 integrate
.. //depot/projects/powerpc/lib/libc/powerpc/gen/fpsetround.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fdopen.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fopen.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/freopen.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdlib/getenv.c#7 integrate
.. //depot/projects/powerpc/lib/libc/sys/Symbol.map#6 integrate
.. //depot/projects/powerpc/lib/libc/sys/clock_gettime.2#3 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_close.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_getattr.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_notify.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_open.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_receive.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_send.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mq_setattr.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/readlink.2#4 integrate
.. //depot/projects/powerpc/lib/libelf/gelf_rel.c#2 integrate
.. //depot/projects/powerpc/lib/libelf/gelf_rela.c#2 integrate
.. //depot/projects/powerpc/lib/msun/Makefile#9 integrate
.. //depot/projects/powerpc/lib/msun/Symbol.map#9 integrate
.. //depot/projects/powerpc/lib/msun/amd64/Makefile.inc#5 integrate
.. //depot/projects/powerpc/lib/msun/amd64/e_sqrtl.S#1 branch
.. //depot/projects/powerpc/lib/msun/i387/Makefile.inc#4 integrate
.. //depot/projects/powerpc/lib/msun/i387/e_sqrtl.S#1 branch
.. //depot/projects/powerpc/lib/msun/man/sqrt.3#4 integrate
.. //depot/projects/powerpc/lib/msun/powerpc/fenv.h#2 integrate
.. //depot/projects/powerpc/lib/msun/src/e_rem_pio2.c#3 integrate
.. //depot/projects/powerpc/lib/msun/src/e_rem_pio2f.c#3 integrate
.. //depot/projects/powerpc/lib/msun/src/e_sqrt.c#2 integrate
.. //depot/projects/powerpc/lib/msun/src/e_sqrtl.c#1 branch
.. //depot/projects/powerpc/lib/msun/src/k_rem_pio2.c#5 integrate
.. //depot/projects/powerpc/lib/msun/src/math.h#6 integrate
.. //depot/projects/powerpc/lib/msun/src/math_private.h#5 integrate
.. //depot/projects/powerpc/lib/msun/src/s_cosf.c#3 integrate
.. //depot/projects/powerpc/lib/msun/src/s_sinf.c#3 integrate
.. //depot/projects/powerpc/lib/msun/src/s_tanf.c#3 integrate
.. //depot/projects/powerpc/sbin/fsck_ffs/pass1.c#2 integrate
.. //depot/projects/powerpc/sbin/fsck_ffs/pass2.c#2 integrate
.. //depot/projects/powerpc/sbin/fsck_ffs/setup.c#2 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#13 integrate
.. //depot/projects/powerpc/sbin/ipfw/ipfw.8#11 integrate
.. //depot/projects/powerpc/sbin/ipfw/ipfw2.c#10 integrate
.. //depot/projects/powerpc/sbin/ping6/ping6.c#5 integrate
.. //depot/projects/powerpc/share/man/man4/Makefile#18 integrate
.. //depot/projects/powerpc/share/man/man4/ng_nat.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/uchcom.4#1 branch
.. //depot/projects/powerpc/share/man/man4/ucom.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/ucycom.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/uscanner.4#3 integrate
.. //depot/projects/powerpc/share/man/man9/Makefile#12 integrate
.. //depot/projects/powerpc/share/man/man9/VOP_LOCK.9#3 integrate
.. //depot/projects/powerpc/share/man/man9/insmntque.9#1 branch
.. //depot/projects/powerpc/share/man/man9/lock.9#7 integrate
.. //depot/projects/powerpc/share/man/man9/vfs_mountedfrom.9#1 branch
.. //depot/projects/powerpc/share/man/man9/vgone.9#2 integrate
.. //depot/projects/powerpc/share/man/man9/vhold.9#3 integrate
.. //depot/projects/powerpc/share/man/man9/vput.9#2 integrate
.. //depot/projects/powerpc/share/man/man9/vref.9#2 integrate
.. //depot/projects/powerpc/share/man/man9/vrefcnt.9#1 branch
.. //depot/projects/powerpc/share/man/man9/vrele.9#2 integrate
.. //depot/projects/powerpc/share/misc/bsd-family-tree#10 integrate
.. //depot/projects/powerpc/share/misc/committers-doc.dot#6 integrate
.. //depot/projects/powerpc/share/misc/committers-ports.dot#8 integrate
.. //depot/projects/powerpc/share/mk/bsd.cpu.mk#5 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/identcpu.c#7 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/powerpc/sys/amd64/include/smp.h#5 integrate
.. //depot/projects/powerpc/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425.c#5 integrate
.. //depot/projects/powerpc/sys/boot/i386/boot2/boot2.c#5 integrate
.. //depot/projects/powerpc/sys/boot/i386/btx/btx/Makefile#4 integrate
.. //depot/projects/powerpc/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/powerpc/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/powerpc/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/powerpc/sys/boot/pc98/btx/btx/Makefile#4 integrate
.. //depot/projects/powerpc/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/powerpc/sys/boot/pc98/libpc98/Makefile#5 integrate
.. //depot/projects/powerpc/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/powerpc/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/powerpc/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/powerpc/sys/conf/NOTES#20 integrate
.. //depot/projects/powerpc/sys/conf/files#23 integrate
.. //depot/projects/powerpc/sys/conf/ldscript.powerpc#4 integrate
.. //depot/projects/powerpc/sys/conf/options#23 integrate
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/powerpc/sys/dev/atkbdc/psm.c#6 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#13 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#13 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/powerpc/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/powerpc/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete
.. //depot/projects/powerpc/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/powerpc/sys/dev/em/LICENSE#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_82575.c#3 delete
.. //depot/projects/powerpc/sys/dev/em/e1000_82575.h#3 delete
.. //depot/projects/powerpc/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/powerpc/sys/dev/em/if_em.c#9 integrate
.. //depot/projects/powerpc/sys/dev/em/if_em.h#6 integrate
.. //depot/projects/powerpc/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/powerpc/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/powerpc/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/powerpc/sys/dev/md/md.c#10 integrate
.. //depot/projects/powerpc/sys/dev/msk/if_msk.c#12 integrate
.. //depot/projects/powerpc/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/powerpc/sys/dev/usb/ehci.c#6 integrate
.. //depot/projects/powerpc/sys/dev/usb/ubsa.c#5 integrate
.. //depot/projects/powerpc/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/powerpc/sys/dev/usb/uscanner.c#7 integrate
.. //depot/projects/powerpc/sys/fs/coda/TODO#3 integrate
.. //depot/projects/powerpc/sys/fs/devfs/devfs_vnops.c#14 integrate
.. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vnops.c#8 integrate
.. //depot/projects/powerpc/sys/fs/nullfs/null_vfsops.c#10 integrate
.. //depot/projects/powerpc/sys/fs/nullfs/null_vnops.c#11 integrate
.. //depot/projects/powerpc/sys/fs/nwfs/nwfs_subr.c#5 integrate
.. //depot/projects/powerpc/sys/fs/smbfs/smbfs_io.c#8 integrate
.. //depot/projects/powerpc/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/powerpc/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate
.. //depot/projects/powerpc/sys/fs/unionfs/union_vfsops.c#9 integrate
.. //depot/projects/powerpc/sys/fs/unionfs/union_vnops.c#12 integrate
.. //depot/projects/powerpc/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/powerpc/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/powerpc/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/powerpc/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/powerpc/sys/i386/i386/identcpu.c#10 integrate
.. //depot/projects/powerpc/sys/i386/i386/initcpu.c#6 integrate
.. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#13 integrate
.. //depot/projects/powerpc/sys/i386/include/smp.h#7 integrate
.. //depot/projects/powerpc/sys/ia64/ia64/mp_machdep.c#6 integrate
.. //depot/projects/powerpc/sys/kern/init_main.c#14 integrate
.. //depot/projects/powerpc/sys/kern/init_sysent.c#10 integrate
.. //depot/projects/powerpc/sys/kern/kern_cpuset.c#1 branch
.. //depot/projects/powerpc/sys/kern/kern_lock.c#11 integrate
.. //depot/projects/powerpc/sys/kern/kern_thread.c#13 integrate
.. //depot/projects/powerpc/sys/kern/sched_4bsd.c#11 integrate
.. //depot/projects/powerpc/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/powerpc/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/powerpc/sys/kern/syscalls.c#10 integrate
.. //depot/projects/powerpc/sys/kern/syscalls.master#11 integrate
.. //depot/projects/powerpc/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/powerpc/sys/kern/vfs_bio.c#16 integrate
.. //depot/projects/powerpc/sys/kern/vfs_cache.c#12 integrate
.. //depot/projects/powerpc/sys/kern/vfs_default.c#10 integrate
.. //depot/projects/powerpc/sys/kern/vfs_lookup.c#12 integrate
.. //depot/projects/powerpc/sys/kern/vfs_subr.c#17 integrate
.. //depot/projects/powerpc/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/powerpc/sys/modules/Makefile#17 integrate
.. //depot/projects/powerpc/sys/modules/cxgb/Makefile#8 integrate
.. //depot/projects/powerpc/sys/modules/cxgb/cxgb/Makefile#5 integrate
.. //depot/projects/powerpc/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/em/Makefile#4 integrate
.. //depot/projects/powerpc/sys/modules/geom/Makefile#7 integrate
.. //depot/projects/powerpc/sys/modules/geom/geom_apple/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/geom/geom_gpt/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/geom/geom_part/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/igb/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_base.c#13 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_nat.c#5 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_nat.h#3 integrate
.. //depot/projects/powerpc/sys/netinet/ip_dummynet.c#11 integrate
.. //depot/projects/powerpc/sys/netinet/ip_fw.h#8 integrate
.. //depot/projects/powerpc/sys/netinet/ip_fw2.c#15 integrate
.. //depot/projects/powerpc/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/powerpc/sys/netinet/tcp_input.c#15 integrate
.. //depot/projects/powerpc/sys/netipsec/key.c#4 integrate
.. //depot/projects/powerpc/sys/netipsec/key_debug.c#3 integrate
.. //depot/projects/powerpc/sys/netncp/ncp_conn.c#8 integrate
.. //depot/projects/powerpc/sys/netncp/ncp_conn.h#5 integrate
.. //depot/projects/powerpc/sys/netsmb/smb_conn.c#6 integrate
.. //depot/projects/powerpc/sys/netsmb/smb_conn.h#4 integrate
.. //depot/projects/powerpc/sys/netsmb/smb_iod.c#5 integrate
.. //depot/projects/powerpc/sys/nfs4client/nfs4_idmap.c#3 integrate
.. //depot/projects/powerpc/sys/nfs4client/nfs4_vfsops.c#6 integrate
.. //depot/projects/powerpc/sys/nfsclient/nfs_subs.c#11 integrate
.. //depot/projects/powerpc/sys/nfsclient/nfs_vfsops.c#12 integrate
.. //depot/projects/powerpc/sys/pc98/cbus/sio.c#6 integrate
.. //depot/projects/powerpc/sys/pc98/pc98/machdep.c#11 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/locore.S#4 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/trap.c#3 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#3 integrate
.. //depot/projects/powerpc/sys/powerpc/include/float.h#3 integrate
.. //depot/projects/powerpc/sys/powerpc/include/frame.h#5 integrate
.. //depot/projects/powerpc/sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/powerpc/sys/powerpc/include/kdb.h#3 integrate
.. //depot/projects/powerpc/sys/powerpc/include/pcb.h#5 integrate
.. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#10 integrate
.. //depot/projects/powerpc/sys/powerpc/include/spr.h#4 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/cpu.c#4 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/genassym.c#7 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#15 integrate
.. //depot/projects/powerpc/sys/security/audit/audit.c#10 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_arg.c#8 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_bsm.c#7 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_bsm_klib.c#7 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_private.h#4 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_syscalls.c#10 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_trigger.c#4 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_worker.c#7 integrate
.. //depot/projects/powerpc/sys/sparc64/sparc64/mp_machdep.c#5 integrate
.. //depot/projects/powerpc/sys/sun4v/sun4v/mp_machdep.c#5 integrate
.. //depot/projects/powerpc/sys/sys/_types.h#3 integrate
.. //depot/projects/powerpc/sys/sys/buf.h#10 integrate
.. //depot/projects/powerpc/sys/sys/bufobj.h#3 integrate
.. //depot/projects/powerpc/sys/sys/cpuset.h#1 branch
.. //depot/projects/powerpc/sys/sys/lockmgr.h#10 integrate
.. //depot/projects/powerpc/sys/sys/mount.h#13 integrate
.. //depot/projects/powerpc/sys/sys/param.h#16 integrate
.. //depot/projects/powerpc/sys/sys/proc.h#20 integrate
.. //depot/projects/powerpc/sys/sys/sched.h#4 integrate
.. //depot/projects/powerpc/sys/sys/smp.h#6 integrate
.. //depot/projects/powerpc/sys/sys/syscall.h#10 integrate
.. //depot/projects/powerpc/sys/sys/syscall.mk#10 integrate
.. //depot/projects/powerpc/sys/sys/sysproto.h#10 integrate
.. //depot/projects/powerpc/sys/sys/types.h#6 integrate
.. //depot/projects/powerpc/sys/sys/vnode.h#14 integrate
.. //depot/projects/powerpc/sys/sys/vtoc.h#1 branch
.. //depot/projects/powerpc/sys/ufs/ffs/ffs_rawread.c#4 integrate
.. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#15 integrate
.. //depot/projects/powerpc/sys/vm/vm_map.h#7 integrate
.. //depot/projects/powerpc/sys/vm/vm_object.c#15 integrate
.. //depot/projects/powerpc/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate
.. //depot/projects/powerpc/tools/regression/bin/sh/builtins/cd1.0#1 branch
.. //depot/projects/powerpc/tools/regression/environ/envctl.c#3 integrate
.. //depot/projects/powerpc/usr.bin/Makefile#8 integrate
.. //depot/projects/powerpc/usr.bin/ar/Makefile#2 integrate
.. //depot/projects/powerpc/usr.bin/ar/ar.c#2 integrate
.. //depot/projects/powerpc/usr.bin/ar/write.c#2 integrate
.. //depot/projects/powerpc/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.freebsd#10 integrate
.. //depot/projects/powerpc/usr.bin/cpuset/Makefile#1 branch
.. //depot/projects/powerpc/usr.bin/cpuset/cpuset.c#1 branch
.. //depot/projects/powerpc/usr.bin/du/du.1#2 integrate
.. //depot/projects/powerpc/usr.bin/du/du.c#5 integrate
.. //depot/projects/powerpc/usr.bin/find/find.1#5 integrate
.. //depot/projects/powerpc/usr.bin/unifdef/unifdef.c#2 integrate
.. //depot/projects/powerpc/usr.sbin/pkg_install/add/main.c#4 integrate

Differences ...

==== //depot/projects/powerpc/Makefile.inc1#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -203,6 +203,9 @@
 		GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
+.if ${OSRELDATE} < 700044
+CROSSENV+=	AR=gnu-ar RANLIB=gnu-ranlib
+.endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -872,6 +875,14 @@
 .endif
 .endif
 
+.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+_ar=		usr.bin/ar
+.endif
+
+.if ${BOOTSTRAPPING} < 800013
+_mklocale=	usr.bin/mklocale
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -881,18 +892,15 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} < 800013
-_mklocale=	usr.bin/mklocale
-.endif
-
 bootstrap-tools:
 .for _tool in \
-    ${_mklocale} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
+    ${_ar} \
     usr.bin/lorder \
     usr.bin/makewhatis \
+    ${_mklocale} \
     usr.bin/rpcgen \
     usr.bin/xinstall \
     ${_gensnmptree} \

==== //depot/projects/powerpc/UPDATING#16 (text+ko) ====

@@ -22,6 +22,20 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080301:
+	The layout of struct vmspace has changed. This affects libkvm
+	and any executables that link against libkvm and use the
+	kvm_getprocs() function. In particular, but not exclusively,
+	it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1).
+	The effects are minimal, but it's advisable to upgrade world
+	nonetheless.
+
+20080229:
+	The latest em driver no longer has support in it for the
+	82575 adapter, this is now moved to the igb driver. The
+	split was done to make new features that are incompatible
+	with older hardware easier to do.
+
 20080220:
 	The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4),
 	likewise the kernel option is now GEOM_LINUX_LVM.
@@ -983,4 +997,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $

==== //depot/projects/powerpc/bin/sh/cd.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -68,7 +68,9 @@
 STATIC int cdphysical(char *);
 STATIC int docd(char *, int, int);
 STATIC char *getcomponent(void);
-STATIC int updatepwd(char *);
+STATIC char *findcwd(char *);
+STATIC void updatepwd(char *);
+STATIC char *getpwd2(char *, size_t);
 
 STATIC char *curdir = NULL;	/* current working directory */
 STATIC char *prevdir;		/* previous working directory */
@@ -201,10 +203,11 @@
 	}
 
 	INTOFF;
-	if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) {
+	if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) {
 		INTON;
 		return (-1);
 	}
+	updatepwd(p);
 	INTON;
 	return (0);
 }
@@ -212,12 +215,14 @@
 STATIC int
 cdphysical(char *dest)
 {
+	char *p;
 
 	INTOFF;
-	if (chdir(dest) < 0 || updatepwd(NULL) < 0) {
+	if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) {
 		INTON;
 		return (-1);
 	}
+	updatepwd(p);
 	INTON;
 	return (0);
 }
@@ -247,38 +252,20 @@
 }
 
 
-/*
- * Update curdir (the name of the current directory) in response to a
- * cd command.  We also call hashcd to let the routines in exec.c know
- * that the current directory has changed.
- */
-STATIC int
-updatepwd(char *dir)
+STATIC char *
+findcwd(char *dir)
 {
 	char *new;
 	char *p;
 
-	hashcd();				/* update command hash table */
-
 	/*
 	 * If our argument is NULL, we don't know the current directory
 	 * any more because we traversed a symbolic link or something
 	 * we couldn't stat().
 	 */
 	if (dir == NULL || curdir == NULL)  {
-		if (prevdir)
-			ckfree(prevdir);
-		INTOFF;
-		prevdir = curdir;
-		curdir = NULL;
-		if (getpwd() == NULL) {
-			INTON;
-			return (-1);
-		}
-		setvar("PWD", curdir, VEXPORT);
-		setvar("OLDPWD", prevdir, VEXPORT);
-		INTON;
-		return (0);
+		p = stalloc(PATH_MAX);
+		return getpwd2(p, PATH_MAX);
 	}
 	cdcomppath = stalloc(strlen(dir) + 1);
 	scopy(dir, cdcomppath);
@@ -302,16 +289,25 @@
 	if (new == stackblock())
 		STPUTC('/', new);
 	STACKSTRNUL(new);
-	INTOFF;
+	return stackblock();
+}
+
+/*
+ * Update curdir (the name of the current directory) in response to a
+ * cd command.  We also call hashcd to let the routines in exec.c know
+ * that the current directory has changed.
+ */
+STATIC void
+updatepwd(char *dir)
+{
+	hashcd();				/* update command hash table */
+
 	if (prevdir)
 		ckfree(prevdir);
 	prevdir = curdir;
-	curdir = savestr(stackblock());
+	curdir = savestr(dir);
 	setvar("PWD", curdir, VEXPORT);
 	setvar("OLDPWD", prevdir, VEXPORT);
-	INTON;
-
-	return (0);
 }
 
 int
@@ -355,17 +351,31 @@
 }
 
 /*
- * Find out what the current directory is. If we already know the current
- * directory, this routine returns immediately.
+ * Get the current directory and cache the result in curdir.
  */
 char *
 getpwd(void)
 {
 	char buf[PATH_MAX];
+	char *p;
 
 	if (curdir)
 		return curdir;
-	if (getcwd(buf, sizeof(buf)) == NULL) {
+
+	p = getpwd2(buf, sizeof(buf));
+	if (p != NULL)
+		curdir = savestr(p);
+
+	return curdir;
+}
+
+/*
+ * Return the current directory.
+ */
+STATIC char *
+getpwd2(char *buf, size_t size)
+{
+	if (getcwd(buf, size) == NULL) {
 		char *pwd = getenv("PWD");
 		struct stat stdot, stpwd;
 
@@ -373,12 +383,9 @@
 		    stat(pwd, &stpwd) != -1 &&
 		    stdot.st_dev == stpwd.st_dev &&
 		    stdot.st_ino == stpwd.st_ino) {
-			curdir = savestr(pwd);
-			return curdir;
+			return pwd;
 		}
 		return NULL;
 	}
-	curdir = savestr(buf);
-
-	return curdir;
+	return buf;
 }

==== //depot/projects/powerpc/contrib/tcpdump/print-802_11.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */
 /*
  * Copyright (c) 2001
  *	Fortress Technologies, Inc.  All rights reserved.
@@ -1186,9 +1186,9 @@
 		break;
 	case IEEE80211_RADIOTAP_RATE:
 		if (u.u8 & 0x80)
+			PRINT_HT_RATE("", u.u8, " Mb/s ");
+		else
 			PRINT_RATE("", u.u8, " Mb/s ");
-		else
-			PRINT_HT_RATE("", u.u8, " Mb/s ");
 		break;
 	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
 		printf("%ddB signal ", u.i8);

==== //depot/projects/powerpc/games/fortune/datfiles/fortunes#11 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $
 %
 =======================================================================
 ||								     ||
@@ -15979,6 +15979,9 @@
 %
 Don't mind him; politicians always sound like that.
 %
+Don't patch bad code -- rewrite it.
+		-- "The Elements of Programming Style", Kernighan and Plauger
+%
 Don't plan any hasty moves.
 You'll be evicted soon anyway.
 %
@@ -31243,7 +31246,7 @@
 		-- Charles Dickens
 %
 Let the machine do the dirty work.
-		-- "Elements of Programming Style", Kernighan and Ritchie
+		-- "The Elements of Programming Style", Kernighan and Plauger
 %
 Let the meek inherit the earth -- they have it coming to them.
 		-- James Thurber

==== //depot/projects/powerpc/gnu/lib/libgcc/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
@@ -122,7 +122,7 @@
 
 .if ${TARGET_ARCH} == "powerpc"
 #	from config/rs6000/t-ppccomm
-LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c
+LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 

==== //depot/projects/powerpc/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ====

@@ -1,15 +1,16 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.18 2008/03/02 11:10:46 ru Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if defined(WITH_BSDAR)
-PROG=	gnu-ar
-#MAN=	gnu-ar.1
-.else
+PROGNAME= gnu-ar
+MAN=   gnu-ar.1
+gnu-ar.1: ar.1
+	cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gnu-ar.1
+
 PROG=	ar
-.endif
 SRCS=	ar.c not-ranlib.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils

==== //depot/projects/powerpc/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ====

@@ -1,15 +1,16 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.19 2008/03/02 11:10:46 ru Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
-.if defined(WITH_BSDAR)
-PROG=	gnu-ranlib
-#MAN=	gnu-ranlib.1
-.else
+PROGNAME= gnu-ranlib
+MAN=	gnu-ranlib.1
+gnu-ranlib.1: ranlib.1
+	cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gnu-ranlib.1
+
 PROG=	ranlib
-.endif
 SRCS=	ar.c is-ranlib.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils

==== //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kgdb.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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $
  */
 
 #ifndef _KGDB_H_
@@ -49,7 +49,6 @@
 extern struct kthr *curkthr;
 
 void kgdb_add_kld_cmd(char *, int);
-void kgdb_auto_load_klds(void);
 void kgdb_kld_init(void);
 void kgdb_target(void);
 void kgdb_trgt_fetch_registers(int);

==== //depot/projects/powerpc/include/unistd.h#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.84 2008/02/26 20:33:52 ru Exp $
  */
 
 #ifndef _UNISTD_H_
@@ -405,7 +405,7 @@
 /* 1003.1-2001 */
 #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
 int	 fchown(int, uid_t, gid_t);
-ssize_t	 readlink(const char *, char *, size_t);
+ssize_t	 readlink(const char * __restrict, char * __restrict, size_t);
 #endif
 #if __POSIX_VISIBLE >= 200112
 int	 gethostname(char *, size_t);

==== //depot/projects/powerpc/lib/libarchive/archive_endian.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/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $
+ * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $
  *
  * Borrowed from FreeBSD's <sys/endian.h>
  */
@@ -34,7 +34,7 @@
 /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
 
 static inline uint16_t
-be16dec(const void *pp)
+archive_be16dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -42,7 +42,7 @@
 }
 
 static inline uint32_t
-be32dec(const void *pp)
+archive_be32dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -50,15 +50,15 @@
 }
 
 static inline uint64_t
-be64dec(const void *pp)
+archive_be64dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
-	return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
+	return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4));
 }
 
 static inline uint16_t
-le16dec(const void *pp)
+archive_le16dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -66,7 +66,7 @@
 }
 
 static inline uint32_t
-le32dec(const void *pp)
+archive_le32dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -74,15 +74,15 @@
 }
 
 static inline uint64_t
-le64dec(const void *pp)
+archive_le64dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
-	return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
+	return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p));
 }
 
 static inline void
-be16enc(void *pp, uint16_t u)
+archive_be16enc(void *pp, uint16_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -91,7 +91,7 @@
 }
 
 static inline void
-be32enc(void *pp, uint32_t u)
+archive_be32enc(void *pp, uint32_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -102,16 +102,16 @@
 }
 
 static inline void
-be64enc(void *pp, uint64_t u)
+archive_be64enc(void *pp, uint64_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
-	be32enc(p, u >> 32);
-	be32enc(p + 4, u & 0xffffffff);
+	archive_be32enc(p, u >> 32);
+	archive_be32enc(p + 4, u & 0xffffffff);
 }
 
 static inline void
-le16enc(void *pp, uint16_t u)
+archive_le16enc(void *pp, uint16_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -120,7 +120,7 @@
 }
 
 static inline void
-le32enc(void *pp, uint32_t u)
+archive_le32enc(void *pp, uint32_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -131,12 +131,12 @@
 }
 
 static inline void
-le64enc(void *pp, uint64_t u)
+archive_le64enc(void *pp, uint64_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
-	le32enc(p, u & 0xffffffff);
-	le32enc(p + 4, u >> 32);
+	archive_le32enc(p, u & 0xffffffff);
+	archive_le32enc(p + 4, u >> 32);
 }
 
 #endif

==== //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#10 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.22 2008/02/27 06:05:59 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -278,8 +278,8 @@
 
 	zip->version = p->version[0];
 	zip->system = p->version[1];
-	zip->flags = le16dec(p->flags);
-	zip->compression = le16dec(p->compression);
+	zip->flags = archive_le16dec(p->flags);
+	zip->compression = archive_le16dec(p->compression);
 	if (zip->compression <
 	    sizeof(compression_names)/sizeof(compression_names[0]))
 		zip->compression_name = compression_names[zip->compression];
@@ -291,11 +291,11 @@
 	zip->mode = 0;
 	zip->uid = 0;
 	zip->gid = 0;
-	zip->crc32 = le32dec(p->crc32);
-	zip->filename_length = le16dec(p->filename_length);
-	zip->extra_length = le16dec(p->extra_length);
-	zip->uncompressed_size = le32dec(p->uncompressed_size);
-	zip->compressed_size = le32dec(p->compressed_size);
+	zip->crc32 = archive_le32dec(p->crc32);
+	zip->filename_length = archive_le16dec(p->filename_length);
+	zip->extra_length = archive_le16dec(p->extra_length);
+	zip->uncompressed_size = archive_le32dec(p->uncompressed_size);
+	zip->compressed_size = archive_le32dec(p->compressed_size);
 
 	(a->decompressor->consume)(a, sizeof(struct zip_file_header));
 
@@ -397,9 +397,9 @@
 					    "Truncated ZIP end-of-file record");
 					return (ARCHIVE_FATAL);
 				}
-				zip->crc32 = le32dec(p + 4);
-				zip->compressed_size = le32dec(p + 8);
-				zip->uncompressed_size = le32dec(p + 12);
+				zip->crc32 = archive_le32dec(p + 4);
+				zip->compressed_size = archive_le32dec(p + 8);
+				zip->uncompressed_size = archive_le32dec(p + 12);
 				(a->decompressor->consume)(a, 16);
 			}
 
@@ -636,7 +636,7 @@
 {
 	struct zip *zip;
 	const void *buff = NULL;
-	ssize_t bytes_avail;
+	off_t bytes_skipped;
 
 	zip = (struct zip *)(a->format->data);
 
@@ -659,19 +659,10 @@
 	 * If the length is at the beginning, we can skip the
 	 * compressed data much more quickly.
 	 */
-	while (zip->entry_bytes_remaining > 0) {
-		bytes_avail = (a->decompressor->read_ahead)(a, &buff, 1);
-		if (bytes_avail <= 0) {
-			archive_set_error(&a->archive,
-			    ARCHIVE_ERRNO_FILE_FORMAT,
-			    "Truncated ZIP file body");
-			return (ARCHIVE_FATAL);
-		}
-		if (bytes_avail > zip->entry_bytes_remaining)
-			bytes_avail = zip->entry_bytes_remaining;
-		(a->decompressor->consume)(a, bytes_avail);
-		zip->entry_bytes_remaining -= bytes_avail;
-	}
+	bytes_skipped = (a->decompressor->skip)(a, zip->entry_bytes_remaining);
+	if (bytes_skipped < 0)
+		return (ARCHIVE_FATAL);
+
 	/* This entry is finished and done. */
 	zip->end_of_entry_cleanup = zip->end_of_entry = 1;
 	return (ARCHIVE_OK);
@@ -707,8 +698,8 @@
 	const char *p = (const char *)extra;
 	while (offset < zip->extra_length - 4)
 	{
-		unsigned short headerid = le16dec(p + offset);
-		unsigned short datasize = le16dec(p + offset + 2);
+		unsigned short headerid = archive_le16dec(p + offset);
+		unsigned short datasize = archive_le16dec(p + offset + 2);
 		offset += 4;
 		if (offset + datasize > zip->extra_length)
 			break;
@@ -720,9 +711,9 @@
 		case 0x0001:
 			/* Zip64 extended information extra field. */
 			if (datasize >= 8)
-				zip->uncompressed_size = le64dec(p + offset);
+				zip->uncompressed_size = archive_le64dec(p + offset);
 			if (datasize >= 16)
-				zip->compressed_size = le64dec(p + offset + 8);
+				zip->compressed_size = archive_le64dec(p + offset + 8);
 			break;
 		case 0x5455:
 		{
@@ -735,11 +726,12 @@
 			{
 #ifdef DEBUG
 				fprintf(stderr, "mtime: %lld -> %d\n",
-				    (long long)zip->mtime, le32dec(p + offset));
+				    (long long)zip->mtime,
+				    archive_le32dec(p + offset));
 #endif
 				if (datasize < 4)
 					break;
-				zip->mtime = le32dec(p + offset);
+				zip->mtime = archive_le32dec(p + offset);
 				offset += 4;
 				datasize -= 4;
 			}
@@ -747,7 +739,7 @@
 			{
 				if (datasize < 4)
 					break;
-				zip->atime = le32dec(p + offset);
+				zip->atime = archive_le32dec(p + offset);
 				offset += 4;
 				datasize -= 4;
 			}

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803021727.m22HR2Cs009577>