From owner-p4-projects Thu Oct 3 16:25:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 209A237B404; Thu, 3 Oct 2002 16:25:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98D5837B401 for ; Thu, 3 Oct 2002 16:25:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4972843E4A for ; Thu, 3 Oct 2002 16:25:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g93NPVCo069286 for ; Thu, 3 Oct 2002 16:25:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g93NPRvZ069233 for perforce@freebsd.org; Thu, 3 Oct 2002 16:25:27 -0700 (PDT) Date: Thu, 3 Oct 2002 16:25:27 -0700 (PDT) Message-Id: <200210032325.g93NPRvZ069233@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18618 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18618 Change 18618 by rwatson@rwatson_curry on 2002/10/03 16:24:46 Integ MAC tree from the main FreeBSD tree: loop back more MAC changes (pipe locking, etc); also, geom changes, DHCP upgrades, KSE changes, etc. Prep for more feeding of MAC stuff back into the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/main.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/expat/COPYING#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/Changes#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/MANIFEST#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/configure#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/configure.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/doc/reference.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/doc/style.css#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/doc/xmlwf.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/doc/xmlwf.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/examples/elements.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/examples/outline.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/expat_config.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/ascii.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/asciitab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/expat.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/iasciitab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/internal.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/latin1tab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/nametab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/utf8tab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/winconfig.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmlparse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmlrole.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmlrole.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmltok.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmltok.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmltok_impl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmltok_impl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/lib/xmltok_ns.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/tests/README.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/tests/chardata.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/tests/chardata.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/tests/runtests.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/tests/xmltest.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/codepage.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/codepage.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/ct.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/filemap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/readfilemap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/unixfilemap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/win32filemap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlfile.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlfile.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlmime.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlmime.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmltchar.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlurl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlwf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/expat/xmlwf/xmlwin32url.cxx#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/RELNOTES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient-script.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/bpf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-eval.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-options.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/discover.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/parse.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/print.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/cf/freebsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/site.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/version.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/convert.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/src/buffer.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/changepw.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/telnet/telnet/commands.c#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc#20 integrate .. //depot/projects/trustedbsd/mac/etc/rc.atm#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/atm1#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/diskless#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syslogd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.diskless2#28 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/fr.ISO8859-1#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/tar.1#3 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/include/math.h#3 delete .. //depot/projects/trustedbsd/mac/include/regex.h#3 integrate .. //depot/projects/trustedbsd/mac/include/rpcsvc/rstat.x#2 integrate .. //depot/projects/trustedbsd/mac/include/search.h#5 integrate .. //depot/projects/trustedbsd/mac/include/signal.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/ioctl_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/tolower.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/toupper.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/towupper.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcwidth.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/regcomp.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/regerror.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/regex.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tfind.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tsearch.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcstok.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigaction.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigaltstack.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sigwait.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_init.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_kern.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sigaction.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sigwait.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/rules.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_disk.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libexpat/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libexpat/expat_config.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libfetch/http.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/sigwait.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigwait.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librpcsvc/rstat.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#5 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/libexec/rpc.rstatd/rstat_proc.c#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#33 integrate .. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/ilmid/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/ilmid/ilmid.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/main.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#10 integrate .. //depot/projects/trustedbsd/mac/share/examples/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/diskless.8#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/driver.9#2 integrate .. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#13 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/boot2.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/kgzldr/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/kgzldr/sio.s#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_psdev.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_signal.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#20 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#51 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#30 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_command.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7770.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-dma.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/hea_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/hea_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_freebsd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/idt/idt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/idt/idt_harp.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/idt/idt_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/idt/idtreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/idt/idtvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcic/i82365.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/randomdev.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohcivar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhcivar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ctl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_aes.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_int.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_kern.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/OsdEnvironment.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_signal.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/_types.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pc/msdos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pcb.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/proc.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/matcd/matcd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/mcd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcaudio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/scd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_sysent.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/syscalls.master#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/isa/fd.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/isa/isa_common.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_idle.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kthread.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#290 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_diskmbr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_diskslice.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prof.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#86 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/sys/modules/idt/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/if_gre/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_ncp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/diskslice_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/posix4/sched.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/param.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/bus_private.h#2 delete .. //depot/projects/trustedbsd/mac/sys/sys/disklabel.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/diskmbr.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/diskpc98.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/filedesc.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kse.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kthread.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#170 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#131 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/resourcevar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#35 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#34 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#36 edit .. //depot/projects/trustedbsd/mac/sys/sys/types.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/user.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_meter.c#7 integrate .. //depot/projects/trustedbsd/mac/tools/KSE/ksetest/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/KSE/ksetest/kse_threads_test.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/tools/upgrade/move_aout_libs.sh#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/make.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/parse.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ncal/ncal.1#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ncal/ncal.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/telnet/commands.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/telnet/telnet.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/top/machine.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xmlwf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/crontab/crontab.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.266 2002/09/26 04:40:54 phk Exp $ +# $FreeBSD: src/Makefile,v 1.268 2002/10/02 13:52:36 phk Exp $ # # The user-driven targets are: # @@ -221,19 +221,22 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for arch in i386 sparc64 alpha ia64 +.for arch in i386 sparc64 alpha ia64 @printf ">> ${arch} started on `LC_ALL=C date`\n" -cd ${.CURDIR} && make ${JFLAG} buildworld TARGET_ARCH=${arch} \ __MAKE_CONF=/dev/null \ > _.${arch}.buildworld 2>&1 @printf ">> ${arch} buildworld ended on `LC_ALL=C date`\n" -.if exists(sys/${arch}/conf/NOTES) - cd ${.CURDIR}/sys/${arch}/conf && make LINT \ +.if exists(${.CURDIR}/sys/${arch}/conf/NOTES) + -cd ${.CURDIR}/sys/${arch}/conf && make LINT \ > _.${arch}.makeLINT 2>&1 .endif cd ${.CURDIR} && make buildkernels TARGET_ARCH=${arch} JFLAG="${JFLAG}" @printf ">> ${arch} ended on `LC_ALL=C date`\n" .endfor + -cd ${.CURDIR} && make buildworld TARGET=pc98 TARGET_ARCH=i386 \ + __MAKE_CONF=/dev/null \ + > _.pc98.buildworld 2>&1 @echo "--------------------------------------------------------------" @printf ">>> make universe completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" @echo "--------------------------------------------------------------" ==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.32 2002/09/28 23:05:58 trhodes Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.33 2002/10/01 20:32:59 trhodes Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -163,7 +163,7 @@ .Pp For example, the absolute mode that permits read, write and execute by the owner, read and execute by group members, read and execute by -others, and no set-uid or set-gid behavior is 755 +others, and no set-uid or set-gid behaviour is 755 (400+200+100+040+010+004+001). .Pp The symbolic mode is described by the following grammar: ==== //depot/projects/trustedbsd/mac/bin/ps/extern.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.26 2002/09/17 02:52:44 jmallett Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.27 2002/10/02 20:32:50 jhb Exp $ */ struct kinfo; @@ -59,7 +59,7 @@ void longtname(KINFO *, VARENT *); void lstarted(KINFO *, VARENT *); void maxrss(KINFO *, VARENT *); -void mtxname(KINFO *, VARENT *); +void lockname(KINFO *, VARENT *); void mwchan(KINFO *, VARENT *); void pagein(KINFO *, VARENT *); void parsefmt(const char *); ==== //depot/projects/trustedbsd/mac/bin/ps/keyword.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.56 2002/09/27 01:44:30 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.57 2002/10/02 20:32:50 jhb Exp $"); #include #include @@ -110,7 +110,7 @@ LONG, "ld", 0}, {"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld", 0}, - {"mtxname", "MUTEX", NULL, LJUST, mtxname, NULL, 6, 0, CHAR, NULL, + {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, 0}, {"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0}, {"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#12 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.73 2002/09/17 17:13:52 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.74 2002/10/02 20:32:50 jhb Exp $"); #include #include @@ -227,8 +227,8 @@ *cp = 'W'; break; - case SMTX: - *cp = 'M'; + case SLOCK: + *cp = 'L'; break; case SZOMB: @@ -420,15 +420,15 @@ } void -mtxname(KINFO *k, VARENT *ve) +lockname(KINFO *k, VARENT *ve) { VAR *v; v = ve->var; - if (k->ki_p->ki_kiflag & KI_MTXBLOCK) { - if (k->ki_p->ki_mtxname[0] != 0) + if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) { + if (k->ki_p->ki_lockname[0] != 0) (void)printf("%-*.*s", v->width, v->width, - k->ki_p->ki_mtxname); + k->ki_p->ki_lockname); else (void)printf("%-*s", v->width, "???"); } else @@ -466,10 +466,10 @@ else (void)printf("%-*lx", v->width, (long)k->ki_p->ki_wchan); - } else if (k->ki_p->ki_kiflag & KI_MTXBLOCK) { - if (k->ki_p->ki_mtxname[0]) { + } else if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) { + if (k->ki_p->ki_lockname[0]) { (void)printf("%-*.*s", v->width, v->width, - k->ki_p->ki_mtxname); + k->ki_p->ki_lockname); } else { (void)printf("%-*s", v->width, "???"); } ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.57 2002/08/21 17:32:40 trhodes Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.58 2002/10/02 20:32:50 jhb Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -191,7 +191,7 @@ .Pp A complete list of the available keywords are listed below. Some of these keywords are further specified as follows: -.Bl -tag -width mtxname +.Bl -tag -width lockname .It %cpu The cpu utilization of the process; this is a decaying average over up to a minute of previous (real) time. @@ -232,17 +232,15 @@ .It lstart The exact time the command started, using the ``%c'' format described in .Xr strftime 3 . -.It mtxname -The name of the -.Xr mutex 9 -that the process is currently blocked on. +.It lockname +The name of the lock that the process is currently blocked on. If the name is invalid or unknown, then .Dq ???\& is displayed. .It mwchan -The event name if the process is blocked normally, or the mutex name if -the process is blocked on a mutex. -See the wchan and mtxname keywords +The event name if the process is blocked normally, or the lock name if +the process is blocked on a lock. +See the wchan and lockname keywords for details. .It nice The process scheduling increment (see @@ -272,8 +270,8 @@ .Xr jail 2 . The hostname of the prison can be found in .Ql Li /proc//status . -.It M -Marks a process that is waiting to acquire a mutex. +.It L +Marks a process that is waiting to acquire a lock. .It R Marks a runnable process. .It S @@ -408,11 +406,10 @@ total messages received (reads from pipes/sockets) .It msgsnd total messages sent (writes on pipes/sockets) -.It mtxname -.Xr mutex 9 -currently blocked on (as a symbolic name) +.It lockname +lock currently blocked on (as a symbolic name) .It mwchan -wait channel or mutex currently blocked on +wait channel or lock currently blocked on .It nice nice value (alias ni) .It nivcsw ==== //depot/projects/trustedbsd/mac/bin/sh/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.35 2002/02/04 02:49:19 kris Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.38 2002/10/01 12:12:45 mux Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -21,8 +21,6 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 -WARNS= 0 -WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../../bin/test ==== //depot/projects/trustedbsd/mac/bin/sh/exec.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.21 2002/09/29 11:37:39 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.22 2002/10/01 11:48:18 tjr Exp $"); #include #include @@ -144,6 +144,8 @@ exerrno = 2; break; } + if (e == ENOENT || e == ENOTDIR) + exerror(EXEXEC, "%s: not found", argv[0]); exerror(EXEXEC, "%s: %s", argv[0], strerror(e)); } @@ -419,8 +421,12 @@ /* We failed. If there was an entry for this command, delete it */ if (cmdp) delete_cmd_entry(); - if (printerr) - outfmt(out2, "%s: %s\n", name, strerror(e)); + if (printerr) { + if (e == ENOENT || e == ENOTDIR) + outfmt(out2, "%s: not found\n", name); + else + outfmt(out2, "%s: %s\n", name, strerror(e)); + } entry->cmdtype = CMDUNKNOWN; return; ==== //depot/projects/trustedbsd/mac/bin/sh/jobs.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.58 2002/09/11 16:38:33 nectar Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.59 2002/10/01 08:40:07 mux Exp $"); #include #include @@ -221,7 +221,7 @@ continue; restartjob(jp); jp->foreground = 0; - fmtstr(s, 64, "[%d] ", jp - jobtab + 1); + fmtstr(s, 64, "[%td] ", jp - jobtab + 1); out1str(s); out1str(jp->ps[0].cmd); out1c('\n'); ==== //depot/projects/trustedbsd/mac/bin/sh/main.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.23 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.25 2002/10/01 01:30:33 tjr Exp $"); #include #include @@ -77,14 +77,8 @@ #include "exec.h" #include "cd.h" -#define PROFILE 0 - int rootpid; int rootshell; -#if PROFILE -short profile_buf[16384]; -extern int etext(); -#endif STATIC void read_profile(char *); STATIC char *find_dot_file(char *); @@ -105,9 +99,6 @@ volatile int state; char *shinit; -#if PROFILE - monitor(4, etext, profile_buf, sizeof profile_buf, 50); -#endif (void) setlocale(LC_ALL, ""); state = 0; if (setjmp(jmploc.loc)) { @@ -141,11 +132,7 @@ exitshell(exitstatus); } reset(); - if (exception == EXINT -#if ATTY - && (! attyset() || equal(termval(), "emacs")) -#endif - ) { + if (exception == EXINT) { out2c('\n'); flushout(&errout); } @@ -199,9 +186,6 @@ state4: /* XXX ??? - why isn't this before the "if" statement */ cmdloop(1); } -#if PROFILE - monitor(0); -#endif exitshell(exitstatus); /*NOTREACHED*/ return 0; ==== //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.27 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.29 2002/10/01 11:44:38 mux Exp $"); /* * Miscellaneous builtins. @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -352,7 +353,7 @@ ulimitcmd(int argc __unused, char **argv __unused) { int c; - quad_t val = 0; + rlim_t val = 0; enum { SOFT = 0x1, HARD = 0x2 } how = SOFT | HARD; const struct limits *l; @@ -379,27 +380,27 @@ for (l = limits; l->name && l->option != what; l++) ; if (!l->name) - error("ulimit: internal error (%c)", what); + error("internal error (%c)", what); set = *argptr ? 1 : 0; if (set) { char *p = *argptr; if (all || argptr[1]) - error("ulimit: too many arguments"); + error("too many arguments"); if (strcmp(p, "unlimited") == 0) val = RLIM_INFINITY; else { - val = (quad_t) 0; + val = 0; while ((c = *p++) >= '0' && c <= '9') { val = (val * 10) + (long)(c - '0'); - if (val < (quad_t) 0) + if (val < 0) break; } if (c) - error("ulimit: bad number"); + error("bad number"); val *= l->factor; } } @@ -407,7 +408,7 @@ for (l = limits; l->name; l++) { char optbuf[40]; if (getrlimit(l->cmd, &limit) < 0) - error("ulimit: can't get limit: %s", strerror(errno)); + error("can't get limit: %s", strerror(errno)); if (how & SOFT) val = limit.rlim_cur; else if (how & HARD) @@ -425,21 +426,21 @@ else { val /= l->factor; - out1fmt("%qd\n", (quad_t) val); + out1fmt("%jd\n", (intmax_t)val); } } return 0; } if (getrlimit(l->cmd, &limit) < 0) - error("ulimit: can't get limit: %s", strerror(errno)); + error("can't get limit: %s", strerror(errno)); if (set) { if (how & SOFT) limit.rlim_cur = val; if (how & HARD) limit.rlim_max = val; if (setrlimit(l->cmd, &limit) < 0) - error("ulimit: bad limit: %s", strerror(errno)); + error("bad limit: %s", strerror(errno)); } else { if (how & SOFT) val = limit.rlim_cur; @@ -451,7 +452,7 @@ else { val /= l->factor; - out1fmt("%qd\n", (quad_t) val); + out1fmt("%jd\n", (intmax_t)val); } } return 0; ==== //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.19 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.21 2002/10/02 09:57:54 tjr Exp $"); /* * This program creates syntax.h and syntax.c. @@ -393,7 +393,7 @@ for (p = digit ; *p && *p != i ; p++); if (*p == '\0') p = digit; - fprintf(cfile, " %d,\n", p - digit); + fprintf(cfile, " %d,\n", (int)(p - digit)); } fputs("};\n", cfile); } ==== //depot/projects/trustedbsd/mac/bin/sh/output.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.15 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.17 2002/10/01 13:41:13 tjr Exp $"); /* * Shell output routines. We use our own output routines because: @@ -50,12 +50,8 @@ * save the output of the command in a region obtained * via malloc, rather than doing a fork and reading the * output of the command via a pipe. - * Our output routines may be smaller than the stdio routines. */ -#include /* quad_t */ -#include - #include /* defines BUFSIZ */ #include #include @@ -76,6 +72,7 @@ #define MEM_OUT -3 /* output to dynamically allocated memory */ #define OUTPUT_ERR 01 /* error occurred on output */ +static int doformat_wr(void *, const char *, int); struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0}; struct output errout = {NULL, 0, NULL, 100, 2, 0}; @@ -268,202 +265,46 @@ va_list ap; struct output strout; - va_start(ap, fmt); strout.nextc = outbuf; strout.nleft = length; strout.fd = BLOCK_OUT; strout.flags = 0; + va_start(ap, fmt); doformat(&strout, fmt, ap); + va_end(ap); outc('\0', &strout); if (strout.flags & OUTPUT_ERR) outbuf[length - 1] = '\0'; } -/* - * Formatted output. This routine handles a subset of the printf formats: - * - Formats supported: d, u, o, X, s, and c. - * - The x format is also accepted but is treated like X. - * - The l and q modifiers are accepted. - * - The - and # flags are accepted; # only works with the o format. - * - Width and precision may be specified with any format except c. - * - An * may be given for the width or precision. - * - The obsolete practice of preceding the width with a zero to get - * zero padding is not supported; use the precision field. - * - A % may be printed by writing %% in the format string. - */ +static int +doformat_wr(void *cookie, const char *buf, int len) +{ + struct output *o; + int origlen; + unsigned char c; -#define TEMPSIZE 24 + o = (struct output *)cookie; + origlen = len; + while (len-- != 0) { + c = (unsigned char)*buf++; + outc(c, o); + } -static const char digit[] = "0123456789ABCDEF"; - + return (origlen); +} void doformat(struct output *dest, const char *f, va_list ap) { - char c; - char temp[TEMPSIZE]; - int flushleft; - int sharp; - int width; - int prec; - int islong; - int isquad; - char *p; - int sign; - quad_t l; - u_quad_t num; - unsigned base; - int len; - int size; - int pad; + FILE *fp; - while ((c = *f++) != '\0') { - if (c != '%') { - outc(c, dest); - continue; - } - flushleft = 0; - sharp = 0; - width = 0; - prec = -1; - islong = 0; - isquad = 0; - for (;;) { - if (*f == '-') - flushleft++; - else if (*f == '#') >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message