Date: Sat, 3 May 2003 14:56:29 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30478 for review Message-ID: <200305032156.h43LuTgj078318@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30478 Change 30478 by marcel@marcel_pluto1 on 2003/05/03 14:55:34 IFC @30477 Affected files ... .. //depot/projects/ia64/UPDATING#39 integrate .. //depot/projects/ia64/bin/csh/Makefile#6 integrate .. //depot/projects/ia64/bin/df/df.c#14 integrate .. //depot/projects/ia64/bin/ed/ed.1#5 integrate .. //depot/projects/ia64/bin/ls/extern.h#6 integrate .. //depot/projects/ia64/bin/ls/ls.c#17 integrate .. //depot/projects/ia64/bin/ls/print.c#12 integrate .. //depot/projects/ia64/bin/ls/util.c#6 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#6 integrate .. //depot/projects/ia64/bin/pax/ar_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/cache.c#5 integrate .. //depot/projects/ia64/bin/pax/cpio.c#6 integrate .. //depot/projects/ia64/bin/pax/extern.h#3 integrate .. //depot/projects/ia64/bin/pax/gen_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/getoldopt.c#4 integrate .. //depot/projects/ia64/bin/pax/options.c#8 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#7 integrate .. //depot/projects/ia64/bin/pax/pax.c#6 integrate .. //depot/projects/ia64/bin/pax/pax.h#5 integrate .. //depot/projects/ia64/bin/pax/tar.c#6 integrate .. //depot/projects/ia64/bin/ps/Makefile#8 integrate .. //depot/projects/ia64/bin/ps/fmt.c#8 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#10 integrate .. //depot/projects/ia64/bin/sh/Makefile#7 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#6 integrate .. //depot/projects/ia64/bin/stty/gfmt.c#4 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#14 integrate .. //depot/projects/ia64/contrib/openpam/README#9 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#8 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#15 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#11 integrate .. //depot/projects/ia64/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/ia64/contrib/texinfo/COPYING#3 integrate .. //depot/projects/ia64/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/ia64/contrib/texinfo/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/texinfo/INSTALL#3 integrate .. //depot/projects/ia64/contrib/texinfo/INTRODUCTION#4 integrate .. //depot/projects/ia64/contrib/texinfo/NEWS#4 integrate .. //depot/projects/ia64/contrib/texinfo/README#4 integrate .. //depot/projects/ia64/contrib/texinfo/TODO#4 integrate .. //depot/projects/ia64/contrib/texinfo/config.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/config.h.in#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/README#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/help2man#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info-stnd.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/install-info.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/makeinfo.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texindex.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texinfo.txi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version-stnd.texi#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/display.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/doc.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/doc.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/echo-area.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/filesys.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/funs.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/indices.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info-utils.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/info.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infodoc.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infomap.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infomap.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/m-x.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/man.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodes.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/search.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/session.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/session.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/termdep.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/terminal.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/terminal.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/variables.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/window.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt1.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/system.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/ia64/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/xstrdup.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/README#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/defun.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/ia64/contrib/texinfo/makeinfo/files.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/files.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/footnote.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/index.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/lang.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/lang.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/macro.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/multi.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/node.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/node.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/sectioning.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.dtd#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.xsl#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/toc.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/toc.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/util/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/util/install-info.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/util/texindex.c#4 integrate .. //depot/projects/ia64/etc/Makefile#28 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#31 integrate .. //depot/projects/ia64/etc/devd.conf#3 integrate .. //depot/projects/ia64/etc/etc.alpha/rc.alpha#3 delete .. //depot/projects/ia64/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/ia64/etc/etc.i386/rc.i386#3 delete .. //depot/projects/ia64/etc/etc.ia64/rc.ia64#3 delete .. //depot/projects/ia64/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/ia64/etc/rc#26 integrate .. //depot/projects/ia64/etc/rc.atm#5 delete .. //depot/projects/ia64/etc/rc.d/apm#2 integrate .. //depot/projects/ia64/etc/rc.d/apmd#6 integrate .. //depot/projects/ia64/etc/rc.d/archdep#4 integrate .. //depot/projects/ia64/etc/rc.d/devfs#3 integrate .. //depot/projects/ia64/etc/rc.devfs#6 delete .. //depot/projects/ia64/etc/rc.diskless1#8 delete .. //depot/projects/ia64/etc/rc.diskless2#7 delete .. //depot/projects/ia64/etc/rc.isdn#3 delete .. //depot/projects/ia64/etc/rc.network#23 delete .. //depot/projects/ia64/etc/rc.network6#7 delete .. //depot/projects/ia64/etc/rc.pccard#3 delete .. //depot/projects/ia64/etc/rc.sendmail#2 integrate .. //depot/projects/ia64/etc/rc.serial#4 delete .. //depot/projects/ia64/etc/rc.syscons#5 delete .. //depot/projects/ia64/etc/rc.sysctl#4 delete .. //depot/projects/ia64/etc/usbd.conf#4 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/notify.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/raw_popen.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/textbox.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/include/config.h#4 integrate .. //depot/projects/ia64/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/ia64/gnu/usr.bin/texinfo/makeinfo/Makefile#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate .. //depot/projects/ia64/release/i386/dokern.sh#16 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#14 integrate .. //depot/projects/ia64/sbin/adjkerntz/adjkerntz.c#3 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#11 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/ia64/sbin/badsect/badsect.c#10 integrate .. //depot/projects/ia64/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/ia64/sbin/camcontrol/Makefile#5 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#10 integrate .. //depot/projects/ia64/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/ia64/sbin/camcontrol/util.c#3 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#6 integrate .. //depot/projects/ia64/sbin/clri/clri.c#10 integrate .. //depot/projects/ia64/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/ia64/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#8 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#26 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.c#7 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#17 integrate .. //depot/projects/ia64/sbin/fsck_ffs/dir.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/inode.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1.c#9 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1b.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass3.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass4.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/setup.c#14 integrate .. //depot/projects/ia64/sbin/fsck_ffs/utilities.c#5 integrate .. //depot/projects/ia64/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/ia64/sbin/kldload/kldload.c#3 integrate .. //depot/projects/ia64/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/ia64/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/ia64/sbin/md5/md5.c#5 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/ia64/sbin/mount/vfslist.c#2 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#12 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#23 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.c#7 integrate .. //depot/projects/ia64/sbin/ping/ping.c#22 integrate .. //depot/projects/ia64/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#10 integrate .. //depot/projects/ia64/sbin/reboot/reboot.c#6 integrate .. //depot/projects/ia64/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/ia64/sbin/spppcontrol/spppcontrol.c#3 integrate .. //depot/projects/ia64/sbin/sunlabel/Makefile#6 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#9 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#13 integrate .. //depot/projects/ia64/share/man/man4/Makefile#42 integrate .. //depot/projects/ia64/share/man/man4/rue.4#1 branch .. //depot/projects/ia64/share/misc/bsd-family-tree#12 integrate .. //depot/projects/ia64/share/mk/bsd.README#5 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/support.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/support.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/vector.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/vector.s#2 delete .. //depot/projects/ia64/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#43 integrate .. //depot/projects/ia64/sys/conf/NOTES#48 integrate .. //depot/projects/ia64/sys/conf/files#77 integrate .. //depot/projects/ia64/sys/conf/files.amd64#3 integrate .. //depot/projects/ia64/sys/conf/kern.mk#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#35 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.h#8 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/ia64/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#21 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#13 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#30 integrate .. //depot/projects/ia64/sys/dev/md/md.c#27 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#7 integrate .. //depot/projects/ia64/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/ia64/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/ia64/sys/dev/snc/dp83932subr.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/ia64/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/ia64/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#32 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#32 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#13 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumstate.c#3 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#13 integrate .. //depot/projects/ia64/sys/geom/geom.h#29 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#32 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#34 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#31 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_mirror.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_slice.h#13 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#66 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#10 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#23 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/ia64/sys/modules/Makefile#47 integrate .. //depot/projects/ia64/sys/modules/mii/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/rue/Makefile#1 branch .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#21 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#15 integrate .. //depot/projects/ia64/sys/sys/ata.h#8 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#25 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#22 integrate .. //depot/projects/ia64/sys/sys/param.h#33 integrate .. //depot/projects/ia64/sys/sys/proc.h#63 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#50 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.h#9 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.c#9 integrate .. //depot/projects/ia64/usr.bin/chpass/table.c#4 integrate .. //depot/projects/ia64/usr.bin/cut/cut.1#7 integrate .. //depot/projects/ia64/usr.bin/nohup/nohup.c#5 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#11 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#16 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.c#8 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.c#24 integrate .. //depot/projects/ia64/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#11 integrate .. //depot/projects/ia64/usr.sbin/accton/accton.c#3 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#12 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.c#5 integrate .. //depot/projects/ia64/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/ia64/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#9 integrate .. //depot/projects/ia64/usr.sbin/chroot/chroot.c#4 integrate .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.c#6 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#7 integrate .. //depot/projects/ia64/usr.sbin/fdcontrol/fdcontrol.c#3 integrate .. //depot/projects/ia64/usr.sbin/kbdcontrol/kbdcontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/ia64/usr.sbin/lptcontrol/lptcontrol.c#3 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#10 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#14 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/ia64/usr.sbin/mtree/compare.c#4 integrate .. //depot/projects/ia64/usr.sbin/mtree/create.c#6 integrate .. //depot/projects/ia64/usr.sbin/mtree/excludes.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/mtree.c#5 integrate .. //depot/projects/ia64/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/verify.c#4 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#18 integrate .. //depot/projects/ia64/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#11 integrate .. //depot/projects/ia64/usr.sbin/pwd_mkdb/pwd_mkdb.c#6 integrate .. //depot/projects/ia64/usr.sbin/quot/quot.c#8 integrate .. //depot/projects/ia64/usr.sbin/quotaon/quotaon.c#4 integrate .. //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#5 integrate .. //depot/projects/ia64/usr.sbin/repquota/repquota.c#6 integrate .. //depot/projects/ia64/usr.sbin/rmt/rmt.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#6 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#5 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/yp_dbdelete.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/yp_dbupdate.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/ypupdated_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/ypupdated_server.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#4 integrate .. //depot/projects/ia64/usr.sbin/sa/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/sa/pdb.c#3 integrate .. //depot/projects/ia64/usr.sbin/sa/usrdb.c#4 integrate .. //depot/projects/ia64/usr.sbin/slstat/slstat.c#3 integrate .. //depot/projects/ia64/usr.sbin/trpt/trpt.c#4 integrate .. //depot/projects/ia64/usr.sbin/vipw/vipw.c#5 integrate .. //depot/projects/ia64/usr.sbin/watch/watch.c#8 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#12 integrate .. //depot/projects/ia64/usr.sbin/yp_mkdb/yp_mkdb.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypbind/yp_ping.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypbind/ypbind.c#4 integrate .. //depot/projects/ia64/usr.sbin/yppoll/yppoll.c#3 integrate .. //depot/projects/ia64/usr.sbin/yppush/yppush_main.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_access.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_dblookup.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_dnslookup.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_error.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_server.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_svc_udp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypset/ypset.c#4 integrate Differences ... ==== //depot/projects/ia64/UPDATING#39 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + 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 @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/ia64/bin/csh/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/ia64/bin/df/df.c#14 (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/ia64/bin/ed/ed.1#5 (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/ia64/bin/ls/extern.h#6 (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/ia64/bin/ls/ls.c#17 (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) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305032156.h43LuTgj078318>