Date: Thu, 27 Feb 2003 19:16:10 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26050 for review Message-ID: <200302280316.h1S3GAvX088400@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26050 Change 26050 by marcel@marcel_nfs on 2003/02/27 19:15:22 IFC @26047 Affected files ... .. //depot/projects/ia64/Makefile#23 integrate .. //depot/projects/ia64/Makefile.inc1#48 integrate .. //depot/projects/ia64/bin/dd/Makefile#4 integrate .. //depot/projects/ia64/bin/dd/args.c#5 integrate .. //depot/projects/ia64/bin/dd/conv.c#4 integrate .. //depot/projects/ia64/bin/dd/dd.c#5 integrate .. //depot/projects/ia64/bin/dd/dd.h#3 integrate .. //depot/projects/ia64/bin/dd/extern.h#3 integrate .. //depot/projects/ia64/bin/dd/misc.c#5 integrate .. //depot/projects/ia64/bin/dd/position.c#4 integrate .. //depot/projects/ia64/bin/sh/machdep.h#3 delete .. //depot/projects/ia64/bin/sh/memalloc.c#5 integrate .. //depot/projects/ia64/bin/sh/nodes.c.pat#4 integrate .. //depot/projects/ia64/contrib/sendmail/cf/ostype/bsd4.4.m4#4 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/bitdomain.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/makemap/makemap.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/praliases/praliases.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/aliases.5#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.h#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/err.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/mailq.1#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/mci.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/savemail.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#8 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#26 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#15 integrate .. //depot/projects/ia64/gnu/include/values.h#2 delete .. //depot/projects/ia64/gnu/lib/csu/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#20 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/gcov/Makefile#3 integrate .. //depot/projects/ia64/include/resolv.h#3 integrate .. //depot/projects/ia64/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/nlist.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/signbit.3#2 integrate .. //depot/projects/ia64/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/infinity.c#6 integrate .. //depot/projects/ia64/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#9 integrate .. //depot/projects/ia64/lib/libc/net/getservent.c#5 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.c#5 integrate .. //depot/projects/ia64/lib/libc/net/nslexer.l#4 integrate .. //depot/projects/ia64/lib/libc/net/rcmdsh.c#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_set.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/rpc/getrpcent.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_com.h#5 integrate .. //depot/projects/ia64/lib/libc/rpc/svc_run.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/insque.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#9 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_rec.c#6 integrate .. //depot/projects/ia64/lib/libc_r/man/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr.3#5 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#7 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_main_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_multi_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_resume_all_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_resume_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_set_name_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_suspend_all_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_suspend_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_switch_add_np.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_open.3#3 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#13 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/ia64/lib/msun/man/lgamma.3#5 integrate .. //depot/projects/ia64/lib/msun/src/math.h#12 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#10 integrate .. //depot/projects/ia64/release/Makefile#40 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#70 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#8 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#9 integrate .. //depot/projects/ia64/sbin/comcontrol/Makefile#3 integrate .. //depot/projects/ia64/sbin/dmesg/Makefile#3 integrate .. //depot/projects/ia64/sbin/gbde/gbde.c#7 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/ia64/sbin/mknod/mknod.8#6 integrate .. //depot/projects/ia64/sbin/swapon/swapon.8#6 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#8 integrate .. //depot/projects/ia64/sbin/umount/Makefile#3 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#16 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#11 integrate .. //depot/projects/ia64/secure/usr.bin/openssl/Makefile#6 integrate .. //depot/projects/ia64/share/man/man4/Makefile#36 integrate .. //depot/projects/ia64/share/man/man4/aac.4#3 integrate .. //depot/projects/ia64/share/man/man4/an.4#3 integrate .. //depot/projects/ia64/share/man/man4/card.4#1 branch .. //depot/projects/ia64/share/man/man4/ciss.4#2 integrate .. //depot/projects/ia64/share/man/man4/devctl.4#3 integrate .. //depot/projects/ia64/share/man/man4/exca.4#1 branch .. //depot/projects/ia64/share/man/man4/firewire.4#6 integrate .. //depot/projects/ia64/share/man/man4/fwe.4#4 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#5 integrate .. //depot/projects/ia64/share/man/man4/gif.4#8 integrate .. //depot/projects/ia64/share/man/man4/ida.4#2 integrate .. //depot/projects/ia64/share/man/man4/iir.4#2 integrate .. //depot/projects/ia64/share/man/man4/ip.4#5 integrate .. //depot/projects/ia64/share/man/man4/lmc.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac.4#5 integrate .. //depot/projects/ia64/share/man/man4/random.4#2 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#7 integrate .. //depot/projects/ia64/share/man/man4/sio.4#6 integrate .. //depot/projects/ia64/share/man/man4/targ.4#4 integrate .. //depot/projects/ia64/share/man/man4/vinum.4#11 integrate .. //depot/projects/ia64/share/man/man4/wi.4#14 integrate .. //depot/projects/ia64/share/man/man5/Makefile#11 integrate .. //depot/projects/ia64/share/man/man5/msdosfs.5#4 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#11 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#1 branch .. //depot/projects/ia64/share/man/man7/operator.7#3 integrate .. //depot/projects/ia64/share/man/man8/diskless.8#8 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#8 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#7 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#6 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#24 integrate .. //depot/projects/ia64/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#27 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#21 integrate .. //depot/projects/ia64/sys/alpha/conf/Makefile#2 integrate .. //depot/projects/ia64/sys/alpha/conf/NOTES#3 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#7 integrate .. //depot/projects/ia64/sys/alpha/include/db_machdep.h#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/ia64/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/ia64/sys/boot/common/ufsread.c#6 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#5 integrate .. //depot/projects/ia64/sys/boot/efi/loader/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/Makefile#12 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#34 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#8 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#14 integrate .. //depot/projects/ia64/sys/conf/NOTES#40 integrate .. //depot/projects/ia64/sys/conf/files#64 integrate .. //depot/projects/ia64/sys/conf/files.i386#31 integrate .. //depot/projects/ia64/sys/conf/files.pc98#25 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#15 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#25 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/ia64/sys/conf/majors#19 integrate .. //depot/projects/ia64/sys/conf/majors.awk#1 branch .. //depot/projects/ia64/sys/conf/makeLINT.mk#1 branch .. //depot/projects/ia64/sys/conf/makeLINT.sed#2 integrate .. //depot/projects/ia64/sys/conf/options#44 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#15 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#18 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/ia64/sys/dev/aac/aac_disk.c#11 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/aac/aacvar.h#13 integrate .. //depot/projects/ia64/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#14 integrate .. //depot/projects/ia64/sys/dev/amr/amr_disk.c#7 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#9 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.c#8 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#27 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#18 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.h#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-isa.c#9 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#9 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/ia64/sys/dev/fb/fb.c#7 integrate .. //depot/projects/ia64/sys/dev/fb/fbreg.h#4 integrate .. //depot/projects/ia64/sys/dev/fb/gfb.c#3 integrate .. //depot/projects/ia64/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#8 integrate .. //depot/projects/ia64/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#20 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#11 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#18 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/ia64/sys/dev/gfb/gfb_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/hea/eni_buffer.c#8 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#4 integrate .. //depot/projects/ia64/sys/dev/ida/ida_disk.c#8 integrate .. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx_compat.h#2 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/ia64/sys/dev/mlx/mlxvar.h#4 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#11 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/null/null.c#9 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#6 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#5 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#8 integrate .. //depot/projects/ia64/sys/dev/rc/rc.c#4 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#36 integrate .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#16 integrate .. //depot/projects/ia64/sys/dev/sio/siovar.h#14 edit .. //depot/projects/ia64/sys/dev/snp/snp.c#11 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_rate.c#6 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#10 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#12 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecreg.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#9 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#32 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#9 integrate .. //depot/projects/ia64/sys/geom/geom_stats.c#4 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/fs.h#3 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/ia64/sys/i386/conf/Makefile#6 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#32 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#10 integrate .. //depot/projects/ia64/sys/i386/i386/mem.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/ia64/sys/i386/include/bus_pc98.h#5 integrate .. //depot/projects/ia64/sys/i386/include/param.h#5 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#9 integrate .. //depot/projects/ia64/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/cx.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/istallion.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/loran.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/spigot.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/vesa.c#6 integrate .. //depot/projects/ia64/sys/i386/linux/linux.h#5 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ctl.c#5 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#7 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#5 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#57 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#43 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#8 integrate .. //depot/projects/ia64/sys/isa/vga_isa.c#2 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#48 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#45 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#18 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_xxx.c#5 integrate .. //depot/projects/ia64/sys/kern/tty.c#22 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#40 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#15 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#16 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/ia64/sys/libkern/strdup.c#1 branch .. //depot/projects/ia64/sys/modules/Makefile#39 integrate .. //depot/projects/ia64/sys/modules/aac/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/null/Makefile#1 branch .. //depot/projects/ia64/sys/modules/osf1/Makefile#4 integrate .. //depot/projects/ia64/sys/net/if_tun.c#14 integrate .. //depot/projects/ia64/sys/netatm/port.h#9 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_sigcpcs.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_sigcpcs.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_sigcpcs.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_subr.c#5 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#24 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#10 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/ia64/sys/netipx/ipx.c#5 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_ncp.c#6 integrate .. //depot/projects/ia64/sys/netncp/ncp_ncp.h#3 integrate .. //depot/projects/ia64/sys/netncp/ncp_rq.c#6 integrate .. //depot/projects/ia64/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_sock.c#6 integrate .. //depot/projects/ia64/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.h#4 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/ia64/sys/pc98/conf/Makefile#1 branch .. //depot/projects/ia64/sys/pc98/conf/NOTES#1 branch .. //depot/projects/ia64/sys/pc98/i386/machdep.c#32 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons.c#13 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#15 integrate .. //depot/projects/ia64/sys/pci/agp.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#24 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/ia64/sys/pci/intpm.c#6 integrate .. //depot/projects/ia64/sys/pci/meteor.c#4 integrate .. //depot/projects/ia64/sys/pci/simos.c#6 delete .. //depot/projects/ia64/sys/pci/simos.h#2 delete .. //depot/projects/ia64/sys/pci/xrpu.c#5 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#7 integrate .. //depot/projects/ia64/sys/powerpc/include/cpufunc.h#11 integrate .. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#22 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap_subr.S#8 integrate .. //depot/projects/ia64/sys/powerpc/psim/ata_iobus.c#3 integrate .. //depot/projects/ia64/sys/sparc64/conf/Makefile#1 branch .. //depot/projects/ia64/sys/sparc64/conf/NOTES#1 branch .. //depot/projects/ia64/sys/sparc64/include/bus.h#11 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#31 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#20 integrate .. //depot/projects/ia64/sys/sys/_iovec.h#2 integrate .. //depot/projects/ia64/sys/sys/_timespec.h#3 integrate .. //depot/projects/ia64/sys/sys/buf.h#17 integrate .. //depot/projects/ia64/sys/sys/conf.h#18 integrate .. //depot/projects/ia64/sys/sys/interrupt.h#4 integrate .. //depot/projects/ia64/sys/sys/kse.h#7 integrate .. //depot/projects/ia64/sys/sys/libkern.h#11 integrate .. //depot/projects/ia64/sys/sys/lockmgr.h#10 integrate .. //depot/projects/ia64/sys/sys/malloc.h#17 integrate .. //depot/projects/ia64/sys/sys/param.h#25 integrate .. //depot/projects/ia64/sys/sys/proc.h#50 integrate .. //depot/projects/ia64/sys/sys/socket.h#13 integrate .. //depot/projects/ia64/sys/sys/stat.h#9 integrate .. //depot/projects/ia64/sys/sys/taskqueue.h#2 integrate .. //depot/projects/ia64/sys/sys/time.h#13 integrate .. //depot/projects/ia64/sys/sys/uio.h#8 integrate .. //depot/projects/ia64/sys/sys/vnode.h#27 integrate .. //depot/projects/ia64/sys/sys/watchdog.h#1 branch .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#24 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/ia64/sys/ufs/ufs/quota.h#6 integrate .. //depot/projects/ia64/sys/vm/device_pager.c#10 integrate .. //depot/projects/ia64/sys/vm/pmap.h#13 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#38 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#9 integrate .. //depot/projects/ia64/tools/KSE/rr/Makefile#1 branch .. //depot/projects/ia64/tools/KSE/rr/kse_asm.S#1 branch .. //depot/projects/ia64/tools/KSE/rr/rr.c#1 branch .. //depot/projects/ia64/tools/KSE/rr/simplelock.h#1 branch .. //depot/projects/ia64/tools/tools/crypto/cryptotest.c#3 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#3 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#4 integrate .. //depot/projects/ia64/usr.bin/cmp/regular.c#7 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#5 integrate .. //depot/projects/ia64/usr.bin/lock/lock.1#4 integrate .. //depot/projects/ia64/usr.bin/renice/renice.8#7 integrate .. //depot/projects/ia64/usr.bin/renice/renice.c#7 integrate .. //depot/projects/ia64/usr.bin/systat/systat.1#7 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.1#10 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#13 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.1#8 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#7 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.1#13 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.c#21 integrate .. //depot/projects/ia64/usr.sbin/IPXrouted/IPXrouted.8#3 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.8#8 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#11 integrate .. //depot/projects/ia64/usr.sbin/config/config.y#3 integrate .. //depot/projects/ia64/usr.sbin/config/lang.l#4 integrate .. //depot/projects/ia64/usr.sbin/extattr/rmextattr.8#3 integrate .. //depot/projects/ia64/usr.sbin/getpmac/getpmac.8#2 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#14 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.8#5 integrate .. //depot/projects/ia64/usr.sbin/mailwrapper/mailwrapper.8#4 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#9 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#13 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/dumpcisfile.c#1 branch .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardc.8#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardc.c#2 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/readcis.c#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/readcis.h#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/delete/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/delete/perform.c#4 integrate .. //depot/projects/ia64/usr.sbin/setpmac/setpmac.8#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/index.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/media.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#17 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/tcpip.c#7 integrate .. //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.1#8 integrate .. //depot/projects/ia64/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/ia64/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.277 2003/02/19 16:57:12 ru Exp $ +# $FreeBSD: src/Makefile,v 1.278 2003/02/27 13:11:33 ru Exp $ # # The user-driven targets are: # @@ -101,6 +101,7 @@ .ORDER: buildworld installworld .ORDER: buildworld distributeworld +.ORDER: buildworld buildkernel .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel ==== //depot/projects/ia64/Makefile.inc1#48 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.318 2003/02/21 11:19:25 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.319 2003/02/24 20:09:16 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -660,7 +660,9 @@ ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall ${ECHODIR} "===> ${_tool}"; \ - cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor # ==== //depot/projects/ia64/bin/dd/Makefile#4 (text+ko) ==== @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.10 2002/02/04 02:49:18 kris Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.11 2003/02/27 18:04:53 markm Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c -WARNS= 0 -WFORMAT=0 +WARNS?= 4 MAINTAINER= green@FreeBSD.org ==== //depot/projects/ia64/bin/dd/args.c#5 (text+ko) ==== @@ -41,12 +41,13 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.33 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.34 2003/02/27 18:04:54 markm Exp $"); #include <sys/types.h> #include <err.h> #include <errno.h> +#include <inttypes.h> #include <limits.h> #include <stdlib.h> #include <string.h> @@ -67,7 +68,7 @@ static void f_of(char *); static void f_seek(char *); static void f_skip(char *); -static u_quad_t get_num(const char *); +static uintmax_t get_num(const char *); static off_t get_off_t(const char *); static const struct arg { @@ -167,8 +168,10 @@ /* * Bail out if the calculation of a file offset would overflow. */ - if (in.offset > QUAD_MAX / in.dbsz || out.offset > QUAD_MAX / out.dbsz) - errx(1, "seek offsets cannot be larger than %qd", QUAD_MAX); + if (in.offset > OFF_MAX / (ssize_t)in.dbsz || + out.offset > OFF_MAX / (ssize_t)out.dbsz) + errx(1, "seek offsets cannot be larger than %jd", + (intmax_t)OFF_MAX); } static int @@ -182,7 +185,7 @@ static void f_bs(char *arg) { - u_quad_t res; + uintmax_t res; res = get_num(arg); if (res < 1 || res > SSIZE_MAX) @@ -193,7 +196,7 @@ static void f_cbs(char *arg) { - u_quad_t res; + uintmax_t res; res = get_num(arg); if (res < 1 || res > SSIZE_MAX) @@ -204,15 +207,15 @@ static void f_count(char *arg) { - u_quad_t res; + intmax_t res; - res = get_num(arg); - if ((quad_t)res < 0) + res = (intmax_t)get_num(arg); + if (res < 0) errx(1, "count cannot be negative"); if (res == 0) - cpy_cnt = -1; + cpy_cnt = (uintmax_t)-1; else - cpy_cnt = (quad_t)res; + cpy_cnt = (uintmax_t)res; } static void @@ -221,18 +224,18 @@ files_cnt = get_num(arg); if (files_cnt < 1) - errx(1, "files must be between 1 and %qd", QUAD_MAX); + errx(1, "files must be between 1 and %jd", (uintmax_t)-1); } static void f_ibs(char *arg) { - u_quad_t res; + uintmax_t res; if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %d", SSIZE_MAX); + errx(1, "ibs must be between 1 and %zd", SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -247,12 +250,12 @@ static void f_obs(char *arg) { - u_quad_t res; + uintmax_t res; if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %d", SSIZE_MAX); + errx(1, "obs must be between 1 and %zd", SSIZE_MAX); out.dbsz = (size_t)res; } } @@ -329,7 +332,7 @@ } /* - * Convert an expression of the following forms to a u_quad_t. + * Convert an expression of the following forms to a uintmax_t. * 1) A positive decimal number. * 2) A positive decimal number followed by a b (mult by 512). * 3) A positive decimal number followed by a k (mult by 1 << 10). @@ -340,10 +343,10 @@ * separated by x (also * for backwards compatibility), specifying * the product of the indicated values. */ -static u_quad_t +static uintmax_t get_num(const char *val) { - u_quad_t num, mult, prevnum; + uintmax_t num, mult, prevnum; char *expr; errno = 0; @@ -406,14 +409,12 @@ * Convert an expression of the following forms to an off_t. This is the * same as get_num(), but it uses signed numbers. * - * The major problem here is that an off_t may not necessarily be a quad_t. - * The right thing to do would be to use intmax_t when available and then - * cast down to an off_t, if possible. + * The major problem here is that an off_t may not necessarily be a intmax_t. */ static off_t get_off_t(const char *val) { - quad_t num, mult, prevnum; + intmax_t num, mult, prevnum; char *expr; errno = 0; @@ -457,7 +458,7 @@ break; case '*': /* Backward compatible. */ case 'x': - mult = (quad_t)get_off_t(expr + 1); + mult = (intmax_t)get_off_t(expr + 1); prevnum = num; num *= mult; if ((prevnum > 0) == (num > 0) && num / mult == prevnum) ==== //depot/projects/ia64/bin/dd/conv.c#4 (text+ko) ==== @@ -41,11 +41,12 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.17 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.18 2003/02/27 18:04:54 markm Exp $"); #include <sys/param.h> #include <err.h> +#include <inttypes.h> #include <string.h> #include "dd.h" @@ -171,7 +172,8 @@ ++st.trunc; /* Toss characters to a newline. */ - for (; in.dbcnt && *inp++ != '\n'; --in.dbcnt); + for (; in.dbcnt && *inp++ != '\n'; --in.dbcnt) + ; if (!in.dbcnt) intrunc = 1; else @@ -223,8 +225,8 @@ /* Translation and case conversion. */ if ((t = ctab) != NULL) - for (cnt = in.dbrcnt, inp = in.dbp; cnt--;) - *--inp = t[*inp]; + for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp) + *inp = t[*inp]; /* * Copy records (max cbsz size chunks) into the output buffer. The * translation has to already be done or we might not recognize the ==== //depot/projects/ia64/bin/dd/dd.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.38 2003/01/26 11:13:40 phk Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -60,6 +60,7 @@ #include <err.h> #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <locale.h> #include <stdio.h> #include <stdlib.h> @@ -77,11 +78,11 @@ IO in, out; /* input/output state */ STAT st; /* statistics */ void (*cfunc)(void); /* conversion function */ -u_quad_t cpy_cnt; /* # of blocks to copy */ +uintmax_t cpy_cnt; /* # of blocks to copy */ static off_t pending = 0; /* pending seek if sparse */ -u_int ddflags; /* conversion options */ +u_int ddflags = 0; /* conversion options */ size_t cbsz; /* conversion block size */ -quad_t files_cnt = 1; /* # of files to copy */ +uintmax_t files_cnt = 1; /* # of files to copy */ const u_char *ctab; /* conversion table */ int @@ -247,7 +248,7 @@ case 0: break; default: - if (st.in_full + st.in_part >= (u_quad_t)cpy_cnt) + if (st.in_full + st.in_part >= (uintmax_t)cpy_cnt) return; break; } ==== //depot/projects/ia64/bin/dd/dd.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/dd.h,v 1.17 2002/02/22 20:51:00 markm Exp $ + * $FreeBSD: src/bin/dd/dd.h,v 1.18 2003/02/27 18:04:54 markm Exp $ */ /* Input/output stream state. */ @@ -62,13 +62,13 @@ } IO; typedef struct { - u_quad_t in_full; /* # of full input blocks */ - u_quad_t in_part; /* # of partial input blocks */ - u_quad_t out_full; /* # of full output blocks */ - u_quad_t out_part; /* # of partial output blocks */ - u_quad_t trunc; /* # of truncated records */ - u_quad_t swab; /* # of odd-length swab blocks */ - u_quad_t bytes; /* # of bytes written */ + uintmax_t in_full; /* # of full input blocks */ + uintmax_t in_part; /* # of partial input blocks */ + uintmax_t out_full; /* # of full output blocks */ + uintmax_t out_part; /* # of partial output blocks */ + uintmax_t trunc; /* # of truncated records */ + uintmax_t swab; /* # of odd-length swab blocks */ + uintmax_t bytes; /* # of bytes written */ double start; /* start time of dd */ } STAT; ==== //depot/projects/ia64/bin/dd/extern.h#3 (text+ko) ==== @@ -35,11 +35,9 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/extern.h,v 1.12 2002/02/02 06:24:12 imp Exp $ + * $FreeBSD: src/bin/dd/extern.h,v 1.13 2003/02/27 18:04:54 markm Exp $ */ -#include <sys/cdefs.h> - void block(void); void block_close(void); void dd_out(int); @@ -57,10 +55,10 @@ extern IO in, out; extern STAT st; extern void (*cfunc)(void); -extern u_quad_t cpy_cnt; +extern uintmax_t cpy_cnt; extern size_t cbsz; extern u_int ddflags; -extern quad_t files_cnt; +extern uintmax_t files_cnt; extern const u_char *ctab; extern const u_char a2e_32V[], a2e_POSIX[]; extern const u_char e2a_32V[], e2a_POSIX[]; ==== //depot/projects/ia64/bin/dd/misc.c#5 (text+ko) ==== @@ -41,12 +41,13 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.25 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.26 2003/02/27 18:04:54 markm Exp $"); #include <sys/types.h> #include <sys/time.h> #include <errno.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -68,21 +69,21 @@ secs = 1e-6; /* Use snprintf(3) so that we don't reenter stdio(3). */ (void)snprintf(buf, sizeof(buf), - "%qu+%qu records in\n%qu+%qu records out\n", + "%ju+%ju records in\n%ju+%ju records out\n", st.in_full, st.in_part, st.out_full, st.out_part); (void)write(STDERR_FILENO, buf, strlen(buf)); if (st.swab) { - (void)snprintf(buf, sizeof(buf), "%qu odd length swab %s\n", + (void)snprintf(buf, sizeof(buf), "%ju odd length swab %s\n", st.swab, (st.swab == 1) ? "block" : "blocks"); (void)write(STDERR_FILENO, buf, strlen(buf)); } if (st.trunc) { - (void)snprintf(buf, sizeof(buf), "%qu truncated %s\n", + (void)snprintf(buf, sizeof(buf), "%ju truncated %s\n", st.trunc, (st.trunc == 1) ? "block" : "blocks"); (void)write(STDERR_FILENO, buf, strlen(buf)); } (void)snprintf(buf, sizeof(buf), - "%qu bytes transferred in %.6f secs (%.0f bytes/sec)\n", + "%ju bytes transferred in %.6f secs (%.0f bytes/sec)\n", st.bytes, secs, st.bytes / secs); (void)write(STDERR_FILENO, buf, strlen(buf)); } ==== //depot/projects/ia64/bin/dd/position.c#4 (text+ko) ==== @@ -41,13 +41,14 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/position.c,v 1.21 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/position.c,v 1.22 2003/02/27 18:04:54 markm Exp $"); #include <sys/types.h> #include <sys/mtio.h> #include <err.h> #include <errno.h> +#include <inttypes.h> #include <unistd.h> #include "dd.h" ==== //depot/projects/ia64/bin/sh/memalloc.c#5 (text+ko) ==== @@ -40,13 +40,13 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.23 2003/02/18 02:08:20 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.24 2003/02/24 08:07:05 marcel Exp $"); +#include <sys/param.h> #include "shell.h" #include "output.h" #include "memalloc.h" #include "error.h" -#include "machdep.h" #include "mystring.h" #include "expand.h" #include <stdlib.h> @@ -100,27 +100,47 @@ * to make this more efficient, and also to avoid all sorts of exception * handling code to handle interrupts in the middle of a parse. * - * The size 504 was chosen because the Ultrix malloc handles that size - * well. + * The size 496 was chosen because with 16-byte alignment the total size + * for the allocated block is 512. */ -#define MINSIZE 504 /* minimum size of a block */ +#define MINSIZE 496 /* minimum size of a block. */ struct stack_block { struct stack_block *prev; - char space[MINSIZE]; + /* Data follows */ }; +#define SPACE(sp) ((char*)(sp) + ALIGN(sizeof(struct stack_block))) -struct stack_block stackbase; -struct stack_block *stackp = &stackbase; +struct stack_block *stackp; struct stackmark *markp; -char *stacknxt = stackbase.space; -int stacknleft = MINSIZE; +char *stacknxt; +int stacknleft; int sstrnleft; int herefd = -1; +static void +stnewblock(int nbytes) +{ + struct stack_block *sp; + int allocsize; + + if (nbytes < MINSIZE) + nbytes = MINSIZE; + + allocsize = ALIGN(sizeof(struct stack_block)) + ALIGN(nbytes); + + INTOFF; + sp = ckmalloc(allocsize); + sp->prev = stackp; + stacknxt = SPACE(sp); + stacknleft = allocsize - (stacknxt - (char*)sp); + stackp = sp; + INTON; +} + pointer stalloc(int nbytes) @@ -128,22 +148,8 @@ char *p; nbytes = ALIGN(nbytes); - if (nbytes > stacknleft) { - int blocksize; - struct stack_block *sp; - - blocksize = nbytes; - if (blocksize < MINSIZE) - blocksize = MINSIZE; - INTOFF; - sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + - blocksize); - sp->prev = stackp; - stacknxt = sp->space; - stacknleft = blocksize; - stackp = sp; - INTON; - } + if (nbytes > stacknleft) + stnewblock(nbytes); p = stacknxt; stacknxt += nbytes; stacknleft -= nbytes; @@ -212,41 +218,40 @@ int oldlen; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302280316.h1S3GAvX088400>