Date: Sun, 11 Nov 2007 13:49:10 GMT From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 128931 for review Message-ID: <200711111349.lABDnAHu033909@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=128931 Change 128931 by gonzo@gonzo_jeeves on 2007/11/11 13:48:35 IFC Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/mips2/src/bin/ps/ps.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/mips2/src/contrib/libreadline/complete.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/display.c#4 integrate .. //depot/projects/mips2/src/contrib/libreadline/input.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/misc.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/readline.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/text.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/mips2/src/etc/Makefile#5 integrate .. //depot/projects/mips2/src/etc/defaults/Makefile#2 integrate .. //depot/projects/mips2/src/etc/defaults/pccard.conf#2 delete .. //depot/projects/mips2/src/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/mips2/src/etc/pf.conf#2 delete .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/mips2/src/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/mips2/src/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/mips2/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/mips2/src/release/Makefile#6 integrate .. //depot/projects/mips2/src/release/scripts/package-split.py#3 integrate .. //depot/projects/mips2/src/release/scripts/src-install.sh#3 integrate .. //depot/projects/mips2/src/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/mips2/src/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/hash.c#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/hash.h#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/mips2/src/sbin/setkey/parse.y#3 integrate .. //depot/projects/mips2/src/sbin/setkey/setkey.c#3 integrate .. //depot/projects/mips2/src/sbin/setkey/test-pfkey.c#3 integrate .. //depot/projects/mips2/src/sbin/setkey/token.l#3 integrate .. //depot/projects/mips2/src/share/doc/legal/Makefile#2 integrate .. //depot/projects/mips2/src/share/examples/pf/Makefile#2 integrate .. //depot/projects/mips2/src/share/examples/pf/ackpri#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example1#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example2#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example3#2 integrate .. //depot/projects/mips2/src/share/examples/pf/pf.conf#1 branch .. //depot/projects/mips2/src/share/examples/pf/queue1#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue2#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue3#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue4#2 integrate .. //depot/projects/mips2/src/share/examples/pf/spamd#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#11 integrate .. //depot/projects/mips2/src/share/man/man4/wpi.4#1 branch .. //depot/projects/mips2/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#6 integrate .. //depot/projects/mips2/src/share/man/man9/locking.9#4 integrate .. //depot/projects/mips2/src/share/man/man9/rmlock.9#1 branch .. //depot/projects/mips2/src/share/mk/sys.mk#7 integrate .. //depot/projects/mips2/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/mips2/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#10 integrate .. //depot/projects/mips2/src/sys/conf/files#11 integrate .. //depot/projects/mips2/src/sys/conf/files.amd64#7 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#8 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/mips2/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/md/md.c#5 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/mips2/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/mips2/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/mips2/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/mips2/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/mips2/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#9 integrate .. //depot/projects/mips2/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/mips2/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/mips2/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/mips2/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/mips2/src/sys/sys/_rmlock.h#1 branch .. //depot/projects/mips2/src/sys/sys/lock.h#4 integrate .. //depot/projects/mips2/src/sys/sys/malloc.h#2 integrate .. //depot/projects/mips2/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/mips2/src/sys/sys/rmlock.h#1 branch .. //depot/projects/mips2/src/sys/sys/smp.h#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/mips2/src/tools/build/options/makeman#3 integrate .. //depot/projects/mips2/src/usr.bin/du/du.c#3 integrate .. //depot/projects/mips2/src/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/fstat/fstat.c#3 integrate .. //depot/projects/mips2/src/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/mips2/src/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/mips2/src/usr.bin/killall/killall.1#2 integrate .. //depot/projects/mips2/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/aux.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/lex.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/list.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/main.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/mips2/src/usr.bin/passwd/passwd.1#3 integrate .. //depot/projects/mips2/src/usr.bin/sed/main.c#4 integrate .. //depot/projects/mips2/src/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/cron.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/database.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/lib/entry.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/crunch/crunchide/crunchide.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/faithd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/tcp.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/mips2/src/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pciconf/pciconf.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/pathnames.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/auth.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/main.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/options.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/pppd.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/sys-bsd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rip6query/rip6query.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/route6d/route6d.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/rrenumd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rtadvd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/traceroute6/traceroute6.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/hostapd/Makefile#4 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/mips2/src/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/mips2/src/contrib/libreadline/complete.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/mips2/src/contrib/libreadline/display.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } /* Otherwise, print over the existing material. */ @@ -1608,8 +1642,20 @@ { if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; /* XXX */ + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } } lendiff = (oe - old) - (ne - new); if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) @@ -1745,7 +1791,10 @@ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) { dpos = _rl_col_width (data, 0, new); - if (dpos > prompt_last_invisible) /* XXX - don't use woff here */ + /* Use NEW when comparing against the last invisible character in the + prompt string, since they're both buffer indices and DPOS is a + desired display position. */ + if (new > prompt_last_invisible) /* XXX - don't use woff here */ { dpos -= woff; /* Since this will be assigned to _rl_last_c_pos at the end (more ==== //depot/projects/mips2/src/contrib/libreadline/input.c#3 (text+ko) ==== @@ -133,8 +133,11 @@ return (0); *key = ibuffer[pop_index++]; - +#if 0 if (pop_index >= ibuffer_len) +#else + if (pop_index > ibuffer_len) +#endif pop_index = 0; return (1); @@ -250,7 +253,8 @@ while (chars_avail--) { k = (*rl_getc_function) (rl_instream); - rl_stuff_char (k); + if (rl_stuff_char (k) == 0) + break; /* some problem; no more room */ if (k == NEWLINE || k == RETURN) break; } @@ -373,7 +377,11 @@ RL_SETSTATE (RL_STATE_INPUTPENDING); } ibuffer[push_index++] = key; +#if 0 if (push_index >= ibuffer_len) +#else + if (push_index > ibuffer_len) +#endif push_index = 0; return 1; @@ -513,20 +521,26 @@ char *mbchar; int size; { - int mb_len = 0; + int mb_len, c; size_t mbchar_bytes_length; wchar_t wc; mbstate_t ps, ps_back; memset(&ps, 0, sizeof (mbstate_t)); memset(&ps_back, 0, sizeof (mbstate_t)); - + + mb_len = 0; while (mb_len < size) { RL_SETSTATE(RL_STATE_MOREINPUT); - mbchar[mb_len++] = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + break; + + mbchar[mb_len++] = c; + mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps); if (mbchar_bytes_length == (size_t)(-1)) break; /* invalid byte sequence for the current locale */ @@ -564,7 +578,7 @@ c = first; memset (mb, 0, mlen); - for (i = 0; i < mlen; i++) + for (i = 0; c >= 0 && i < mlen; i++) { mb[i] = (char)c; memset (&ps, 0, sizeof (mbstate_t)); ==== //depot/projects/mips2/src/contrib/libreadline/isearch.c#3 (text+ko) ==== @@ -327,8 +327,15 @@ rl_command_func_t *f; f = (rl_command_func_t *)NULL; - - /* Translate the keys we do something with to opcodes. */ + + if (c < 0) + { + cxt->sflags |= SF_FAILED; + cxt->history_pos = cxt->last_found_line; + return -1; + } + + /* Translate the keys we do something with to opcodes. */ if (c >= 0 && _rl_keymap[c].type == ISFUNC) { f = _rl_keymap[c].function; ==== //depot/projects/mips2/src/contrib/libreadline/misc.c#3 (text+ko) ==== @@ -146,6 +146,8 @@ rl_restore_prompt (); rl_clear_message (); RL_UNSETSTATE(RL_STATE_NUMERICARG); + if (key < 0) + return -1; return (_rl_dispatch (key, _rl_keymap)); } } ==== //depot/projects/mips2/src/contrib/libreadline/readline.c#3 (text+ko) ==== @@ -645,6 +645,11 @@ if ((cxt->flags & KSEQ_DISPATCHED) == 0) { nkey = _rl_subseq_getchar (cxt->okey); + if (nkey < 0) + { + _rl_abort_internal (); + return -1; + } r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg); cxt->flags |= KSEQ_DISPATCHED; } ==== //depot/projects/mips2/src/contrib/libreadline/text.c#3 (text+ko) ==== @@ -857,6 +857,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_SIGNALS) if (RL_ISSTATE (RL_STATE_CALLBACK) == 0) _rl_restore_tty_signals (); @@ -1520,6 +1523,9 @@ mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX); + if (mb_len <= 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, mbchar, mb_len)); else @@ -1536,6 +1542,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, c)); else ==== //depot/projects/mips2/src/contrib/libreadline/vi_mode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.6 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.7 2007/11/07 04:42:20 ache Exp $ */ /* vi_mode.c -- A vi emulation mode for Bash. Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */ @@ -887,6 +887,13 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + + if (c < 0) + { + *nextkey = 0; + return -1; + } + *nextkey = c; if (!member (c, vi_motion)) @@ -903,6 +910,11 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); /* real command */ RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + { + *nextkey = 0; + return -1; + } *nextkey = c; } else if (key == c && (key == 'd' || key == 'y' || key == 'c')) @@ -1225,14 +1237,22 @@ _rl_vi_callback_char_search (data) _rl_callback_generic_arg *data; { + int c; #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); #endif + if (c <= 0) + return -1; + +#if !defined (HANDLE_MULTIBYTE) + _rl_vi_last_search_char = c; +#endif + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1248,6 +1268,7 @@ rl_vi_char_search (count, key) int count, key; { + int c; #if defined (HANDLE_MULTIBYTE) static char *target; static int tlen; @@ -1294,11 +1315,17 @@ else { #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + if (c <= 0) + return -1; + _rl_vi_last_search_mblen = c; #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + _rl_vi_last_search_char = c; #endif } } @@ -1468,6 +1495,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) c = _rl_read_mbstring (c, mb, mlen); @@ -1486,6 +1516,9 @@ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1517,6 +1550,9 @@ else _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + return (_rl_vi_change_char (count, c, mb)); } @@ -1651,7 +1687,7 @@ ch = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); - if (ch < 'a' || ch > 'z') + if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; @@ -1703,7 +1739,7 @@ rl_point = rl_mark; return 0; } - else if (ch < 'a' || ch > 'z') + else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; ==== //depot/projects/mips2/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $ +# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ .include <bsd.own.mk> @@ -14,7 +14,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ - portsnap.conf pf.conf pf.os phones profile protocols \ + portsnap.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ ==== //depot/projects/mips2/src/etc/defaults/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.8 2007/11/08 17:41:35 imp Exp $ -FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf +FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults ==== //depot/projects/mips2/src/etc/mtree/BSD.usr.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.329 2007/07/25 13:37:33 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.332 2007/11/10 22:47:46 sam Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -80,6 +80,8 @@ .. intel_iwi .. + intel_wpi + .. .. ncurses .. @@ -212,6 +214,8 @@ .. find_interface .. + hostapd + .. ibcs2 .. ipfilter @@ -304,6 +308,8 @@ .. tcsh .. + wpa_supplicant + .. .. games fortune ==== //depot/projects/mips2/src/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.246 2007/11/06 22:40:16 edwin Exp $ % ======================================================================= @@ -57352,9 +57352,9 @@ side of the majority, it is time to reform. -- Mark Twain % -Where a calculator on the ENIAC is equpped with 18,000 vaccuum tubes and -weighs 30 tons, computers in the future may have only 1,000 vaccuum tubes -and perhaps weight 1 1/2 tons. +Where a calculator on the ENIAC is equipped with 18,000 vacuum tubes and +weighs 30 tons, computers in the future may have only 1,000 vacuum tubes +and perhaps weigh 1 1/2 tons. -- Popular Mechanics, March 1949 % Where am I? Who am I? Am I? I ==== //depot/projects/mips2/src/games/fortune/fortune/fortune.6#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fortune.6 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.20 2005/02/13 23:45:45 ru Exp $ +.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.22 2007/11/07 12:08:03 ru Exp $ .\" -.Dd April 19, 1994 +.Dd November 7, 2007 .Dt FORTUNE 6 .Os .Sh NAME @@ -57,7 +57,7 @@ is subdivided into those which are potentially offensive and those which are not. The options are as follows: -.Bl -tag -width flag +.Bl -tag -width indent .It Fl a Choose from all lists of maxims, both offensive and not. (See the @@ -66,7 +66,8 @@ .It Fl D Enable additional debugging output. Specify this option multiple times for more verbose output. -Only available if compiled with -DDEBUG. +Only available if compiled with +.Li -DDEBUG . .It Fl e Consider all fortune files to be of equal size (see discussion below on multiple files). @@ -75,7 +76,7 @@ print a fortune. .It Fl l Long dictums only. -.It Fl m +.It Fl m Ar pattern Print out all fortunes which match the regular expression .Ar pattern . See @@ -116,13 +117,13 @@ The user may specify alternate sayings. You can specify a specific file, a directory which contains one or more files, or the special word -.Em all +.Cm all which says to use all the standard databases. Any of these may be preceded by a percentage, which is a number .Ar N between 0 and 100 inclusive, followed by a -.Ar % . -If it is, there will be a +.Ql % . +If it is, there will be an .Ar N percent probability that an adage will be picked from that file or directory. @@ -132,52 +133,56 @@ one of them will be based on their relative sizes. .Pp As an example, given two databases -.Em funny +.Pa funny and -.Em not-funny , +.Pa not-funny , with -.Em funny +.Pa funny twice as big, saying -.Bd -literal -offset indent -fortune funny not-funny -.Ed +.Pp +.Dl "fortune funny not-funny" .Pp will get you fortunes out of -.Em funny +.Pa funny two-thirds of the time. The command -.Bd -literal -offset indent -fortune 90% funny 10% not-funny -.Ed +.Pp +.Dl "fortune 90% funny 10% not-funny" .Pp will pick out 90% of its fortunes from -.Em funny +.Pa funny (the -.Dq 10% not-funny +.Dq Li "10% not-funny" is unnecessary, since 10% is all that is left). The .Fl e option says to consider all files equal; thus -.Bd -literal -offset indent -fortune -e funny not-funny -.Ed +.Pp +.Dl "fortune -e funny not-funny" .Pp is equivalent to -.Bd -literal -offset indent -fortune 50% funny 50% not-funny >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711111349.lABDnAHu033909>