Date: Sun, 4 Jan 2004 17:29:38 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 44795 for review Message-ID: <200401050129.i051TcaU062304@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=44795 Change 44795 by jmallett@jmallett_oingo on 2004/01/04 17:29:33 IFC. Affected files ... .. //depot/projects/mips/COPYRIGHT#2 integrate .. //depot/projects/mips/bin/rm/rm.c#4 integrate .. //depot/projects/mips/bin/sh/eval.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/mips/contrib/ipfilter/ipmon.c#3 integrate .. //depot/projects/mips/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/mips/contrib/tcp_wrappers/socket.c#2 integrate .. //depot/projects/mips/etc/apmd.conf#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#15 integrate .. //depot/projects/mips/etc/periodic/daily/150.clean-hoststat#3 integrate .. //depot/projects/mips/etc/rc.d/cron#3 integrate .. //depot/projects/mips/etc/rc.resume#2 integrate .. //depot/projects/mips/etc/rc.suspend#2 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#7 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/mips/games/fortune/datfiles/murphy#4 integrate .. //depot/projects/mips/games/fortune/datfiles/startrek#5 integrate .. //depot/projects/mips/games/fortune/fortune/fortune.c#3 integrate .. //depot/projects/mips/include/paths.h#5 integrate .. //depot/projects/mips/lib/libc/gen/opendir.c#4 integrate .. //depot/projects/mips/lib/libc/sys/sendfile.2#6 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_init.3#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/mips/lib/libpthread/man/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_attr.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_equal.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_exit.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_getspecific.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_join.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_key_create.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_key_delete.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_kill.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_init.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutexattr.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_once.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_schedparam.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_self.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_setspecific.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_sigmask.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_testcancel.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_destroy.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/sem_getvalue.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_init.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_post.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_wait.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sigwait.3#2 integrate .. //depot/projects/mips/lib/libpthread/pthread.map#3 integrate .. //depot/projects/mips/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_create.c#6 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigaltstack.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_kern.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 integrate .. //depot/projects/mips/release/scripts/mkpkgindex.sh#1 branch .. //depot/projects/mips/sbin/dump/main.c#8 integrate .. //depot/projects/mips/sbin/fsck/fsutil.c#2 integrate .. //depot/projects/mips/sbin/fsck/fsutil.h#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/check.c#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/dosfs.h#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/ext.h#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/fsck_msdosfs.8#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/main.c#2 integrate .. //depot/projects/mips/sbin/growfs/growfs.8#6 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.8#5 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/mips/sbin/mknod/mknod.8#4 integrate .. //depot/projects/mips/share/man/man3/Makefile#2 integrate .. //depot/projects/mips/share/man/man3/pthread.3#3 integrate .. //depot/projects/mips/share/man/man3/pthread_mutex_timedlock.3#1 branch .. //depot/projects/mips/share/man/man4/Makefile#18 integrate .. //depot/projects/mips/share/man/man4/acpi.4#7 integrate .. //depot/projects/mips/share/man/man4/acpi_thermal.4#1 branch .. //depot/projects/mips/share/man/man4/crypto.4#3 integrate .. //depot/projects/mips/share/man/man4/dcons.4#3 integrate .. //depot/projects/mips/share/man/man4/dcons_crom.4#2 integrate .. //depot/projects/mips/share/man/man4/digi.4#2 integrate .. //depot/projects/mips/share/man/man4/ef.4#2 integrate .. //depot/projects/mips/share/man/man4/gdb.4#1 branch .. //depot/projects/mips/share/man/man4/harp.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_stub.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#5 integrate .. //depot/projects/mips/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/mips/share/man/man4/matcd.4#2 integrate .. //depot/projects/mips/share/man/man4/meteor.4#2 integrate .. //depot/projects/mips/share/man/man4/miibus.4#6 integrate .. //depot/projects/mips/share/man/man4/ng_atm.4#3 integrate .. //depot/projects/mips/share/man/man4/ng_atmpif.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_sscfu.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_sscop.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_uni.4#2 integrate .. //depot/projects/mips/share/man/man4/rndtest.4#3 integrate .. //depot/projects/mips/share/man/man4/safe.4#2 integrate .. //depot/projects/mips/share/man/man4/ste.4#3 integrate .. //depot/projects/mips/share/man/man4/utopia.4#2 integrate .. //depot/projects/mips/share/man/man4/vinumdebug.4#1 branch .. //depot/projects/mips/share/man/man4/vpo.4#4 integrate .. //depot/projects/mips/share/man/man4/xe.4#3 integrate .. //depot/projects/mips/share/man/man5/devfs.5#3 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/mips/share/man/man7/release.7#11 integrate .. //depot/projects/mips/share/man/man9/mutex.9#6 integrate .. //depot/projects/mips/share/man/man9/sx.9#3 integrate .. //depot/projects/mips/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/mips/share/mk/bsd.obj.mk#2 integrate .. //depot/projects/mips/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/mips/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#11 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_signal.c#9 integrate .. //depot/projects/mips/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/mips/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/mips/sys/boot/alpha/common/conf.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/bootinfo.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/abort.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/arcconsole.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/arcdisk.c#5 integrate .. //depot/projects/mips/sys/boot/arc/lib/bootinfo.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/delay.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/devicename.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/elf_freebsd.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/setjmperr.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/time.c#3 integrate .. //depot/projects/mips/sys/boot/arc/loader/conf.c#3 integrate .. //depot/projects/mips/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/mips/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/elf_freebsd.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/devicename.c#6 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/mips/sys/boot/sparc64/boot1/boot1.c#4 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/metadata.c#6 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/mips/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#11 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/mips/sys/conf/options.i386#12 integrate .. //depot/projects/mips/sys/conf/options.pc98#12 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsmthdat.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/mips/sys/dev/an/if_aironet_ieee.h#4 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#11 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#7 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#8 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#9 integrate .. //depot/projects/mips/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/mips/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mips/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/mips/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/mips/sys/dev/fb/creator.c#3 integrate .. //depot/projects/mips/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/mips/sys/dev/iicbus/if_ic.c#8 integrate .. //depot/projects/mips/sys/dev/ips/ips_commands.c#4 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#11 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbbdevid.h#5 integrate .. //depot/projects/mips/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/mips/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/mips/sys/dev/sio/sio_ebus.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio_isa.c#5 integrate .. //depot/projects/mips/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/mips/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/mips/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/mips/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/mips/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#13 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#13 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#13 integrate .. //depot/projects/mips/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/mips/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/mips/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#14 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pccard.c#10 integrate .. //depot/projects/mips/sys/dev/wi/if_wireg.h#5 integrate .. //depot/projects/mips/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/mips/sys/fs/msdosfs/bootsect.h#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/mips/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/fat.h#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/mips/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/mips/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/mips/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#16 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/mips/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/mips/sys/i386/svr4/svr4_machdep.c#7 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/mips/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/mips/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/mips/sys/kern/kern_event.c#9 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#18 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#18 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#15 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#10 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/mips/sys/kern/subr_mbuf.c#12 integrate .. //depot/projects/mips/sys/kern/subr_power.c#3 integrate .. //depot/projects/mips/sys/kern/sys_pipe.c#11 integrate .. //depot/projects/mips/sys/kern/syscalls.master#15 integrate .. //depot/projects/mips/sys/kern/uipc_mbuf2.c#8 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/mips/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/mips/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/mips/sys/modules/cam/Makefile#5 integrate .. //depot/projects/mips/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/mips/sys/modules/sio/Makefile#1 branch .. //depot/projects/mips/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/mips/sys/net/bpf.c#11 integrate .. //depot/projects/mips/sys/net/bpf.h#6 integrate .. //depot/projects/mips/sys/net/if.c#9 integrate .. //depot/projects/mips/sys/net/if_disc.c#7 integrate .. //depot/projects/mips/sys/net/if_ef.c#8 integrate .. //depot/projects/mips/sys/net/if_faith.c#9 integrate .. //depot/projects/mips/sys/net/if_gif.c#8 integrate .. //depot/projects/mips/sys/net/if_gre.c#10 integrate .. //depot/projects/mips/sys/net/if_gre.h#3 integrate .. //depot/projects/mips/sys/net/if_loop.c#10 integrate .. //depot/projects/mips/sys/net/if_stf.c#9 integrate .. //depot/projects/mips/sys/net/if_tun.c#10 integrate .. //depot/projects/mips/sys/net/if_vlan.c#10 integrate .. //depot/projects/mips/sys/net/if_vlan_var.h#7 integrate .. //depot/projects/mips/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/mips/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/mips/sys/netinet/in.c#6 integrate .. //depot/projects/mips/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/mips/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/mips/sys/netinet6/ip6_fw.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/mips/sys/netsmb/smb_crypt.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_rq.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/mips/sys/netsmb/smb_smb.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_subr.h#5 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#17 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#12 integrate .. //depot/projects/mips/sys/pc98/pc98/sio_cbus.c#2 integrate .. //depot/projects/mips/sys/pci/if_rl.c#13 integrate .. //depot/projects/mips/sys/pci/if_sis.c#12 integrate .. //depot/projects/mips/sys/pci/if_sisreg.h#7 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/mips/sys/powerpc/powerpc/vm_machdep.c#10 integrate .. //depot/projects/mips/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/mips/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/mips/sys/sparc64/sparc64/bus_machdep.c#11 integrate .. //depot/projects/mips/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/dump_machdep.c#6 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/mips/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/mips/sys/sys/_null.h#2 integrate .. //depot/projects/mips/sys/sys/copyright.h#3 integrate .. //depot/projects/mips/sys/sys/mbuf.h#13 integrate .. //depot/projects/mips/sys/sys/proc.h#21 integrate .. //depot/projects/mips/sys/sys/sf_buf.h#2 integrate .. //depot/projects/mips/sys/sys/sysproto.h#14 integrate .. //depot/projects/mips/sys/sys/systm.h#9 integrate .. //depot/projects/mips/sys/sys/uio.h#7 integrate .. //depot/projects/mips/sys/sys/vnode.h#11 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/mips/sys/vm/device_pager.c#6 integrate .. //depot/projects/mips/sys/vm/phys_pager.c#4 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#9 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#11 integrate .. //depot/projects/mips/sys/vm/vm_kern.c#6 integrate .. //depot/projects/mips/sys/vm/vm_map.c#16 integrate .. //depot/projects/mips/sys/vm/vm_meter.c#5 integrate .. //depot/projects/mips/sys/vm/vm_object.c#18 integrate .. //depot/projects/mips/sys/vm/vm_page.c#18 integrate .. //depot/projects/mips/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/mips/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.i386#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.kernel#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.vinum#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.birthday#8 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#3 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan#2 integrate .. //depot/projects/mips/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/mips/usr.bin/netstat/mbuf.c#5 integrate .. //depot/projects/mips/usr.bin/netstat/netstat.h#5 integrate .. //depot/projects/mips/usr.bin/sed/sed.1#4 integrate .. //depot/projects/mips/usr.bin/truss/main.c#6 integrate .. //depot/projects/mips/usr.bin/usbhidctl/usbhidctl.1#2 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.8#4 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate .. //depot/projects/mips/usr.sbin/acpi/acpidump/acpi.c#5 integrate .. //depot/projects/mips/usr.sbin/apmd/apmd.8#4 integrate .. //depot/projects/mips/usr.sbin/burncd/burncd.c#8 integrate .. //depot/projects/mips/usr.sbin/devinfo/devinfo.c#3 integrate .. //depot/projects/mips/usr.sbin/ip6addrctl/ip6addrctl.c#3 integrate .. //depot/projects/mips/usr.sbin/ip6addrctl/ip6addrctl.conf.sample#2 integrate .. //depot/projects/mips/usr.sbin/mergemaster/mergemaster.sh#8 integrate .. //depot/projects/mips/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/mips/usr.sbin/mrouted/mtrace.c#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf-parse.y#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf-token.l#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/mips/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardd/pccardd.c#2 integrate .. //depot/projects/mips/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/mips/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/mips/usr.sbin/sysinstall/devices.c#11 integrate .. //depot/projects/mips/usr.sbin/sysinstall/doc.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/mips/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/sysinstall.h#12 integrate Differences ... ==== //depot/projects/mips/COPYRIGHT#2 (text+ko) ==== @@ -1,6 +1,35 @@ -# $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite Releases is copyrighted by The Regents of the University of California. ==== //depot/projects/mips/bin/rm/rm.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.45 2003/11/10 09:40:18 guido Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.46 2004/01/01 10:26:43 kuriyama Exp $"); #include <sys/stat.h> #include <sys/param.h> @@ -199,8 +199,8 @@ errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno)); case FTS_NS: /* - * FTS_NS: assume that if can't stat the file, it - * can't be unlinked. + * Assume that since fts_read() couldn't stat the + * file, it can't be unlinked. */ if (!needstat) break; @@ -269,6 +269,14 @@ } break; + case FTS_NS: + /* + * Assume that since fts_read() couldn't stat + * the file, it can't be unlinked. + */ + if (fflag) + continue; + /* FALLTHROUGH */ default: if (Pflag) if (!rm_overwrite(p->fts_accpath, NULL)) ==== //depot/projects/mips/bin/sh/eval.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $"); #include <paths.h> #include <signal.h> @@ -205,7 +205,6 @@ case NAND: evaltree(n->nbinary.ch1, EV_TESTED); if (evalskip || exitstatus != 0) { - flags |= EV_TESTED; goto out; } evaltree(n->nbinary.ch2, flags); @@ -246,25 +245,9 @@ break; case NFOR: evalfor(n); - /* - * The 'for' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'for' loop. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NCASE: evalcase(n, flags); - /* - * The 'case' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'case' block. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NDEFUN: defun(n->narg.text, n->narg.next); @@ -289,14 +272,8 @@ out: if (pendingsigs) dotrap(); - /* - * XXX - Like "!(n->type == NSEMI)", more types will probably - * need to be excluded from this test. It's probably better - * to set or unset EV_TESTED in the loop above than to bloat - * the conditional here. - */ if ((flags & EV_EXIT) || (eflag && exitstatus - && !(flags & EV_TESTED) && !(n->type == NSEMI))) + && !(flags & EV_TESTED) && (n->type == NCMD))) exitshell(exitstatus); } @@ -711,7 +688,7 @@ * the command runs. Partly deleting like * changepatch() does doesn't seem worth the * bookinging effort, since most such runs add - * diretories in front of the new PATH. + * directories in front of the new PATH. */ clearcmdentry(0); do_clearcmdentry = 1; ==== //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.8 2003/09/02 15:42:56 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.9 2004/01/04 10:56:22 charnier Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -68,7 +68,7 @@ , .I mount and -.Xr mountd +.Xr mountd 8 configuration files. .Pp The following options are available: ==== //depot/projects/mips/contrib/ipfilter/ipmon.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.16 2003/02/15 06:32:47 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.17 2004/01/02 13:10:47 guido Exp $"; #endif @@ -922,6 +922,7 @@ } #if (SOLARIS || \ (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \ (defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux) { char ifname[sizeof(ipf->fl_ifname) + 1]; ==== //depot/projects/mips/contrib/pnpinfo/pnpinfo.c#2 (text+ko) ==== @@ -22,12 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.8 2002/08/09 22:04:54 iedowse Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $"); + #include <sys/time.h> +#include <err.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -588,10 +590,8 @@ #ifdef __i386__ /* Hey what about a i386_iopl() call :) */ - if (open("/dev/io", O_RDONLY) < 0) { - fprintf (stderr, "pnpinfo: Can't get I/O privilege.\n"); - exit (1); - } + if (open("/dev/io", O_RDONLY) < 0) + errx(1, "can't get I/O privilege"); #endif #ifdef __alpha__ ioperm(0x203, 0x400 - 0x203, 1); @@ -608,6 +608,7 @@ } if (!num_pnp_devs) { printf("No Plug-n-Play devices were found\n"); - return 0; + return (0); } + return (0); } ==== //depot/projects/mips/contrib/tcp_wrappers/socket.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * - * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.6 2001/07/04 20:16:18 kris Exp $ + * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.7 2003/12/27 14:58:00 ceri Exp $ */ #ifndef lint @@ -114,7 +114,7 @@ return; /* give up */ } #ifdef really_paranoid - memset(buf, 0 sizeof(buf)); + memset(buf, 0, sizeof(buf)); #endif } #ifdef INET6 ==== //depot/projects/mips/etc/apmd.conf#2 (text+ko) ==== @@ -1,10 +1,10 @@ # apmd Configuration File # -# $FreeBSD: src/etc/apmd.conf,v 1.7 2001/08/06 15:52:42 nsayer Exp $ +# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $ # apm_event SUSPENDREQ { - exec "/etc/rc.suspend"; + exec "/etc/rc.suspend apm suspend"; } apm_event USERSUSPENDREQ { @@ -13,8 +13,12 @@ exec "apm -z"; } -apm_event NORMRESUME, STANDBYRESUME { - exec "/etc/rc.resume"; +apm_event NORMRESUME { + exec "/etc/rc.resume apm suspend"; +} + +apm_event STANDBYRESUME { + exec "/etc/rc.resume apm standby"; } # resume event configuration for serial mouse users by ==== //depot/projects/mips/etc/defaults/rc.conf#15 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.194 2003/12/18 04:39:57 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.195 2003/12/25 23:29:19 babkin Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -398,6 +398,7 @@ cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). +cron_dst="YES" # Handle DST transitions intelligently (YES/NO) cron_flags="" # Which options to pass to the cron daemon. lpd_enable="NO" # Run the line printer daemon. lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. ==== //depot/projects/mips/etc/periodic/daily/150.clean-hoststat#3 (text+ko) ==== @@ -1,8 +1,8 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.7 2003/01/08 18:51:45 wollman Exp $ +# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $ # -# Remove stale files in /var/spool/.hoststat +# Remove stale persistent host status files # # If there is a global system configuration file, suck it in. @@ -14,13 +14,13 @@ case "$daily_clean_hoststat_enable" in [Yy][Ee][Ss]) - if [ -z "$(sendmail -bh 2>&1)" ]; then + if [ -z "$(hoststat 2>&1)" ]; then rc=2 else echo "" echo "Removing stale entries from sendmail host status cache:" rc=0 - sendmail -bH || rc=1 + purgestat || rc=1 fi;; *) rc=0;; ==== //depot/projects/mips/etc/rc.d/cron#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.4 2003/12/25 23:29:19 babkin Exp $ # # PROVIDE: cron @@ -17,4 +17,8 @@ pidfile="/var/run/${name}.pid" load_rc_config $name +if checkyesno cron_dst +then + cron_flags="$cron_flags -s" +fi run_rc_command "$1" ==== //depot/projects/mips/etc/rc.resume#2 (text+ko) ==== @@ -24,15 +24,23 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.5 2000/12/17 08:15:57 dougb Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $ # # sample run command file for APM Resume Event +if [ $# -ne 2 ]; then + echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + exit 1 +fi + +subsystem=$1 +state=$2 + if [ -r /var/run/rc.suspend.pid ]; then kill -9 `cat /var/run/rc.suspend.pid` rm -f /var/run/rc.suspend.pid - echo 'rc.suspend is killed' + echo 'rc.resume: killed rc.suspend that was still around' fi # Turns on a power supply of a card in the slot inactivated. @@ -40,7 +48,11 @@ # pccardq | awk -F '~' '$5 == "inactive" \ # { printf("pccardc power %d 1", $1); }' | sh -logger -t apmd resumed at `date +'%Y%m%d %H:%M:%S'` +# UHCI has trouble resuming so we just load/unload it. You +# should add any other kernel modules you want reloaded here. +# kldload usb + +logger -t $subsystem resumed at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync exit 0 ==== //depot/projects/mips/etc/rc.suspend#2 (text+ko) ==== @@ -24,11 +24,19 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.suspend,v 1.4 2000/10/08 19:18:24 obrien Exp $ +# $FreeBSD: src/etc/rc.suspend,v 1.5 2003/12/30 17:28:06 njl Exp $ # # sample run command file for APM Suspend Event +if [ $# -ne 2 ]; then + echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + exit 1 +fi + +subsystem=$1 +state=$2 + if [ -r /var/run/rc.suspend.pid ]; then exit 1 fi @@ -40,11 +48,15 @@ # pccardq | awk -F '~' '$5 == "filled" && $4 ~ /sio/ \ # { printf("pccardc power %d 0", $1); }' | sh -logger -t apmd suspend at `date +'%Y%m%d %H:%M:%S'` +# UHCI has trouble resuming so we just load/unload it. You +# should add any other kernel modules you want unloaded here. +# kldunload usb + +logger -t $subsystem suspend at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync -sleep 3 +[ $subsystem = "apm" ] && sleep 3 rm -f /var/run/rc.suspend.pid -zzz +[ $subsystem = "apm" ] && zzz exit 0 ==== //depot/projects/mips/games/fortune/datfiles/fortunes#12 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.121 2003/12/07 10:03:20 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.122 2003/12/26 21:32:46 schweikh Exp $ % -- Gifts for Children -- @@ -429,7 +429,7 @@ feel interested. "No, you don't understand," the Knight said, looking a little vexed. "That's what the name is called. The name really is, 'The Aged -Aged Man.'" +Man.'" "Then I ought to have said "That's what the song is called'?" Alice corrected herself. "No, you oughtn't: that's quite another thing! The song is @@ -5106,7 +5106,7 @@ below your address label. (d) Then print on your 3x5 card, above your computer-printed name and address the words "CARTER & VAN PEEL SWEEPSTAKES" (Use all capital letters.) (e) Finally place 3x5 card -(without bending) into a plain envelope [NOTE: do NOT use the the +(without bending) into a plain envelope [NOTE: do NOT use the Official Prize Claim and CVP Perfume Reply Envelope or you may be disqualified], and mail to: CVP, Box 1320, Westbury, NY 11595. Print this address correctly. Comply with above instructions carefully and @@ -7877,7 +7877,7 @@ % If you throw a New Year's Party, the worst thing that you can do would be to throw the kind of party where your guests wake up today, and call -you to say they had a nice time. Now you'll be be expected to throw +you to say they had a nice time. Now you'll be expected to throw another party next year. What you should do is throw the kind of party where your guest wake up @@ -9600,7 +9600,7 @@ Manual, n.: A unit of documentation. There are always three or more on a given item. One is on the shelf; someone has the others. The -information you need in in the others. +information you need is in the others. -- Ray Simard % Many years ago in a period commonly know as Next Friday Afternoon, @@ -11913,7 +11913,7 @@ RY THURSDAY DUE TO EMERGENCY COG REPLACEMENT - PLEASE ENSURE RY RY THAT YOUR PROGRAM DOES NOT ATTEMPT TO DIVIDE BY ZERO AS RY RY THIS CAN CAUSE SEVERE DAMAGE (INCLUDING SHAFT BREAKAGES). RY -RY RY +RY RY RYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRY . . @@ -15280,7 +15280,7 @@ Well, I would -- if they realized that we -- again if -- if we led them back to that stalemate only because our retaliatory power, our seconds, or strike at them after our first strike, would be so destructive they -they couldn't afford it, that would hold them off. +couldn't afford it, that would hold them off. -- President Ronald Reagan, on the MX missile % "Well, if you can't believe what you read in a comic book, what *___can* ==== //depot/projects/mips/games/fortune/datfiles/fortunes2#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.62 2003/11/10 23:08:39 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.63 2003/12/26 21:32:46 schweikh Exp $ % ======================================================================= || || @@ -630,7 +630,7 @@ After being reported missing a day or two later, rangers found two bears, one a male, one a female, looking suspiciously overstuffed. They killed the female, autopsied her, and sure enough, found the German and the Pole. - "What do you think?" said the the first ranger. + "What do you think?" said the first ranger. "The Czech is in the male," replied the second. % A group of soldiers being prepared for a practice landing on a tropical @@ -2991,7 +2991,7 @@ attacked the men. He continued to trample them until they were nothing but bloody lumps of flesh. Then, strolling away, the elephant remarked, "It just goes to show that you can't depend on first impressions. When I first saw -them I didn't think they they'd be any fun at all." +them I didn't think they'd be any fun at all." % Once upon a time there were three brothers who were knights in a certain kingdom. And, there was a Princess in a neighboring kingdom @@ -3807,7 +3807,7 @@ feel interested. "No, you don't understand," the Knight said, looking a little vexed. "That's what the name is called. The name really is, 'The Aged -Aged Man.'" +Man.'" "Then I ought to have said "That's what the song is called'?" Alice corrected herself. "No, you oughtn't: that's quite another thing! The song is @@ -7686,7 +7686,7 @@ plus the weight of the banana, is one forth as much as the weight of the weight and the weight of the rope. The monkey's mother is half as old as the monkey will be when it is three times as old as its mother was when she -she was half as old as the monkey will be when when it is as old as its mother +was half as old as the monkey will be when it is as old as its mother will be when she is four times as old as the monkey was when it was twice as its mother was when she was one third as old as the monkey was when it was old as is mother was when she was three times as old as the monkey was @@ -14047,7 +14047,7 @@ there, and a "comp" group will propagate your article further.) You may also find it is more fun to post the article once in each group. If you list all the newsgroups in the same article, some newsreaders -will only show the the article to the reader once! Don't tolerate this. +will only show the article to the reader once! Don't tolerate this. -- Emily Postnews Answers Your Questions on Netiquette % Dear Emily: @@ -15180,7 +15180,7 @@ Double Bucky, I'd like a whole word of, Double Bucky, I'm happy I heard of, Double Bucky, I'd like a whole word of you! - -- to Nicholas Wirth, who suggested that an extra bit + -- to Niklaus Wirth, who suggested that an extra bit be added to terminal codes on 36-bit machines for use by screen editors. [to the tune of "Rubber Ducky"] % @@ -16340,7 +16340,7 @@ -- Martin Gardner, "Irving Kristol and the Facts of Life". % Examinations are formidable even to the best prepared, for -even the greatest fool may ask more the the wisest man can answer. +even the greatest fool may ask more than the wisest man can answer. -- C.C. Colton % Example is not the main thing in influencing others. @@ -18376,7 +18376,7 @@ exceptions for which I beg your indulgence. Unfortunately the sum of one shilling and ninepence remains unaccounted for in one infantry battalion's petty cash and there has been a hideous -confusion as the the number of jars of raspberry jam issued to one cavalry +confusion as the number of jars of raspberry jam issued to one cavalry regiment during a sandstorm in western Spain. This reprehensible carelessness may be related to the pressure of circumstance, since we are war with France, a fact which may come as a bit of a surprise to you gentlemen in Whitehall. @@ -24010,7 +24010,7 @@ If at first you don't succeed, try, try again. -- W.E. Hickson % -If at first you don't succeed, try try again. Then quit. +If at first you don't succeed, try again. Then quit. No use being a damn fool about it. % If at first you don't succeed, try, try again. @@ -24643,7 +24643,7 @@ -- Rene de Visme Williamson % >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401050129.i051TcaU062304>