Date: Mon, 5 May 2003 10:58:23 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30608 for review Message-ID: <200305051758.h45HwNvR092222@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30608 Change 30608 by peter@peter_daintree on 2003/05/05 10:57:23 IFC @30607 Affected files ... .. //depot/projects/hammer/Makefile.inc1#14 integrate .. //depot/projects/hammer/UPDATING#10 integrate .. //depot/projects/hammer/bin/df/df.c#6 integrate .. //depot/projects/hammer/bin/ed/ed.1#2 integrate .. //depot/projects/hammer/bin/ls/extern.h#4 integrate .. //depot/projects/hammer/bin/ls/ls.c#8 integrate .. //depot/projects/hammer/bin/ls/print.c#6 integrate .. //depot/projects/hammer/bin/ls/util.c#3 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#4 integrate .. //depot/projects/hammer/bin/pax/ar_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/cache.c#3 integrate .. //depot/projects/hammer/bin/pax/cpio.c#5 integrate .. //depot/projects/hammer/bin/pax/extern.h#2 integrate .. //depot/projects/hammer/bin/pax/gen_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/getoldopt.c#2 integrate .. //depot/projects/hammer/bin/pax/options.c#5 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.h#4 integrate .. //depot/projects/hammer/bin/ps/fmt.c#3 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#5 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#4 integrate .. //depot/projects/hammer/bin/stty/gfmt.c#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.c#2 integrate .. //depot/projects/hammer/crypto/telnet/libtelnet/enc_des.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/authenc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/commands.c#5 integrate .. //depot/projects/hammer/crypto/telnet/telnet/main.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/network.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/ring.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/sys_bsd.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/telnet.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/terminal.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/utilities.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/authenc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/slc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/state.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/termstat.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/utility.c#2 integrate .. //depot/projects/hammer/etc/devd.conf#2 integrate .. //depot/projects/hammer/etc/rc.d/abi#2 integrate .. //depot/projects/hammer/etc/rc.d/cron#2 integrate .. //depot/projects/hammer/etc/rc.d/devfs#4 integrate .. //depot/projects/hammer/etc/rc.d/jail#2 integrate .. //depot/projects/hammer/etc/rc.d/localdaemons#2 integrate .. //depot/projects/hammer/etc/rc.d/network3#3 integrate .. //depot/projects/hammer/etc/rc.d/securelevel#4 integrate .. //depot/projects/hammer/etc/rc.d/serial#3 integrate .. //depot/projects/hammer/etc/rc.d/virecover#4 integrate .. //depot/projects/hammer/etc/usbd.conf#2 integrate .. //depot/projects/hammer/games/caesar/caesar.c#2 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/hammer/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/hammer/games/pom/pom.c#2 integrate .. //depot/projects/hammer/games/random/random.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/notify.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/raw_popen.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/textbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#4 integrate .. //depot/projects/hammer/include/Makefile#10 integrate .. //depot/projects/hammer/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/mount.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nis.x#3 integrate .. //depot/projects/hammer/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/pmap_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rex.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/hammer/include/rpcsvc/sm_inter.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/spray.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/yp.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/yppasswd.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/hammer/kerberos5/Makefile#4 integrate .. //depot/projects/hammer/lib/Makefile#12 integrate .. //depot/projects/hammer/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/hammer/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/modules.inc#4 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#4 integrate .. //depot/projects/hammer/libexec/Makefile#10 integrate .. //depot/projects/hammer/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/malloc.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/hammer/libexec/ypxfr/yp_dbwrite.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_getmap.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_main.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfrd_getmap.c#2 integrate .. //depot/projects/hammer/release/Makefile#16 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/hammer/release/i386/dokern.sh#11 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#7 integrate .. //depot/projects/hammer/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/hammer/sbin/badsect/badsect.c#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/hammer/sbin/clri/clri.c#4 integrate .. //depot/projects/hammer/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/hammer/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.c#9 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#9 integrate .. //depot/projects/hammer/sbin/fsck_ffs/dir.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1b.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass3.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/utilities.c#2 integrate .. //depot/projects/hammer/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/hammer/sbin/kldload/kldload.c#3 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/hammer/sbin/md5/md5.c#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/hammer/sbin/mount/vfslist.c#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#7 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#7 integrate .. //depot/projects/hammer/sbin/nfsiod/nfsiod.c#3 integrate .. //depot/projects/hammer/sbin/ping/ping.c#10 integrate .. //depot/projects/hammer/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#4 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/hammer/sbin/spppcontrol/spppcontrol.c#2 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#5 integrate .. //depot/projects/hammer/sbin/swapon/swapon.c#3 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.c#5 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#5 integrate .. //depot/projects/hammer/sbin/vinum/list.c#5 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#4 integrate .. //depot/projects/hammer/secure/lib/Makefile#5 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#5 integrate .. //depot/projects/hammer/secure/libexec/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#5 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#5 integrate .. //depot/projects/hammer/share/dict/web2#3 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#11 integrate .. //depot/projects/hammer/share/man/man4/geom.4#3 integrate .. //depot/projects/hammer/share/man/man4/rue.4#1 branch .. //depot/projects/hammer/share/man/man5/make.conf.5#7 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/hammer/share/man/man7/release.7#8 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#7 integrate .. //depot/projects/hammer/share/mk/bsd.README#3 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#4 integrate .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/hammer/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/hammer/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/boot/common/help.common#4 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#15 integrate .. //depot/projects/hammer/sys/conf/files#18 integrate .. //depot/projects/hammer/sys/conf/kern.mk#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.reg#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#10 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#9 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#8 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#12 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/hammer/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#3 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#7 integrate .. //depot/projects/hammer/sys/geom/geom.h#15 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#9 integrate .. //depot/projects/hammer/sys/i386/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.s#6 integrate .. //depot/projects/hammer/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/hammer/sys/kern/md5c.c#3 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/hammer/sys/modules/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/mii/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/rue/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_atm.h#4 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/hammer/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/hammer/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/hammer/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/hammer/sys/sys/limits.h#4 integrate .. //depot/projects/hammer/sys/sys/soundcard.h#4 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/hammer/usr.bin/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.c#4 integrate .. //depot/projects/hammer/usr.bin/chpass/table.c#2 integrate .. //depot/projects/hammer/usr.bin/cut/cut.1#3 integrate .. //depot/projects/hammer/usr.bin/nohup/nohup.c#2 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/hammer/usr.bin/uudecode/uudecode.c#7 integrate .. //depot/projects/hammer/usr.bin/uuencode/uuencode.c#3 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#7 integrate .. //depot/projects/hammer/usr.bin/xlint/xlint/xlint.c#3 integrate .. //depot/projects/hammer/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/hammer/usr.sbin/ancontrol/ancontrol.c#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/hammer/usr.sbin/cdcontrol/cdcontrol.c#6 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.c#4 integrate .. //depot/projects/hammer/usr.sbin/chroot/chroot.c#2 integrate .. //depot/projects/hammer/usr.sbin/dev_mkdb/dev_mkdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/compare.c#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/excludes.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/misc.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.c#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/spec.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/verify.c#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/hammer/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#4 integrate .. //depot/projects/hammer/usr.sbin/quot/quot.c#5 integrate .. //depot/projects/hammer/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/hammer/usr.sbin/rarpd/rarpd.c#3 integrate .. //depot/projects/hammer/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/hammer/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbdelete.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/ypupdated_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/usrdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/slstat/slstat.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/hammer/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/hammer/usr.sbin/usbd/usbd.8#3 integrate .. //depot/projects/hammer/usr.sbin/vipw/vipw.c#3 integrate .. //depot/projects/hammer/usr.sbin/watch/watch.c#4 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#5 integrate .. //depot/projects/hammer/usr.sbin/yp_mkdb/yp_mkdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypbind/yp_ping.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypbind/ypbind.c#2 integrate .. //depot/projects/hammer/usr.sbin/yppoll/yppoll.c#2 integrate .. //depot/projects/hammer/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_dblookup.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_dnslookup.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_error.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_svc_udp.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#14 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/hammer/UPDATING#10 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/hammer/bin/df/df.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -57,6 +57,7 @@ #include <ufs/ufs/ufsmount.h> #include <err.h> #include <math.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/hammer/bin/ed/ed.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/hammer/bin/ls/extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); +void printcol(const DISPLAY *); +void printlong(const DISPLAY *); int printname(const char *); -void printscol(DISPLAY *); -void printstream(DISPLAY *); +void printscol(const DISPLAY *); +void printstream(const DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); @@ -62,3 +62,4 @@ extern char *attrs_off; extern char *enter_bold; #endif +extern int termwidth; ==== //depot/projects/hammer/bin/ls/ls.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -58,6 +58,7 @@ #include <errno.h> #include <fts.h> #include <grp.h> +#include <inttypes.h> #include <limits.h> #include <locale.h> #include <pwd.h> @@ -80,12 +81,26 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *, int); -static u_quad_t makenines(u_long); +/* + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * into a number that wide in decimal. + * XXX: Overflows are not considered. + */ +#define MAKENINES(n) \ + do { \ + intmax_t i; \ + \ + /* Use a loop as all values of n are small. */ \ + for (i = 1; n > 0; i *= 10) \ + n--; \ + n = i - 1; \ + } while(0) + +static void display(const FTSENT *, FTSENT *, int); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); -static void (*printfcn)(DISPLAY *); +static void (*printfcn)(const DISPLAY *); static int (*sortfcn)(const FTSENT *, const FTSENT *); long blocksize; /* block size units */ @@ -114,7 +129,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, separate with commas */ +static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -473,10 +488,10 @@ */ if (output) { putchar('\n'); - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); } else if (argc > 1) { - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); output = 1; } @@ -499,14 +514,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list, int options) +display(const FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + long maxblock; + u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; @@ -542,9 +558,10 @@ int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ - jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); + jinitmax = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) err(1, "malloc"); + initmax2 = jinitmax; if (*initmax == ':') strcpy(initmax2, "0:"), initmax2 += 2; else @@ -563,7 +580,7 @@ strcpy(initmax2, "0"); ninitmax = sscanf(jinitmax, - " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ", + " %lu : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr); f_notabs = 1; @@ -603,10 +620,10 @@ default: break; } - maxinode = makenines(maxinode); - maxblock = makenines(maxblock); - maxnlink = makenines(maxnlink); - maxsize = makenines(maxsize); + MAKENINES(maxinode); + MAKENINES(maxblock); + MAKENINES(maxnlink); + MAKENINES(maxsize); } bcfile = 0; flags = NULL; @@ -787,7 +804,7 @@ d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); - (void)snprintf(buf, sizeof(buf), "%qu", maxsize); + (void)snprintf(buf, sizeof(buf), "%ju", maxsize); d.s_size = strlen(buf); d.s_user = maxuser; } @@ -829,22 +846,3 @@ } return (sortfcn(*a, *b)); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305051758.h45HwNvR092222>