Date: Tue, 20 Dec 2005 01:34:17 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 88435 for review Message-ID: <200512200134.jBK1YHHV050630@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=88435 Change 88435 by peter@peter_daintree on 2005/12/20 01:33:34 IFC @88434 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#11 integrate .. //depot/projects/hammer/UPDATING#88 integrate .. //depot/projects/hammer/bin/sh/jobs.c#13 integrate .. //depot/projects/hammer/etc/Makefile#45 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#65 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#44 integrate .. //depot/projects/hammer/etc/rc.d/abi#5 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#10 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#11 integrate .. //depot/projects/hammer/etc/rc.d/syscons#7 integrate .. //depot/projects/hammer/etc/rc.d/usbd#4 delete .. //depot/projects/hammer/etc/usbd.conf#6 delete .. //depot/projects/hammer/gnu/usr.bin/grep/grep.1#9 integrate .. //depot/projects/hammer/include/Makefile#52 integrate .. //depot/projects/hammer/include/dlfcn.h#4 integrate .. //depot/projects/hammer/include/printf.h#1 branch .. //depot/projects/hammer/lib/libc/gen/dlfcn.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libc/stdio/fread.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#14 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#20 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#13 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#19 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#27 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#10 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrt.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/reloc.c#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/arm/reloc.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#32 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#9 integrate .. //depot/projects/hammer/release/Makefile#79 integrate .. //depot/projects/hammer/release/alpha/boot_crunch.conf#5 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#19 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#6 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#8 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#6 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#27 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#18 integrate .. //depot/projects/hammer/sbin/devd/devd.8#13 integrate .. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#33 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#20 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#13 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#44 integrate .. //depot/projects/hammer/share/man/man3/siginfo.3#2 integrate .. //depot/projects/hammer/share/man/man4/ata.4#21 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/snd_audiocs.4#4 integrate .. //depot/projects/hammer/share/man/man4/rp.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_ad1816.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_als4000.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_cmi.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_cs4281.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_csa.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_ds1.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#8 integrate .. //depot/projects/hammer/share/man/man4/snd_es137x.4#8 integrate .. //depot/projects/hammer/share/man/man4/snd_ess.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_gusc.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_maestro.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_maestro3.4#5 integrate .. //depot/projects/hammer/share/man/man4/snd_sbc.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_uaudio.4#2 integrate .. //depot/projects/hammer/share/man/man4/umass.4#17 integrate .. //depot/projects/hammer/share/man/man4/usb.4#9 integrate .. //depot/projects/hammer/share/man/man5/devfs.conf.5#4 integrate .. //depot/projects/hammer/share/man/man5/elf.5#10 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#42 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#67 integrate .. //depot/projects/hammer/share/man/man8/rc.8#8 integrate .. //depot/projects/hammer/share/man/man9/VFS_LOCK_GIANT.9#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#14 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#33 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#12 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#7 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#16 integrate .. //depot/projects/hammer/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/hammer/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#16 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#10 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biospnp.c#4 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#10 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/i386_copy.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#11 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#39 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#40 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#16 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#26 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#11 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#27 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#14 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#14 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/amr/amrio.h#5 integrate .. //depot/projects/hammer/sys/dev/amr/amrreg.h#6 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#65 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#37 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#18 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#60 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#29 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#37 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.c#5 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#55 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#46 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#16 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#37 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#38 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/hammer/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/hammer/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#34 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#65 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#15 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#19 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#23 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#8 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#17 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#24 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#18 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#7 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#24 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#49 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#67 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#13 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#29 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#36 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#37 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#64 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#39 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#19 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#7 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#19 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#52 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#21 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#29 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#70 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#31 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#39 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#35 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#37 integrate .. //depot/projects/hammer/sys/pc98/cbus/sio.c#6 integrate .. //depot/projects/hammer/sys/pci/amdpm.c#10 integrate .. //depot/projects/hammer/sys/powerpc/include/frame.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#15 integrate .. //depot/projects/hammer/sys/sys/elf32.h#2 integrate .. //depot/projects/hammer/sys/sys/elf64.h#2 integrate .. //depot/projects/hammer/sys/sys/elf_common.h#5 integrate .. //depot/projects/hammer/sys/sys/elf_generic.h#2 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/hammer/sys/sys/ktr.h#15 integrate .. //depot/projects/hammer/sys/sys/linker.h#15 integrate .. //depot/projects/hammer/sys/sys/lock.h#10 integrate .. //depot/projects/hammer/sys/sys/mount.h#40 integrate .. //depot/projects/hammer/sys/sys/param.h#72 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#16 integrate .. //depot/projects/hammer/sys/sys/vnode.h#61 integrate .. //depot/projects/hammer/sys/tools/vnode_if.awk#14 integrate .. //depot/projects/hammer/sys/ufs/ufs/quota.h#7 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#15 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#42 integrate .. //depot/projects/hammer/tools/tools/README#20 integrate .. //depot/projects/hammer/tools/tools/ansify/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ansify/ansify.pl#1 branch .. //depot/projects/hammer/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/hammer/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netblast/netblast.c#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#42 integrate .. //depot/projects/hammer/usr.bin/elf2aout/elf2aout.c#3 integrate .. //depot/projects/hammer/usr.bin/elfdump/elfdump.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#14 integrate .. //depot/projects/hammer/usr.sbin/Makefile#71 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.4#9 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#10 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef.c#5 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef.h#5 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_amd64.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_i386.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_powerpc.c#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_sparc64.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#11 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/main.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#36 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#21 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/usb.c#2 delete .. //depot/projects/hammer/usr.sbin/usbd/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/usbd/usbd.8#5 delete .. //depot/projects/hammer/usr.sbin/usbd/usbd.c#9 delete .. //depot/projects/hammer/usr.sbin/usbd/usbd.conf.5#5 delete Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.21 2005/10/29 05:27:32 yar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.22 2005/12/15 01:04:47 iedowse 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,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20051214: usbd(8) removed +OLD_FILES+=etc/rc.d/usbd +OLD_FILES+=etc/usbd.conf +OLD_FILES+=usr/sbin/usbd +OLD_FILES+=usr/share/man/man8/usbd.8.gz # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience OLD_FILES+=etc/rc.d/ppp-user # 20051012: setkey(8) moved to /sbin/ ==== //depot/projects/hammer/UPDATING#88 (text+ko) ==== @@ -46,6 +46,10 @@ ABI between ipfw(4) and ipfw(8) has been changed. You need to rebuild ipfw(8) when rebuilding kernel. +20051108: + rp(4)'s device files now contain the unit number. + Uses of {cua,tty}R[0-9a-f] should be replaced by {cua,tty}R0[0-9a-f]. + 20051029: /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. Its /etc/rc.conf.d configuration file has been `ppp' from @@ -458,4 +462,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.429 2005/12/11 23:18:58 sam Exp $ +$FreeBSD: src/UPDATING,v 1.430 2005/12/19 03:15:49 obrien Exp $ ==== //depot/projects/hammer/bin/sh/jobs.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.69 2005/09/05 17:57:19 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.70 2005/12/14 17:26:29 maxim Exp $"); #include <fcntl.h> #include <signal.h> @@ -924,6 +924,8 @@ } while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) || (pid > 0 && WIFSTOPPED(status) && !iflag)); in_dowait--; + if (pid == -1 && errno == ECHILD && job != NULL) + job->state = JOBDONE; if (breakwaitcmd != 0) { breakwaitcmd = 0; if (pid <= 0) ==== //depot/projects/hammer/etc/Makefile#45 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.348 2005/11/16 07:24:31 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.349 2005/12/15 01:04:47 iedowse Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -15,7 +15,7 @@ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ - snmpd.config sysctl.conf syslog.conf usbd.conf \ + snmpd.config sysctl.conf syslog.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ==== //depot/projects/hammer/etc/defaults/rc.conf#65 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.266 2005/12/10 20:21:45 dougb Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.268 2005/12/19 10:56:59 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -54,6 +54,7 @@ varsize="32m" # Size of mfs /var if created varmfs_flags="-S -M" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never +cleanvar_enable="YES" # Clean the /var directory local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces rc_conf_files="/etc/rc.conf /etc/rc.conf.local" @@ -475,8 +476,6 @@ lpd_flags="" # Flags to lpd (if enabled). chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. -usbd_enable="NO" # Run the usbd daemon. -usbd_flags="" # Flags to usbd (if enabled). dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. @@ -485,9 +484,12 @@ accounting_enable="NO" # Turn on process accounting (or NO). ibcs2_enable="NO" # Ibcs2 (SCO) emulation loaded at startup (or NO). ibcs2_loaders="coff" # List of additional Ibcs2 loaders (or NO). + +# Emulation/compatibility services provided by /etc/rc.d/abi sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). + osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks ==== //depot/projects/hammer/etc/rc.d/Makefile#44 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.61 2005/12/10 23:23:09 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.62 2005/12/15 01:04:48 iedowse Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -35,7 +35,7 @@ serial sppp swap1 \ syscons sysctl syslogd \ timed tmp \ - ugidfw usbd \ + ugidfw \ var virecover \ watchdogd wpa_supplicant \ ypbind yppasswdd ypserv \ ==== //depot/projects/hammer/etc/rc.d/abi#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.4 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.5 2005/12/19 10:57:00 dougb Exp $ # # PROVIDE: abi @@ -10,12 +10,9 @@ . /etc/rc.subr -echo -n 'Additional ABI support:' - -name="sysvipc" -rcvar=`set_rcvar` -start_cmd="sysv_start" -stop_cmd=":" +name="abi" +start_precmd="${name}_prestart" +start_cmd=":" sysv_start() { @@ -24,12 +21,6 @@ kldload sysvsem >/dev/null 2>&1 kldload sysvshm >/dev/null 2>&1 } -load_rc_config $name -run_rc_command "$1" - -name="linux" -rcvar=`set_rcvar` -start_cmd="linux_start" linux_start() { @@ -41,15 +32,23 @@ /compat/linux/sbin/ldconfig fi } -load_rc_config $name -run_rc_command "$1" + +svr4_start() +{ + echo -n ' svr4' + kldload svr4 > /dev/null 2>&1 +} + +abi_prestart() +{ + echo -n 'Additional ABI support:' + + checkyesno sysvipc_enable && sysv_start + checkyesno linux_enable && linux_start + checkyesno svr4_enable && svr4_start -name="svr4" -rcvar=`set_rcvar` -start_precmd="echo -n ' svr4'" -start_cmd="kldload svr4 > /dev/null 2>&1" + echo '.' +} load_rc_config $name run_rc_command "$1" - -echo '.' ==== //depot/projects/hammer/etc/rc.d/cleanvar#10 (text+ko) ==== @@ -1,11 +1,23 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.10 2005/08/08 09:46:09 pjd Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.11 2005/12/19 10:57:00 dougb Exp $ # # PROVIDE: cleanvar # REQUIRE: mountcritlocal var +. /etc/rc.subr + +name="cleanvar" +rcvar=`set_rcvar` + +start_precmd="${name}_prestart" +start_cmd="${name}_start" +stop_cmd=":" + +extra_commands="reload" +reload_cmd="${name}_start" + purgedir() { local dir file @@ -34,20 +46,28 @@ fi } -# These files must be removed only the first time this script is run -# on boot. -# -[ "$1" != "reload" ] && rm -f /var/run/clean_var /var/spool/lock/clean_var +cleanvar_prestart() +{ + # These files must be removed only the first time this script is run + # on boot. + # + rm -f /var/run/clean_var /var/spool/lock/clean_var +} -if [ -d /var/run -a ! -f /var/run/clean_var ]; then - purgedir /var/run - # And an initial utmp file - (cd /var/run && cp /dev/null utmp && chmod 644 utmp;) - >/var/run/clean_var -fi -if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then - purgedir /var/spool/lock - >/var/spool/lock/clean_var -fi -rm -rf /var/spool/uucp/.Temp/* +cleanvar_start () +{ + if [ -d /var/run -a ! -f /var/run/clean_var ]; then + purgedir /var/run + # And an initial utmp file + (cd /var/run && cp /dev/null utmp && chmod 644 utmp;) + >/var/run/clean_var + fi + if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then + purgedir /var/spool/lock + >/var/spool/lock/clean_var + fi + rm -rf /var/spool/uucp/.Temp/* +} +load_rc_config $name +run_rc_command "$1" ==== //depot/projects/hammer/etc/rc.d/cleartmp#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.13 2005/12/19 10:57:00 dougb Exp $ # # PROVIDE: cleartmp @@ -12,12 +11,12 @@ name="cleartmp" rcvar=`set_rcvar clear_tmp` -start_cmd="cleartmp_start" -stop_cmd=":" -x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix" +start_cmd="${name}_start" cleartmp_start() { + + local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix" echo "Clearing /tmp." # # Prune quickly with one rm, then use find to clean up @@ -27,14 +26,16 @@ (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) + + # Remove X lock files, since they will prevent you from restarting X. + rm -f /tmp/.X[0-9]-lock + + # Create socket directories with correct permissions to avoid + # security problem. + # + rm -fr ${x11_socket_dirs} + mkdir -m 1777 ${x11_socket_dirs} } load_rc_config $name run_rc_command "$1" - -# Remove X lock files, since they will prevent you from restarting X. -rm -f /tmp/.X[0-9]-lock - -# Create socket directories with correct permissions to avoid security problem. -rm -fr ${x11_socket_dirs} -mkdir -m 1777 ${x11_socket_dirs} ==== //depot/projects/hammer/etc/rc.d/syscons#7 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/syscons,v 1.13 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/syscons,v 1.14 2005/12/15 01:04:48 iedowse Exp $ # # PROVIDE: syscons -# REQUIRE: LOGIN usbd +# REQUIRE: LOGIN # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/gnu/usr.bin/grep/grep.1#9 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.27 2005/10/23 11:19:56 stefanf Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.28 2005/12/18 12:09:23 ru Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -201,6 +201,7 @@ .I PATTERN as a list of fixed strings, separated by newlines, any of which is to be matched. +.TP .BR \-P ", " \-\^\-perl-regexp Interpret .I PATTERN ==== //depot/projects/hammer/include/Makefile#52 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.252 2005/12/01 21:46:01 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.253 2005/12/16 18:56:38 phk Exp $ # # Doing a "make install" builds /usr/include. @@ -14,7 +14,7 @@ locale.h malloc.h memory.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - proc_service.h pthread.h \ + printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h runetype.h search.h setjmp.h sgtty.h \ signal.h stab.h \ ==== //depot/projects/hammer/include/dlfcn.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/dlfcn.h,v 1.19 2003/02/13 17:47:43 kan Exp $ + * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $ */ #ifndef _DLFCN_H_ @@ -131,6 +131,8 @@ void (*_lock_release)(void *_lock), void (*_lock_destroy)(void *_lock), void (*_context_destroy)(void *_context)); +void *dlvsym(void * __restrict, const char * __restrict, + const char * __restrict); #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/hammer/lib/libc/gen/dlfcn.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.13 2005/12/18 19:43:32 kan Exp $"); /* * Linkage to services provided by the dynamic linker. @@ -104,6 +104,15 @@ return NULL; } +#pragma weak dlvsym +void * +dlvsym(void * __restrict handle, const char * __restrict name, + const char * __restrict version) +{ + _rtld_error(sorry); + return NULL; +} + #pragma weak dlinfo int dlinfo(void * __restrict handle, int request, void * __restrict p) ==== //depot/projects/hammer/lib/libc/gen/nlist.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.18 2003/02/27 13:40:00 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.19 2005/12/18 04:52:33 marcel Exp $"); #include "namespace.h" #include <sys/param.h> @@ -243,8 +243,8 @@ { struct nlist *p; Elf_Off symoff = 0, symstroff = 0; - Elf_Word symsize = 0, symstrsize = 0; - Elf_Sword cc, i; + Elf_Size symsize = 0, symstrsize = 0; + Elf_Ssize cc, i; int nent = -1; int errsave; Elf_Sym sbuf[1024]; @@ -252,7 +252,7 @@ Elf_Ehdr ehdr; char *strtab = NULL; Elf_Shdr *shdr = NULL; - Elf_Word shdr_size; + Elf_Size shdr_size; void *base; struct stat st; ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.34 2005/12/16 18:56:38 phk Exp $ # stdio sources .PATH: ${.CURDIR}/stdio @@ -23,6 +23,9 @@ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c +SRCS+= xprintf.c xprintf_float.c xprintf_int.c xprintf_str.c +SRCS+= xprintf_hexdump.c xprintf_time.c xprintf_vis.c + MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ flockfile.3 \ fopen.3 fputs.3 \ ==== //depot/projects/hammer/lib/libc/stdio/fread.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fread.c 8.2 (Berkeley) 12/11/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.12 2002/10/12 16:13:37 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.13 2005/12/16 02:50:53 davidxu Exp $"); #include "namespace.h" #include <stdio.h> @@ -47,11 +47,23 @@ #include "local.h" #include "libc_private.h" +/* + * MT-safe version + */ + size_t -fread(buf, size, count, fp) - void * __restrict buf; - size_t size, count; - FILE * __restrict fp; +fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp) +{ + int ret; + + FLOCKFILE(fp); + ret = __fread(buf, size, count, fp); + FUNLOCKFILE(fp); + return (ret); +} + +size_t +__fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp) { size_t resid; char *p; @@ -65,7 +77,6 @@ */ if ((resid = count * size) == 0) return (0); - FLOCKFILE(fp); ORIENT(fp, -1); if (fp->_r < 0) fp->_r = 0; @@ -79,13 +90,11 @@ resid -= r; if (__srefill(fp)) { /* no more input: return partial result */ - FUNLOCKFILE(fp); return ((total - resid) / size); } } (void)memcpy((void *)p, (void *)fp->_p, resid); fp->_r -= resid; fp->_p += resid; - FUNLOCKFILE(fp); return (count); } ==== //depot/projects/hammer/lib/libc/stdio/local.h#14 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.27 2005/09/12 13:46:32 stefanf Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.28 2005/12/16 02:50:53 davidxu Exp $ */ #include <sys/types.h> /* for off_t */ @@ -78,7 +78,8 @@ extern int __vfwprintf(FILE *, const wchar_t *, __va_list); extern int __vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list); - +extern size_t __fread(void * __restrict buf, size_t size, size_t count, + FILE * __restrict fp); extern int __sdidinit; ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.71 2005/12/13 13:23:27 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.72 2005/12/16 18:56:38 phk Exp $"); /* * Actual printf innards. @@ -58,6 +58,7 @@ #include <stdlib.h> #include <string.h> #include <wchar.h> +#include <printf.h> #include <stdarg.h> #include "un-namespace.h" @@ -466,6 +467,12 @@ char sign; /* sign prefix (' ', '+', '-', or \0) */ char thousands_sep; /* locale specific thousands separator */ const char *grouping; /* locale specific numeric grouping rules */ + + if (__use_xprintf == 0 && getenv("USE_XPRINTF")) + __use_xprintf = 1; + if (__use_xprintf > 0) + return (__xvprintf(fp, fmt0, ap)); + #ifndef NO_FLOATING_POINT /* * We can decompose the printed representation of floating ==== //depot/projects/hammer/lib/libc/stdio/vfscanf.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.38 2005/04/08 20:58:47 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.39 2005/12/16 02:50:53 davidxu Exp $"); #include "namespace.h" #include <ctype.h> @@ -412,7 +412,7 @@ } nread += sum; } else { - size_t r = fread((void *)va_arg(ap, char *), 1, + size_t r = __fread((void *)va_arg(ap, char *), 1, width, fp); if (r == 0) ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#19 (text+ko) ==== @@ -1,36 +1,30 @@ /* * Copyright (c) 2003 Daniel M. Eischen <deischen@gdeb.com> - * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> + * Copyright (c) 2005, David Xu <davidxu@freebsd.org> * 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. + * notice unmodified, 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 THE 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.24 2005/10/10 12:15:07 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.25 2005/12/17 09:42:45 davidxu Exp $ */ #include <sys/types.h> ==== //depot/projects/hammer/lib/libthr/thread/thr_detach.c#9 (text+ko) ==== @@ -1,35 +1,31 @@ /* - * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. + * Copyright (c) 2005 David Xu <davidxu@freebsd.org> + * Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org> * 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. + * notice unmodified, 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. * - * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 THE 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. + * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.10 2005/12/17 09:42:45 davidxu Exp $ * - * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.9 2005/04/02 01:20:00 davidxu Exp $ */ #include <sys/types.h> ==== //depot/projects/hammer/lib/libthr/thread/thr_join.c#13 (text+ko) ==== @@ -1,35 +1,30 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512200134.jBK1YHHV050630>