PERFORCE change 30104 for review
Peter Wemm
peter at FreeBSD.org
Wed Apr 30 11:33:08 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30104
Change 30104 by peter at peter_daintree on 2003/04/30 11:32:05
IFC @30102 (initial pass, I think I need -i for the rest)
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#12 integrate
.. //depot/projects/hammer/etc/netstart#2 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#8 integrate
.. //depot/projects/hammer/etc/rc.d/ipnat#6 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#4 integrate
.. //depot/projects/hammer/etc/rc.d/motd#3 integrate
.. //depot/projects/hammer/etc/rc.d/network_ipv6#3 integrate
.. //depot/projects/hammer/etc/rc.subr#6 integrate
.. //depot/projects/hammer/etc/services#3 integrate
.. //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#4 integrate
.. //depot/projects/hammer/gnu/lib/libstdc++/config.h#4 integrate
.. //depot/projects/hammer/include/limits.h#6 integrate
.. //depot/projects/hammer/include/wchar.h#11 integrate
.. //depot/projects/hammer/lib/Makefile#8 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#3 branch
.. //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/confstr.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/fmtmsg.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/getgrent.c#7 integrate
.. //depot/projects/hammer/lib/libc/gen/getpwent.c#5 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#3 integrate
.. //depot/projects/hammer/lib/libc/include/namespace.h#6 integrate
.. //depot/projects/hammer/lib/libc/include/un-namespace.h#5 integrate
.. //depot/projects/hammer/lib/libc/locale/setlocale.c#2 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#8 integrate
.. //depot/projects/hammer/lib/libc/net/gethostbydns.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/getnameinfo.c#2 integrate
.. //depot/projects/hammer/lib/libc/net/hesiod.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/if_nametoindex.c#3 integrate
.. //depot/projects/hammer/lib/libc/nls/msgcat.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdlib/realpath.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdtime/strptime.c#6 integrate
.. //depot/projects/hammer/lib/libc/string/strerror.c#3 integrate
.. //depot/projects/hammer/lib/libc/string/strlcat.c#2 integrate
.. //depot/projects/hammer/lib/libc/string/strlcpy.c#2 integrate
.. //depot/projects/hammer/lib/libc/yp/yplib.c#2 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#11 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#8 integrate
.. //depot/projects/hammer/lib/libncurses/Makefile#10 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_chroot/pam_chroot.c#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_switch.S#4 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#3 integrate
.. //depot/projects/hammer/libexec/Makefile#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#13 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#3 integrate
.. //depot/projects/hammer/secure/lib/Makefile#4 integrate
.. //depot/projects/hammer/secure/lib/Makefile.inc#2 integrate
.. //depot/projects/hammer/secure/libexec/Makefile#3 integrate
.. //depot/projects/hammer/secure/libexec/Makefile.inc#2 integrate
.. //depot/projects/hammer/secure/usr.bin/Makefile#3 integrate
.. //depot/projects/hammer/secure/usr.bin/Makefile.inc#2 integrate
.. //depot/projects/hammer/secure/usr.sbin/Makefile.inc#2 integrate
.. //depot/projects/hammer/share/doc/smm/01.setup/3.t#3 integrate
.. //depot/projects/hammer/share/doc/smm/06.nfs/1.t#3 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ip.4#5 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/trap.c#8 integrate
.. //depot/projects/hammer/sys/alpha/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#8 integrate
.. //depot/projects/hammer/sys/arm/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#2 integrate
.. //depot/projects/hammer/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_all.h#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#11 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#6 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#4 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#5 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#5 integrate
.. //depot/projects/hammer/sys/conf/files#16 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#8 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acapps.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdispat.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdos16.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/acpica/acefi.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acgcc.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acpi.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acresrc.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actables.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl1.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl71.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbhistry.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmbuffer.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcs.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#1 branch
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#1 branch
.. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#1 branch
.. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evsci.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exnames.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg6.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#1 branch
.. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfobj.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psfind.c#2 delete
.. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/pstree.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/pswalk.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsio.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsmemory.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdStream.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#7 integrate
.. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#4 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#7 integrate
.. //depot/projects/hammer/sys/dev/fb/fbreg.h#6 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#9 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#6 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci.c#8 integrate
.. //depot/projects/hammer/sys/dev/firewire/iec13213.h#5 integrate
.. //depot/projects/hammer/sys/dev/firewire/iec68113.h#4 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#9 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#14 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#6 integrate
.. //depot/projects/hammer/sys/dev/kbd/atkbd.c#4 integrate
.. //depot/projects/hammer/sys/dev/mca/mca_bus.c#3 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#11 integrate
.. //depot/projects/hammer/sys/dev/raidframe/rf_types.h#2 integrate
.. //depot/projects/hammer/sys/dev/ray/if_ray.c#4 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/midi/midi.h#2 integrate
.. //depot/projects/hammer/sys/dev/syscons/scmouse.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#10 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#6 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/autoconf.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#6 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#12 integrate
.. //depot/projects/hammer/sys/i386/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#7 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#8 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#5 integrate
.. //depot/projects/hammer/sys/ia64/include/cpufunc.h#4 integrate
.. //depot/projects/hammer/sys/ia64/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/isa/atkbd_isa.c#2 integrate
.. //depot/projects/hammer/sys/isa/atkbdc_isa.c#2 integrate
.. //depot/projects/hammer/sys/isa/ppc.c#3 integrate
.. //depot/projects/hammer/sys/isa/psm.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#22 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#9 integrate
.. //depot/projects/hammer/sys/kern/subr_mbuf.c#7 integrate
.. //depot/projects/hammer/sys/kern/subr_scanf.c#4 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#6 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#6 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#12 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#9 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#11 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/libkern/quad.h#3 integrate
.. //depot/projects/hammer/sys/libkern/strtol.c#2 integrate
.. //depot/projects/hammer/sys/libkern/strtoq.c#2 integrate
.. //depot/projects/hammer/sys/libkern/strtoul.c#2 integrate
.. //depot/projects/hammer/sys/libkern/strtouq.c#2 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile#4 integrate
.. //depot/projects/hammer/sys/net/if.c#7 integrate
.. //depot/projects/hammer/sys/net/if_atm.h#3 integrate
.. //depot/projects/hammer/sys/net/if_atmsubr.c#6 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#13 integrate
.. //depot/projects/hammer/sys/net/if_media.c#3 integrate
.. //depot/projects/hammer/sys/net/if_media.h#3 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/hammer/sys/netinet/in.h#7 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#8 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#10 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#12 integrate
.. //depot/projects/hammer/sys/netinet6/ah_output.c#3 integrate
.. //depot/projects/hammer/sys/netinet6/esp_output.c#3 integrate
.. //depot/projects/hammer/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/hammer/sys/netinet6/in6.h#3 integrate
.. //depot/projects/hammer/sys/netinet6/in6_cksum.c#4 integrate
.. //depot/projects/hammer/sys/netinet6/ipsec.c#4 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#6 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/hammer/sys/pc98/pc98/clock.c#6 integrate
.. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#3 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_en_pci.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/asm.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/limits.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/trap.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/utrap.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/locore.S#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_exception.S#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_locore.S#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/support.S#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#2 delete
.. //depot/projects/hammer/sys/sys/cdio.h#2 integrate
.. //depot/projects/hammer/sys/sys/param.h#11 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#11 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#10 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#4 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#14 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#11 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#14 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.h#4 integrate
.. //depot/projects/hammer/sys/x86_64/include/limits.h#3 integrate
.. //depot/projects/hammer/usr.bin/Makefile#9 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/vttest/main.c#2 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $
#
# Make command line options:
# -DMAKE_KERBEROS5 to build Kerberos5
@@ -203,13 +203,13 @@
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
BOOTSTRAPPING=${OSRELDATE} \
- -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS
+ -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \
+ -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
- BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS
+ BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
@@ -640,6 +640,12 @@
_strfile= games/fortune/strfile
.endif
+.if ${BOOTSTRAPPING} < 500042
+_groff= gnu/usr.bin/groff
+.else
+_groff= gnu/usr.bin/groff/tmac
+.endif
+
.if ( ${BOOTSTRAPPING} < 450005 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 ))
_uudecode= usr.bin/uudecode
@@ -664,7 +670,7 @@
usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
${_xargs} usr.bin/xinstall ${_yacc} \
usr.sbin/config ${_kbdcontrol} \
- gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
+ gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
==== //depot/projects/hammer/etc/netstart#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/netstart,v 1.60 2001/05/18 09:14:39 brian Exp $
+# $FreeBSD: src/etc/netstart,v 1.62 2003/04/29 15:32:02 imp Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
#
@@ -34,41 +34,33 @@
# the network by hand, this script will do it for you).
#
-# If there is a global system configuration file, suck it in.
-if [ -f /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
-elif [ -f /etc/rc.conf ]; then
- . /etc/rc.conf
-fi
+. /etc/rc.subr
-# Start pccard if necessary
-if [ -r /etc/rc.pccard ]; then
- . /etc/rc.pccard
-fi
-
-if [ -r /etc/rc.network ]; then
- . /etc/rc.network
-else
- echo 'Sorry, I cannot find /etc/rc.network - aborting'
- exit 1
-fi
-
-echo 'Doing stage one network startup:'
-network_pass1
-
-case ${ipv6_enable} in
-[Yy][Ee][Ss])
- if [ -r /etc/rc.network6 ]; then
- . /etc/rc.network6
- else
- echo 'Sorry, I cannot find /etc/rc.network6 - aborting'
- exit 1
- fi
-
- echo 'Doing stage one network6 startup:'
- network6_pass1
- ;;
-esac
+load_rc_config 'XXX'
+/etc/rc.d/pccard start
+/etc/rc.d/devd start
+/etc/rc.d/hostname start
+/etc/rc.d/ipmon start
+/etc/rc.d/ipfilter start
+/etc/rc.d/ipnat start
+/etc/rc.d/ipfs start
+/etc/rc.d/sppp start
+# /etc/rc.d/atm1 start
+# . /etc/rc.d/atm2.sh start
+# . /etc/rc.d/atm3.sh start
+/etc/rc.d/netif start
+/etc/rc.d/ipsec start
+/etc/rc.d/dhclient start
+/etc/rc.d/isdnd start
+/etc/rc.d/ppp-user start
+/etc/rc.d/ipfw start
+/etc/rc.d/network2 start
+/etc/rc.d/ip6fw start
+/etc/rc.d/network_ipv6 start
+/etc/rc.d/mroute6d start
+/etc/rc.d/route6d start
+/etc/rc.d/mrouted start
+/etc/rc.d/routed start
+/etc/rc.d/nisdomain start
exit 0
==== //depot/projects/hammer/etc/rc.d/ipfilter#8 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $
#
# PROVIDE: ipfilter
@@ -42,7 +42,7 @@
# load ipfilter kernel module if needed
if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then
if kldload ipl; then
- echo 'IP-filter module loaded.'
+ info 'IP-filter module loaded.'
else
err 1 'IP-filter module failed to load.'
fi
@@ -79,12 +79,12 @@
echo "Enabling ipfilter."
case ${OSTYPE} in
FreeBSD)
- ${ipfilter_program:-/sbin/ipf} -Fa
+ ${ipfilter_program:-/sbin/ipf} -EFa
if [ -r "${ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} \
-f "${ipfilter_rules}" ${ipfilter_flags}
fi
- ${ipfilter_program:-/sbin/ipf} -6 -Fa
+ ${ipfilter_program:-/sbin/ipf} -6 -EFa
if [ -r "${ipv6_ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} -6 \
-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
==== //depot/projects/hammer/etc/rc.d/ipnat#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $
#
# PROVIDE: ipnat
@@ -44,7 +44,7 @@
# Make sure ipfilter is loaded before continuing
if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then
if kldload ipl; then
- echo 'IP-filter module loaded.'
+ info 'IP-filter module loaded.'
else
err 1 'IP-filter module failed to load.'
fi
@@ -55,10 +55,10 @@
ipnat_start()
{
if [ ! -f ${ipnat_rules} ]; then
- echo -n ' NO IPNAT RULES'
+ warn 'NO IPNAT RULES'
return 0
fi
- echo -n "Installing NAT rules ... "
+ echo -n "Installing NAT rules."
${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
}
==== //depot/projects/hammer/etc/rc.d/ldconfig#4 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.4 2002/09/17 01:48:48 peter Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $
#
# PROVIDE: ldconfig
-# REQUIRE: mountall
+# REQUIRE: mountall mountcritremote
# BEFORE: DAEMON
# KEYWORD: FreeBSD NetBSD
==== //depot/projects/hammer/etc/rc.d/motd#3 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/motd,v 1.4 2002/09/06 16:18:05 gordon Exp $
+# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $
#
# PROVIDE: motd
@@ -18,11 +18,9 @@
case ${OSTYPE} in
FreeBSD)
- T=`mktemp /tmp/_motd.XXXXXX`
PERMS="644"
;;
NetBSD)
- T="/etc/_motd"
PERMS="664"
;;
esac
@@ -40,10 +38,12 @@
case ${OSTYPE} in
FreeBSD)
+ T=`mktemp /tmp/_motd.XXXXXX`
uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
;;
NetBSD)
+ T='/etc/_motd'
sysctl -n kern.version | while read i; do echo $i; break; done > $T
sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T
;;
==== //depot/projects/hammer/etc/rc.d/network_ipv6#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.32 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.33 2003/04/29 12:08:43 jwd Exp $
# From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43
#
@@ -32,6 +32,8 @@
# REQUIRE: network2
# KEYWORD: FreeBSD
+. /etc/rc.subr
+
name="network_ipv6"
rcvar=`set_rcvar ipv6`
start_cmd="network_ipv6_start"
==== //depot/projects/hammer/etc/rc.subr#6 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.10 2003/01/20 19:30:15 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -275,7 +275,7 @@
esac
done'
- debug "in _find_processes: proccheck is ($_proccheck)."
+# debug "in _find_processes: proccheck is ($_proccheck)."
eval $_proccheck
}
==== //depot/projects/hammer/etc/services#3 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $
+# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -2004,6 +2004,8 @@
hacl-test 5305/udp
cfengine 5308/tcp
cfengine 5308/udp
+mdns 5353/tcp #Multicast DNS
+mdns 5353/udp #Multicast DNS
postgresql 5432/tcp #PostgreSQL Database
postgresql 5432/udp #PostgreSQL Database
rplay 5555/udp
==== //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $
+// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.5 2003/04/29 18:10:45 kan Exp $
// Predefined symbols and macros -*- C++ -*-
@@ -104,7 +104,7 @@
#define _GLIBCPP_USE_C99 1
// Define if code specialized for wchar_t should be used.
-/* #undef _GLIBCPP_USE_WCHAR_T */
+#define _GLIBCPP_USE_WCHAR_T 1
// Define if using setrlimit to limit memory usage during 'make check'.
/* #undef _GLIBCPP_MEM_LIMITS */
==== //depot/projects/hammer/gnu/lib/libstdc++/config.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */
+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.6 2003/04/29 18:10:45 kan Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -16,7 +16,7 @@
#define _GLIBCPP_USE_C99 1
// Define if code specialized for wchar_t should be used.
-/* #undef _GLIBCPP_USE_WCHAR_T */
+#define _GLIBCPP_USE_WCHAR_T 1
// Define if using setrlimit to limit memory usage during 'make check'.
/* #undef _GLIBCPP_MEM_LIMITS */
==== //depot/projects/hammer/include/limits.h#6 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)limits.h 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/include/limits.h,v 1.15 2002/12/22 06:38:44 tjr Exp $
+ * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $
*/
#ifndef _LIMITS_H_
@@ -125,7 +125,7 @@
#define MB_LEN_MAX 6 /* 31-bit UTF-8 */
-#include <machine/limits.h>
+#include <sys/limits.h>
#if __POSIX_VISIBLE
#include <sys/syslimits.h>
==== //depot/projects/hammer/include/wchar.h#11 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/wchar.h,v 1.34 2003/03/13 06:29:53 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $
*/
/*-
@@ -69,6 +69,7 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#include <machine/_limits.h>
#ifndef NULL
#define NULL 0
@@ -96,6 +97,11 @@
#define _WINT_T_DECLARED
#endif
+#ifndef WCHAR_MIN
+#define WCHAR_MIN __INT_MIN
+#define WCHAR_MAX __INT_MAX
+#endif
+
#ifndef WEOF
#define WEOF ((wint_t)-1)
#endif
==== //depot/projects/hammer/lib/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $
+# $FreeBSD: src/lib/Makefile,v 1.153 2003/04/30 15:33:50 obrien Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -40,9 +40,11 @@
_csu=csu
.endif
+.if ${MACHINE_ARCH} != "amd64"
.if !defined(NOLIBC_R)
_libc_r= libc_r
.endif
+.endif
.if !defined(NO_BIND)
_libbind= libbind
@@ -71,7 +73,7 @@
.endif
.if ${MACHINE_ARCH} != "powerpc"
-_libdisk=libdisk
+_libdisk= libdisk
.endif
.if ${MACHINE_ARCH} != "amd64"
==== //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#2 (text+ko) ====
@@ -28,17 +28,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.1 2002/10/28 00:15:43 wollman Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.2 2003/04/29 21:13:48 nectar Exp $");
-/*
- * I din't use "namespace.h" here because none of the relevant utilities
- * are threaded, so I'm not concerned about cancellation points or other
- * niceties.
- */
+#include "namespace.h"
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "un-namespace.h"
#ifndef LINE_MAX
#define LINE_MAX _POSIX2_LINE_MAX
@@ -55,7 +52,7 @@
int len;
if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) {
- strlcpy(buf, p, sizeof buf);
+ _strlcpy(buf, p, sizeof buf);
} else {
if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof buf)) < 0)
return 0;
==== //depot/projects/hammer/lib/libc/gen/confstr.c#3 (text+ko) ====
@@ -35,15 +35,16 @@
static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.7 2002/09/19 03:47:36 wollman Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.8 2003/04/29 21:13:48 nectar Exp $");
+#include "namespace.h"
#include <sys/param.h>
-
#include <errno.h>
#include <limits.h>
#include <paths.h>
#include <string.h>
#include <unistd.h>
+#include "un-namespace.h"
size_t
@@ -114,7 +115,7 @@
docopy:
if (len != 0 && buf != NULL)
- strlcpy(buf, p, len);
+ _strlcpy(buf, p, len);
return (strlen(p) + 1);
default:
==== //depot/projects/hammer/lib/libc/gen/fmtmsg.c#3 (text+ko) ====
@@ -25,12 +25,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.3 2002/09/01 01:49:27 mike Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.4 2003/04/29 21:13:48 nectar Exp $");
+#include "namespace.h"
#include <fmtmsg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "un-namespace.h"
/* Default value for MSGVERB. */
#define DFLT_MSGVERB "label:severity:text:action:tag"
@@ -101,13 +103,13 @@
#define INSERT_COLON \
if (*output != '\0') \
- strlcat(output, ": ", size)
+ _strlcat(output, ": ", size)
#define INSERT_NEWLINE \
if (*output != '\0') \
- strlcat(output, "\n", size)
+ _strlcat(output, "\n", size)
#define INSERT_SPACE \
if (*output != '\0') \
- strlcat(output, " ", size)
+ _strlcat(output, " ", size)
/*
* Returns NULL on memory allocation failure, otherwise returns a pointer to
@@ -139,20 +141,20 @@
while ((comp = nextcomp(msgverb)) != NULL) {
if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) {
INSERT_COLON;
- strlcat(output, label, size);
+ _strlcat(output, label, size);
} else if (strcmp(comp, "severity") == 0 && sevname != NULL) {
INSERT_COLON;
- strlcat(output, sevinfo(sev), size);
+ _strlcat(output, sevinfo(sev), size);
} else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) {
INSERT_COLON;
- strlcat(output, text, size);
+ _strlcat(output, text, size);
} else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) {
INSERT_NEWLINE;
- strlcat(output, "TO FIX: ", size);
- strlcat(output, act, size);
+ _strlcat(output, "TO FIX: ", size);
+ _strlcat(output, act, size);
} else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) {
INSERT_SPACE;
- strlcat(output, tag, size);
+ _strlcat(output, tag, size);
}
}
INSERT_NEWLINE;
@@ -171,7 +173,7 @@
char *retval;
if (*lmsgverb == '\0') {
- strlcpy(lmsgverb, msgverb, sizeof(lmsgverb));
+ _strlcpy(lmsgverb, msgverb, sizeof(lmsgverb));
retval = strtok_r(lmsgverb, ":", &state);
} else {
retval = strtok_r(NULL, ":", &state);
==== //depot/projects/hammer/lib/libc/gen/getgrent.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.30 2003/04/29 21:13:48 nectar Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -620,7 +620,7 @@
* pointer for the member list terminator.
*/
adjsize = bufsize - _ALIGNBYTES - sizeof(char *);
- linesize = strlcpy(buffer, hes[0], adjsize);
+ linesize = _strlcpy(buffer, hes[0], adjsize);
if (linesize >= adjsize) {
*errnop = ERANGE;
rv = NS_RETURN;
@@ -721,7 +721,7 @@
rv = NS_NOTFOUND;
switch (how) {
case nss_lt_name:
- if (strlcpy(buffer, name, bufsize) >= bufsize)
+ if (_strlcpy(buffer, name, bufsize) >= bufsize)
goto erange;
break;
case nss_lt_id:
==== //depot/projects/hammer/lib/libc/gen/getpwent.c#5 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list