PERFORCE change 57723 for review
Peter Wemm
peter at FreeBSD.org
Mon Jul 19 14:26:59 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=57723
Change 57723 by peter at peter_melody on 2004/07/19 21:26:40
IFC @57721
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#25 integrate
.. //depot/projects/hammer/Makefile#21 integrate
.. //depot/projects/hammer/bin/date/date.1#8 integrate
.. //depot/projects/hammer/contrib/gdb/FREEBSD-deletelist#2 delete
.. //depot/projects/hammer/contrib/smbfs/examples/dot.nsmbrc#2 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#31 integrate
.. //depot/projects/hammer/etc/rc.d/gbde#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#6 integrate
.. //depot/projects/hammer/include/proc_service.h#2 integrate
.. //depot/projects/hammer/lib/Makefile#37 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#15 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/flt_rounds.c#1 branch
.. //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#5 delete
.. //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/arm/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#16 integrate
.. //depot/projects/hammer/lib/libc/gen/fnmatch.3#6 integrate
.. //depot/projects/hammer/lib/libc/gen/frexp.c#1 branch
.. //depot/projects/hammer/lib/libc/gen/glob.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/signbit.3#2 delete
.. //depot/projects/hammer/lib/libc/gen/signbit.c#2 delete
.. //depot/projects/hammer/lib/libc/gen/vis.3#6 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/flt_rounds.c#1 branch
.. //depot/projects/hammer/lib/libc/i386/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/ia64/gen/flt_rounds.c#1 branch
.. //depot/projects/hammer/lib/libc/ia64/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/powerpc/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libc/powerpc/gen/makecontext.c#2 integrate
.. //depot/projects/hammer/lib/libc/powerpc/gen/signalcontext.c#1 branch
.. //depot/projects/hammer/lib/libc/regex/grot/Makefile#4 integrate
.. //depot/projects/hammer/lib/libc/regex/grot/debug.c#2 integrate
.. //depot/projects/hammer/lib/libc/regex/grot/limits.h#2 delete
.. //depot/projects/hammer/lib/libc/regex/grot/stdlib.h#2 delete
.. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/sparc64/gen/frexp.c#2 delete
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#27 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#18 integrate
.. //depot/projects/hammer/lib/libthread_db/Makefile#2 integrate
.. //depot/projects/hammer/lib/libthread_db/arch/alpha/libc_r_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/alpha/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/amd64/libc_r_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/amd64/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/i386/libc_r_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/i386/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/ia64/libc_r_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/ia64/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/sparc64/libc_r_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/arch/sparc64/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/include/thread_db.h#2 delete
.. //depot/projects/hammer/lib/libthread_db/include/thread_db_int.h#2 delete
.. //depot/projects/hammer/lib/libthread_db/libc_r_db.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/libthr_db.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/pthread/Makefile#2 delete
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.c#2 delete
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.h#2 delete
.. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db_i386.c#2 delete
.. //depot/projects/hammer/lib/libthread_db/src/Makefile#2 delete
.. //depot/projects/hammer/lib/libthread_db/src/thread_db.c#2 delete
.. //depot/projects/hammer/lib/libthread_db/thread_db.c#1 branch
.. //depot/projects/hammer/lib/libthread_db/thread_db.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/thread_db_int.h#1 branch
.. //depot/projects/hammer/lib/msun/Makefile#15 integrate
.. //depot/projects/hammer/lib/msun/man/signbit.3#1 branch
.. //depot/projects/hammer/lib/msun/src/math.h#21 integrate
.. //depot/projects/hammer/lib/msun/src/s_signbit.c#1 branch
.. //depot/projects/hammer/sbin/dumpon/dumpon.8#5 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#5 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#4 integrate
.. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#3 integrate
.. //depot/projects/hammer/sbin/geom/class/label/glabel.8#5 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#2 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#5 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#5 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#5 integrate
.. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.8#6 integrate
.. //depot/projects/hammer/sbin/reboot/boot_i386.8#6 integrate
.. //depot/projects/hammer/share/man/man4/axe.4#5 integrate
.. //depot/projects/hammer/share/man/man4/netgraph.4#6 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#31 integrate
.. //depot/projects/hammer/share/man/man9/suser.9#4 integrate
.. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#15 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#32 integrate
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#18 integrate
.. //depot/projects/hammer/sys/alpha/include/pmap.h#11 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#24 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#46 integrate
.. //depot/projects/hammer/sys/amd64/include/float.h#11 integrate
.. //depot/projects/hammer/sys/arm/arm/db_trace.c#3 integrate
.. //depot/projects/hammer/sys/arm/include/float.h#2 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#22 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#11 integrate
.. //depot/projects/hammer/sys/conf/NOTES#55 integrate
.. //depot/projects/hammer/sys/conf/options#47 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#10 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#38 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#10 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#5 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#26 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#11 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.c#18 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axe.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#43 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.c#8 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#8 integrate
.. //depot/projects/hammer/sys/geom/nop/g_nop.c#3 integrate
.. //depot/projects/hammer/sys/geom/nop/g_nop.h#2 integrate
.. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#3 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#25 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#38 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#46 integrate
.. //depot/projects/hammer/sys/i386/include/float.h#7 integrate
.. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#31 integrate
.. //depot/projects/hammer/sys/ia64/include/float.h#6 integrate
.. //depot/projects/hammer/sys/ia64/include/pmap.h#14 integrate
.. //depot/projects/hammer/sys/isa/psm.c#18 integrate
.. //depot/projects/hammer/sys/kern/bus_if.m#6 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#32 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#37 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_malloc.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#59 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#23 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#40 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#24 integrate
.. //depot/projects/hammer/sys/kern/sys_process.c#17 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#34 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#32 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#20 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#35 integrate
.. //depot/projects/hammer/sys/net/if.c#23 integrate
.. //depot/projects/hammer/sys/net/netisr.c#6 integrate
.. //depot/projects/hammer/sys/netatalk/at_control.c#6 integrate
.. //depot/projects/hammer/sys/netatm/uni/unisig_subr.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#17 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#33 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#18 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#15 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#8 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#32 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#21 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#3 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fdcvar.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#16 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC.hints#1 branch
.. //depot/projects/hammer/sys/powerpc/include/float.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/ucontext.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#24 integrate
.. //depot/projects/hammer/sys/sys/bus.h#12 integrate
.. //depot/projects/hammer/sys/sys/malloc.h#8 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#26 integrate
.. //depot/projects/hammer/sys/sys/mount.h#22 integrate
.. //depot/projects/hammer/sys/sys/resourcevar.h#11 integrate
.. //depot/projects/hammer/sys/sys/sched.h#11 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#8 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#28 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#18 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#31 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#17 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#30 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/locale/test-towctrans.c#2 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/regex/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.c#2 integrate
.. //depot/projects/hammer/tools/regression/netatalk/simple_send/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netatalk/simple_send/simple_send.c#1 branch
.. //depot/projects/hammer/tools/regression/security/proc_to_proc/scenario.c#2 integrate
.. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#1 branch
.. //depot/projects/hammer/usr.bin/apply/apply.1#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#20 integrate
.. //depot/projects/hammer/usr.bin/finger/finger.1#5 integrate
.. //depot/projects/hammer/usr.bin/fmt/fmt.1#2 integrate
.. //depot/projects/hammer/usr.bin/hexdump/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/lam/lam.c#2 integrate
.. //depot/projects/hammer/usr.bin/look/look.1#4 integrate
.. //depot/projects/hammer/usr.bin/look/look.c#3 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#12 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.1#3 integrate
.. //depot/projects/hammer/usr.bin/sed/sed.1#7 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.1#10 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#17 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.h#10 integrate
.. //depot/projects/hammer/usr.bin/truss/alpha-fbsd.c#5 integrate
.. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#2 integrate
.. //depot/projects/hammer/usr.bin/truss/extern.h#6 integrate
.. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#6 integrate
.. //depot/projects/hammer/usr.bin/truss/i386-linux.c#5 integrate
.. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#7 integrate
.. //depot/projects/hammer/usr.bin/truss/main.c#8 integrate
.. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#5 integrate
.. //depot/projects/hammer/usr.bin/truss/syscall.h#5 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#13 integrate
.. //depot/projects/hammer/usr.bin/wall/wall.1#3 integrate
.. //depot/projects/hammer/usr.bin/write/write.1#3 integrate
.. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.8#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/command.c#7 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ipcp.c#6 integrate
.. //depot/projects/hammer/usr.sbin/ppp/log.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/log.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#10 integrate
.. //depot/projects/hammer/usr.sbin/ppp/radius.c#8 integrate
.. //depot/projects/hammer/usr.sbin/ppp/radius.h#4 integrate
Differences ...
==== //depot/projects/hammer/MAINTAINERS#25 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.92 2004/07/02 19:40:36 pjd Exp $
+$FreeBSD: src/MAINTAINERS,v 1.95 2004/07/17 20:22:24 alfred Exp $
subsystem login notes
-----------------------------
@@ -97,7 +97,10 @@
geom_nop pjd Pre-commit review requested.
geom_stripe pjd Pre-commit review requested.
sbin/geom pjd Pre-commit review requested.
-
+nfs alfred Will be happy to review code, but not mandatory.
+rpc.lockd alfred Will be happy to review code, but not mandatory.
+truss alfred Will be happy to review code, but not mandatory.
+rpc alfred Pre-commit review requested.
Following are the entries from the Makefiles, and a few other sources.
Please remove stale entries from both their origin, and this file.
==== //depot/projects/hammer/Makefile#21 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.301 2004/07/16 02:51:28 marcel Exp $
+# $FreeBSD: src/Makefile,v 1.304 2004/07/18 18:55:31 markm Exp $
#
# The user-driven targets are:
#
@@ -144,7 +144,7 @@
# Set a reasonable default
.MAIN: all
-.if defined(DESTDIR)
+.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
.if make(world)
STARTTIME!= LC_ALL=C date
.endif
@@ -187,8 +187,12 @@
@echo "installation without also building and installing a new"
@echo "kernel. This can be dangerous. Please read the handbook,"
@echo "'Using make world', for how to upgrade your system."
- @echo "Define DESTDIR to the where you want to install FreeBSD,
+ @echo "Define DESTDIR to where you want to install FreeBSD,"
@echo "including /, to override this warning and proceed as usual."
+ @echo "You may get the historical 'make world' behavior by defining"
+ @echo "HISTORICAL_MAKE_WORLD. You should understand the implications"
+ @echo "before doing this."
+ @echo ""
@echo "Bailing out now..."
@false
.endif
==== //depot/projects/hammer/bin/date/date.1#8 (text+ko) ====
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.66 2004/07/03 00:03:25 ru Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.67 2004/07/17 00:26:31 alfred Exp $
.\"
.Dd November 17, 1993
.Dt DATE 1
@@ -328,6 +328,14 @@
sets the time to
.Li "2:32 PM" ,
without modifying the date.
+.Pp
+Finally the command:
+.Pp
+.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s"""
+.Pp
+can be used to parse the ouput from
+.Nm
+and express it in epoch time.
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
==== //depot/projects/hammer/contrib/smbfs/examples/dot.nsmbrc#2 (text+ko) ====
@@ -1,10 +1,11 @@
# $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $
+# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2 2004/07/17 14:38:42 bp Exp $
#
# Example for .nsmbrc file
#
# smbfs lookups configuration files in next order:
# 1. ~/.nsmbrc
-# 2. /usr/local/etc/nsmb.conf - if this file found it will
+# 2. /etc/nsmb.conf - if this file found it will
# override values with same keys from user files.
#
#
==== //depot/projects/hammer/etc/defaults/rc.conf#31 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.210 2004/06/30 15:58:46 imp Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.211 2004/07/18 18:01:47 simon Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -50,6 +50,8 @@
# Experimental - test before enabling
gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab
gbde_devices="NO" # Devices to automatically attach (list, or AUTO)
+gbde_attach_attempts="3" # Number of times to attempt attaching gbde devices
+gbde_lockdir="/etc" # Where to look for gbde lockfiles
gbde_swap_enable="NO" # Set to YES to automatically initialize gbde swap
# devices listed in fstab with a random one-shot key
==== //depot/projects/hammer/etc/rc.d/gbde#4 (text+ko) ====
@@ -3,7 +3,7 @@
# This file, originally written by Garrett A. Wollman, is in the public
# domain.
#
-# $FreeBSD: src/etc/rc.d/gbde,v 1.4 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/gbde,v 1.5 2004/07/18 18:01:47 simon Exp $
#
# PROVIDE: disks
@@ -81,10 +81,20 @@
for device in $gbde_devices; do
parentdev=${device%.bde}
parent=${parentdev#/dev/}
- eval "lock=\${gbde_lock_${parent}-\"/etc/${parent}.lock\"}"
- if [ -e $lock ]; then
+ eval "lock=\${gbde_lock_${parent}-\"${gbde_lockdir}/${parent}.lock\"}"
+ if [ -e "${lock}" -a ! -e "${device}" ]; then
echo "Configuring Disk Encryption for ${device}."
- gbde attach ${parentdev} -l ${lock}
+
+ count=1
+ while [ ${count} -le ${gbde_attach_attempts} ]; do
+ gbde attach ${parentdev} -l ${lock}
+ if [ -e ${device} ]; then
+ break
+ fi
+ echo "Attach failed; attempt ${count} of ${gbde_attach_attempts}."
+ count=$((${count} + 1))
+ done
+
fi
done
}
==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.2 2004/07/16 06:11:48 davidxu Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.3 2004/07/17 17:08:13 marcel Exp $ */
/* FreeBSD libthread_db assisted debugging support.
Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -997,26 +997,13 @@
}
ps_err_e
-ps_pdread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len)
+ps_pread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len)
{
return target_read_memory ((CORE_ADDR) addr, buf, len);
}
ps_err_e
-ps_pdwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf,
- size_t len)
-{
- return target_write_memory ((CORE_ADDR) addr, (void *)buf, len);
-}
-
-ps_err_e
-ps_ptread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len)
-{
- return target_read_memory ((CORE_ADDR) addr, buf, len);
-}
-
-ps_err_e
-ps_ptwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf,
+ps_pwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf,
size_t len)
{
return target_write_memory ((CORE_ADDR) addr, (void *)buf, len);
@@ -1090,10 +1077,3 @@
return PS_ERR;
return PS_OK;
}
-
-pid_t
-ps_getpid (struct ps_prochandle *ph)
-{
- return ph->pid;
-}
-
==== //depot/projects/hammer/gnu/usr.bin/tar/Makefile#6 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.23 2004/06/04 00:39:46 kientzle Exp $
+# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.24 2004/07/17 06:03:47 kientzle Exp $
TARDIR= ${.CURDIR}/../../../contrib/tar
.PATH: ${TARDIR}/lib ${TARDIR}/src
PROG= gtar
-.if !defined(WITH_BSDTAR)
+.if defined(WITH_GTAR)
SYMLINKS= ${BINDIR}/gtar ${BINDIR}/tar
MLINKS= gtar.1 tar.1
.endif
==== //depot/projects/hammer/include/proc_service.h#2 (text+ko) ====
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
+ * Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -10,18 +11,11 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS 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)
@@ -30,74 +24,42 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/proc_service.h,v 1.1 2004/07/15 03:43:18 davidxu Exp $
+ * $FreeBSD: src/include/proc_service.h,v 1.2 2004/07/17 17:05:12 marcel Exp $
*/
#ifndef _PROC_SERVICE_H_
-#define _PROC_SERVICE_H_
+#define _PROC_SERVICE_H_
#include <sys/types.h>
#include <sys/procfs.h>
-struct ps_prochandle;
+typedef enum {
+ PS_OK = 0, /* No errors. */
+ PS_ERR, /* Generic error. */
+ PS_BADADDR, /* Bad address. */
+ PS_BADLID, /* Bad LWP Id. */
+ PS_BADPID, /* Bad process Id. */
+ PS_NOFREGS, /* FPU register set not available. */
+ PS_NOSYM /* Symbol not found. */
+} ps_err_e;
-typedef enum
-{
- PS_OK,
- PS_ERR,
- PS_BADPID,
- PS_BADLID,
- PS_BADADDR,
- PS_NOSYM,
- PS_NOFREGS
-} ps_err_e;
+struct ps_prochandle; /* Opaque type. Defined by the implementor. */
-/*
- * Every program that links libthread_db must provide a set of process control
- * primitives to access memory and registers in the target process, to start
- * and to stop the target process, and to look up symbols in the target process.
- */
+__BEGIN_DECLS
+ps_err_e ps_lcontinue(struct ps_prochandle *, lwpid_t);
+ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, prfpregset_t *);
+ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t);
+ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const prfpregset_t *);
+ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t);
+ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t);
+ps_err_e ps_pcontinue(struct ps_prochandle *);
+ps_err_e ps_pdmodel(struct ps_prochandle *, int *);
+ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *,
+ psaddr_t *);
+void ps_plog(const char *, ...);
+ps_err_e ps_pread(struct ps_prochandle *, psaddr_t, void *, size_t);
+ps_err_e ps_pstop(struct ps_prochandle *);
+ps_err_e ps_pwrite(struct ps_prochandle *, psaddr_t, const void *, size_t);
+__END_DECLS
-#if 0
-ps_err_e ps_pdmodel(struct ps_prochandle *ph, int *data_model);
-#endif
-ps_err_e ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name,
- const char *sym_name , psaddr_t *sym_addr);
-#if 0
-ps_err_e ps_pglobal_sym(struct ps_prochandle *ph, const char *object_name,
- const char *sym_name , ps_sym_t *sym);
-ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t addr, void *buf,
- size_t size);
-ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf,
- size_t size);
-#endif
-ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t addr, void *buf,
- size_t size);
-ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf,
- size_t size);
-ps_err_e ps_ptread(struct ps_prochandle *ph, psaddr_t addr, void *buf,
- size_t size);
-ps_err_e ps_ptwrite(struct ps_prochandle *ph, psaddr_t addr, const void *buf,
- size_t size);
-ps_err_e ps_pstop(struct ps_prochandle *ph);
-ps_err_e ps_pcontinue(struct ps_prochandle *ph);
-ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid);
-ps_err_e ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid);
-ps_err_e ps_lgetregs(struct ps_prochandle *ph, lwpid_t lwpid,
- prgregset_t gregset);
-ps_err_e ps_lsetregs(struct ps_prochandle *ph, lwpid_t lwpid,
- const prgregset_t gregset);
-ps_err_e ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lwpid,
- prfpregset_t *fpregset);
-ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lwpid,
- const prfpregset_t *fpregset);
-#if 0
-ps_err_e ps_pauxv(struct ps_prochandle *ph, const auxv_t **auxp);
-ps_err_e ps_kill(struct ps_prochandle *ph, int sig);
-ps_err_e ps_lrolltoaddr(struct ps_prochandle *ph, lwpid_t lwpid,
- psaddr_t go_addr, psaddr_t stop_addr);
-#endif
-void ps_plog(const char *fmt, ...);
-pid_t ps_getpid (struct ps_prochandle *ph);
-
-#endif
+#endif /* _PROC_SERVICE_H_ */
==== //depot/projects/hammer/lib/Makefile#37 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.186 2004/07/07 22:48:30 emax Exp $
+# $FreeBSD: src/lib/Makefile,v 1.188 2004/07/19 12:20:10 grehan Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -31,8 +31,8 @@
libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \
${_libngatm} libopie libpam libpanel libpcap \
${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
- ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \
- ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz
+ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
+ libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
_csu=csu/${MACHINE_ARCH}-elf
@@ -93,7 +93,7 @@
_libsmb= libsmb
.endif
-.if ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBPTHREAD)
+.if !defined(NOLIBPTHREAD)
_libpthread= libpthread
.endif
@@ -102,6 +102,10 @@
_libthr= libthr
.endif
+.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
+_libthread_db= libthread_db
+.endif
+
.if !defined(NO_USB)
_libusbhid= libusbhid
.endif
==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#7 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.13 2004/07/09 03:32:39 das Exp $
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.14 2004/07/18 21:23:38 das Exp $
-SRCS+= _setjmp.S fabs.S frexp.c infinity.c ldexp.c modf.c setjmp.S
+SRCS+= _setjmp.S fabs.S infinity.c ldexp.c modf.c setjmp.S
SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
fpsetround.c fpsetsticky.c
==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#15 (text+ko) ====
@@ -1,9 +1,8 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.25 2004/07/09 03:32:39 das Exp $
+# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.27 2004/07/19 08:17:24 das Exp $
SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \
fabs.S modf.S \
- frexp.c infinity.c ldexp.c \
- makecontext.c signalcontext.c \
- fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
+ infinity.c ldexp.c makecontext.c signalcontext.c \
+ flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c
==== //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#3 (text+ko) ====
@@ -1,6 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.2 2004/07/09 03:32:40 das Exp $
+# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.3 2004/07/18 21:23:38 das Exp $
-SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c frexp.c \
+SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c \
infinity.c ldexp.c makecontext.c modf.c \
setjmp.S signalcontext.c sigsetjmp.S divsi3.S
==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#16 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.112 2004/07/09 03:32:40 das Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.114 2004/07/19 08:16:10 das Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -10,7 +10,7 @@
crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
exec.c fmtcheck.c fmtmsg.c fnmatch.c \
- fpclassify.c fstab.c ftok.c fts.c ftw.c \
+ fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \
getbootfile.c getbsize.c \
getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
@@ -25,8 +25,7 @@
raise.c readdir.c readpassphrase.c rewinddir.c \
scandir.c seed48.c seekdir.c sem.c semctl.c \
setdomainname.c sethostname.c setjmperr.c setmode.c \
- setproctitle.c setprogname.c \
- siginterrupt.c siglist.c signal.c signbit.c \
+ setproctitle.c setprogname.c siginterrupt.c siglist.c signal.c \
sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \
sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \
@@ -57,7 +56,7 @@
scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \
sem_open.3 sem_post.3 sem_wait.3 \
setjmp.3 setmode.3 setproctitle.3 shm_open.3 \
- siginterrupt.3 signal.3 signbit.3 sigsetops.3 sleep.3 \
+ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \
statvfs.3 stringlist.3 \
strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \
tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \
==== //depot/projects/hammer/lib/libc/gen/fnmatch.3#6 (text+ko) ====
@@ -32,9 +32,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fnmatch.3 8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.17 2004/07/03 22:30:08 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.18 2004/07/18 06:56:40 tjr Exp $
.\"
-.Dd April 28, 1995
+.Dd July 18, 2004
.Dt FNMATCH 3
.Os
.Sh NAME
@@ -134,10 +134,14 @@
.Xr glob 3 ,
.Xr regex 3
.Sh STANDARDS
-The
+The current implementation of the
.Fn fnmatch
-function conforms to
+function
+.Em does not
+conform to
.St -p1003.2 .
+Collating symbol expressions, equivalence class expressions and
+character class expressions are not supported.
.Sh HISTORY
The
.Fn fnmatch
==== //depot/projects/hammer/lib/libc/gen/glob.3#4 (text+ko) ====
@@ -32,9 +32,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.25 2003/09/10 19:24:32 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.26 2004/07/18 10:11:27 tjr Exp $
.\"
-.Dd April 16, 1994
+.Dd July 18, 2004
.Dt GLOB 3
.Os
.Sh NAME
@@ -423,12 +423,15 @@
.Xr fnmatch 3 ,
.Xr regexp 3
.Sh STANDARDS
-The
+The current implementation of the
.Fn glob
-function is expected to be
-.St -p1003.2
-compatible with the exception
-that the flags
+function
+.Em does not
+conform to
+.St -p1003.2 .
+Collating symbol expressions, equivalence class expressions and
+character class expressions are not supported.
+The flags
.Dv GLOB_ALTDIRFUNC ,
.Dv GLOB_BRACE ,
.Dv GLOB_LIMIT ,
@@ -440,8 +443,10 @@
.Fa gl_matchc
and
.Fa gl_flags
+are extensions to the
+.Tn POSIX
+standard and
should not be used by applications striving for strict
-.Tn POSIX
conformance.
.Sh HISTORY
The
==== //depot/projects/hammer/lib/libc/gen/vis.3#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.25 2004/07/02 23:52:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.26 2004/07/17 12:27:25 tjr Exp $
.\"
.Dd March 21, 2004
.Dt VIS 3
@@ -182,7 +182,7 @@
Use an
.Ql M
to represent meta characters (characters with the 8th
-bit set), and use carat
+bit set), and use caret
.Ql ^
to represent control characters see
.Pf ( Xr iscntrl 3 ) .
==== //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#5 (text+ko) ====
@@ -1,6 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.19 2004/07/09 03:32:40 das Exp $
+# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.21 2004/07/19 08:17:24 das Exp $
-SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \
- infinity.c ldexp.c makecontext.c modf.S \
+SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S \
+ flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \
rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S
==== //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#7 (text+ko) ====
@@ -1,8 +1,9 @@
-# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.9 2004/07/09 03:32:40 das Exp $
+# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.11 2004/07/19 08:17:24 das Exp $
SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \
- fpgetmask.c fpgetround.c fpsetmask.c fpsetround.c frexp.c infinity.c \
+ flt_rounds.c fpgetmask.c fpgetround.c fpsetmask.c \
+ fpsetround.c infinity.c \
ldexp.c makecontext.c modf.c setjmp.S signalcontext.c sigsetjmp.S
# The following may go away if function _Unwind_FindTableEntry()
==== //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#4 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.4 2004/07/09 03:32:40 das Exp $
+# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.6 2004/07/19 12:08:03 grehan Exp $
SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
- fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c frexp.c \
+ fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \
infinity.c ldexp.c makecontext.c modf.c _setjmp.S \
- setjmp.S sigsetjmp.S syncicache.c
+ setjmp.S sigsetjmp.S signalcontext.c syncicache.c
==== //depot/projects/hammer/lib/libc/powerpc/gen/makecontext.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.1 2004/03/02 06:22:24 grehan Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.2 2004/07/19 12:05:07 grehan Exp $");
#include <sys/param.h>
@@ -113,7 +113,7 @@
* Use caller-saved regs 14/15 to hold params that _ctx_start
* will use to invoke the user-supplied func
*/
- mc->mc_lr = (uint32_t) _ctx_start;
+ mc->mc_srr0 = (uint32_t) _ctx_start;
mc->mc_gpr[1] = (uint32_t) sp; /* new stack pointer */
mc->mc_gpr[14] = (uint32_t) start; /* r14 <- start */
mc->mc_gpr[15] = (uint32_t) ucp; /* r15 <- ucp */
==== //depot/projects/hammer/lib/libc/regex/grot/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.2 2000/07/10 06:10:47 green Exp $
+# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.4 2004/07/19 08:48:17 tjr Exp $
# You probably want to take -DREDEBUG out of CFLAGS, and put something like
# -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
# internal assertion checking). Take -Dconst= out for an ANSI compiler.
@@ -24,7 +24,7 @@
HMISSING =
SRCMISSING = split.c
OBJMISSING = split.o
-H = cclass.h cname.h regex2.h utils.h $(HMISSING)
+H = cname.h regex2.h utils.h $(HMISSING)
REGSRC = regcomp.c regerror.c regexec.c regfree.c engine.c
SRC = $(REGSRC) debug.c main.c $(SRCMISSING)
@@ -39,7 +39,7 @@
.SUFFIXES: .ih .h
.c.ih:
- ./mkh $(MKHFLAGS) -p $< >$@
+ sh mkh $(MKHFLAGS) -p $< >$@
default: r
@@ -48,14 +48,16 @@
o: $(OBJPRODN)
-REGEXHSRC = regex2.h reg*.c
+REGEXHSRC = ../regex2.h ../reg*.c
h: $(REGEXHSRC)
- ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
+ sh mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
rm -f regex.tmp
+regex.h: h
+
regcomp.o regexec.o regfree.o debug.o: utils.h regex.h regex2.h
-regcomp.o: cclass.h cname.h regcomp.ih
+regcomp.o: cname.h regcomp.ih
regexec.o: engine.c engine.ih
regerror.o: regerror.ih
regerror.o: utils.h
@@ -83,42 +85,14 @@
-time ./re -el <tests
-time ./re -cs -el <tests
-e: echeck re tests
- ./re -d <tests | awk -f echeck
-
l: $(LINTC)
lint $(LINTFLAGS) -h $(LINTC) 2>&1 | egrep -v '$(JUNKLINT)' | tee lint
-fullprint:
- ti README WHATSNEW notes todo | hplist
- ti *.h | hplist
- hplist *.c
- hplist regex.3 regex.7
-
-print:
- ti README WHATSNEW notes todo | hplist
- ti *.h | hplist
- hplist reg*.c engine.c
-
clean: tidy
rm -f *.o *.s *.ih re
tidy:
- rm -f junk* core dtr regex.tmp lint
+ rm -f junk* core regex.tmp lint
spotless: clean
- rm -f mkh regex.h
-
-mkh: /usr/henry/bin/mkh
- cp $? $@
-
-DTRH = cclass.h cname.h regex2.h utils.h limits.h stdlib.h
-DTR = README WHATSNEW Makefile Makefile.44bsd mkh regex.3 regex.7 tests $(DTRH) $(SRC)
-dtr: $(DTR)
- makedtr $(DTR) >$@
-
-cio: $(DTR)
- cio $(DTR)
-
-rdf: $(DTR)
- rcsdiff -c $(DTR) 2>&1 | p
+ rm -f regex.h
==== //depot/projects/hammer/lib/libc/regex/grot/debug.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.3 2002/03/22 21:52:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.4 2004/07/19 08:28:53 tjr Exp $");
#include <stdio.h>
#include <string.h>
@@ -8,6 +8,8 @@
#include <stdlib.h>
#include <sys/types.h>
#include <regex.h>
+#include <wchar.h>
+#include <wctype.h>
#include "utils.h"
#include "regex2.h"
@@ -26,10 +28,8 @@
int i;
int c;
int last;
- int nincat[NC];
- fprintf(d, "%ld states, %d categories", (long)g->nstates,
- g->ncategories);
+ fprintf(d, "%ld states", (long)g->nstates);
fprintf(d, ", first %ld last %ld", (long)g->firststate,
(long)g->laststate);
if (g->iflags&USEBOL)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list