Date: Sat, 4 Jan 2003 13:23:05 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 23169 for review Message-ID: <200301042123.h04LN5F3078755@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=23169 Change 23169 by peter@peter_overcee on 2003/01/04 13:22:45 IFC @23168 Affected files ... .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#12 integrate .. //depot/projects/ia64/etc/services#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek.sp.ok#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/ia64/include/stdlib.h#16 integrate .. //depot/projects/ia64/include/ulimit.h#2 integrate .. //depot/projects/ia64/include/wordexp.h#2 integrate .. //depot/projects/ia64/lib/libc/gen/exec.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/fts.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getnetgrent.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/popen.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/popen.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/sysctlnametomib.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fscanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/scanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/vscanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc/stdlib/getsubopt.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/grantpt.3#1 branch .. //depot/projects/ia64/lib/libc/stdlib/grantpt.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/insque.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/remque.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#8 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#7 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#7 integrate .. //depot/projects/ia64/lib/libc/string/strerror.c#8 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#5 integrate .. //depot/projects/ia64/lib/libfetch/common.c#8 integrate .. //depot/projects/ia64/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/ia64/libexec/Makefile#9 integrate .. //depot/projects/ia64/libexec/pt_chown/Makefile#1 branch .. //depot/projects/ia64/libexec/pt_chown/pt_chown.c#1 branch .. //depot/projects/ia64/release/Makefile#34 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#32 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#5 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#20 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#7 integrate .. //depot/projects/ia64/share/Makefile#5 integrate .. //depot/projects/ia64/share/man/man4/gif.4#7 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#4 integrate .. //depot/projects/ia64/share/man/man9/sysctl_add_oid.9#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirebusreg.h#2 delete .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#19 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumdaemon.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinuminterrupt.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#8 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#2 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#16 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#10 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#13 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.h#4 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#16 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#51 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_physio.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_disklabel.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_diskmbr.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#16 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#17 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#24 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#32 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#13 integrate .. //depot/projects/ia64/sys/modules/firewire/firewire/Makefile#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/diskslice_machdep.c#7 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#13 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#14 integrate .. //depot/projects/ia64/sys/sys/buf.h#12 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#2 integrate .. //depot/projects/ia64/sys/sys/conf.h#13 integrate .. //depot/projects/ia64/sys/sys/diskpc98.h#3 integrate .. //depot/projects/ia64/sys/sys/dmap.h#3 delete .. //depot/projects/ia64/sys/sys/exec.h#3 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#14 integrate .. //depot/projects/ia64/sys/sys/proc.h#43 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#12 integrate .. //depot/projects/ia64/sys/sys/systm.h#20 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#18 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#7 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#36 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#32 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#14 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/ia64/tools/regression/lib/libc/gen/Makefile#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/gen/test-wordexp.c#1 branch .. //depot/projects/ia64/tools/tools/kernxref/kernxref.sh#5 integrate .. //depot/projects/ia64/usr.bin/Makefile#37 integrate .. //depot/projects/ia64/usr.bin/bzip2recover/Makefile#1 branch .. //depot/projects/ia64/usr.bin/vi/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcrom.c#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#8 integrate Differences ... ==== //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#17 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#18 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -153,7 +153,7 @@ #define ENTER() #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(n) return (i) +#define RETURNI(i) return (i) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif ==== //depot/projects/ia64/etc/services#6 (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.89 2002/12/17 23:59:10 eric Exp $ +# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -447,8 +447,9 @@ mpp 218/udp #Netix Message Posting Protocol uarps 219/tcp #Unisys ARPs uarps 219/udp #Unisys ARPs -imap3 220/tcp #Interactive Mail Access Protocol v3 -imap3 220/udp #Interactive Mail Access Protocol v3 +#imap3@220 was never used and never should have been allocated. See PR 46294. +#imap3 220/tcp #Interactive Mail Access Protocol v3 +#imap3 220/udp #Interactive Mail Access Protocol v3 fln-spx 221/tcp #Berkeley rlogind with SPX auth fln-spx 221/udp #Berkeley rlogind with SPX auth rsh-spx 222/tcp #Berkeley rshd with SPX auth @@ -1039,8 +1040,9 @@ philips-vc 583/udp #Philips Video-Conferencing keyserver 584/tcp keyserver 584/udp -imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, -imap4-ssl 585/udp # use 993 instead) +#imap4-ssl@585 never should have been allocated. See PR 46294. +#imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, +#imap4-ssl 585/udp # use 993 instead) password-chg 586/tcp password-chg 586/udp submission 587/tcp @@ -1721,6 +1723,10 @@ netview-aix-11 1671/udp netview-aix-12 1672/tcp netview-aix-12 1672/udp +l2f 1701/tcp #l2f +l2f 1701/udp #l2f +l2tp 1701/tcp #Layer 2 Tunnelling Protocol +l2tp 1701/udp #Layer 2 Tunnelling Protocol pptp 1723/tcp #Point-to-point tunnelling protocol # IMPORTANT NOTE: See comments for ports 1645/1646 when using older equipment radius 1812/udp #RADIUS authentication protocol (IANA sanctioned) ==== //depot/projects/ia64/games/fortune/datfiles/startrek#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.3 2003/01/04 17:08:23 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -387,7 +387,7 @@ -- Kirk, "Dagger of the Mind", stardate 2715.2 % Only a fool fights in a burning house. - -- Kank the Klingon, "Day of the Dove", stardate unknown + -- Kang the Klingon, "Day of the Dove", stardate unknown % Our missions are peaceful -- not for conquest. When we do battle, it is only because we have no choice. ==== //depot/projects/ia64/games/fortune/datfiles/startrek.sp.ok#2 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $ Adonais Amanda Apella @@ -24,7 +25,7 @@ Hag Hedford Hodin -Kank +Kang Kanuto Kelinda Kelvan ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.62 2002/10/12 21:23:53 mp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.64 2003/01/04 17:51:59 obrien Exp $ .include "../Makefile.inc0" @@ -14,29 +14,31 @@ NOSHARED?=yes PROG= gdb -XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ - breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ - c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c \ - corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ - demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ - exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ - findvar.c fork-child.c gdbarch.c gdbtypes.c \ - infcmd.c inflow.c infptrace.c infrun.c inftarg.c language.c \ +XSRCS= annotate.c arch-utils.c ax-general.c ax-gdb.c bcache.c \ + blockframe.c breakpoint.c buildsym.c complaints.c completer.c \ + copying.c corefile.c corelow.c dcache.c doublest.c event-loop.c \ + event-top.c environ.c eval.c exec.c expprint.c fork-child.c \ + frame.c gdb-events.c gdbarch.c gdbtypes.c infcmd.c inflow.c \ + infptrace.c inf-loop.c infrun.c inftarg.c language.c linespec.c \ + main.c maint.c mdebugread.c mem-break.c memattr.c minsyms.c \ + objfiles.c parse.c printcmd.c regcache.c remote.c \ + remote-utils.c signals.c source.c stabsread.c stack.c symfile.c \ + symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ + typeprint.c ui-file.c ui-out.c utils.c valarith.c valops.c \ + valprint.c values.c wrapper.c \ + cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-out.c \ + cli-script.c cli-script.h cli-setshow.c cli-setshow.h \ + cli-utils.c cli-utils.h \ + serial.c ser-unix.c ser-tcp.c \ + c-exp.y c-lang.c c-typeprint.c c-valprint.c \ + ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ + cp-abi.c gnu-v2-abi.c gnu-v3-abi.c cp-valprint.c demangle.c \ + f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c nlmread.c \ - m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c main.c maint.c \ - mdebugread.c mem-break.c minsyms.c objfiles.c parse.c \ - printcmd.c remote.c remote-utils.c scm-exp.c scm-lang.c \ - scm-valprint.c solib.c source.c stabsread.c stack.c symfile.c \ - symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ - typeprint.c utils.c valarith.c valops.c valprint.c values.c \ - serial.c ser-unix.c ser-tcp.c -XSRCS+= arch-utils.c cp-abi.c completer.c doublest.c event-loop.c \ - event-top.c frame.c gdb-events.c inf-loop.c linespec.c \ - memattr.c regcache.c signals.c solib-svr4.c solib-legacy.c \ - ui-file.c ui-out.c wrapper.c cli-out.c \ - cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-script.c \ - cli-script.h cli-setshow.c cli-setshow.h cli-utils.c cli-utils.h + m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c \ + scm-exp.c scm-lang.c scm-valprint.c \ + coffread.c dbxread.c dwarfread.c dwarf2read.c elfread.c \ + solib.c solib-svr4.c solib-legacy.c XSRCS+= freebsd-uthread.c kvm-fbsd.c SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.10 2003/01/04 17:35:54 fjoe Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -411,30 +411,6 @@ /* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ -static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ -{ - 12, /* eax */ - 11, /* ecx */ - 10, /* edx */ - 9, /* ebx */ - 8, /* esp */ - 7, /* ebp */ - 6, /* esi */ - 5, /* edi */ - 15, /* eip */ - 17, /* eflags */ - 16, /* cs */ - 19, /* ss */ - 4, /* ds */ - 3, /* es */ - 2, /* fs */ - 1, /* gs */ - -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ - -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ - -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ - -1, /* mxcsr */ -}; - static char jmpmap[MAX_NUM_REGS] = /* map reg to jmp_buf */ { 6, /* eax */ @@ -463,18 +439,6 @@ #ifdef __alpha__ -static char sigmap[NUM_REGS] = /* map reg to sigcontext */ -{ - 1, 2, 3, 4, 5, 6, 7, 8, /* v0 - t6 */ - 9, 10, 11, 12, 13, 14, 15, 16, /* t7 - fp */ - 17, 18, 19, 20, 21, 22, 23, 24, /* a0 - t9 */ - 25, 26, 27, 28, 29, 30, 31, 32, /* t10 - zero */ - 38, 39, 40, 41, 42, 43, 44, 45, /* f0 - f7 */ - 46, 47, 48, 49, 50, 51, 52, 53, /* f8 - f15 */ - 54, 55, 56, 57, 58, 59, 60, 61, /* f16 - f23 */ - 62, 63, 64, 65, 66, 67, 68, 69, /* f24 - f31 */ - 33, -1 /* pc, vfp */ -}; static char jmpmap[NUM_REGS] = { 4, 5, 6, 7, 8, 9, 10, 11, /* v0 - t6 */ 12, 13, 14, 15, 16, 17, 18, 19, /* t7 - fp */ @@ -491,10 +455,6 @@ #ifdef __sparc64__ -static char sigmap[125] = /* map reg to sigcontext */ -{ - -1 -}; static char jmpmap[125] = { -1 }; ==== //depot/projects/ia64/include/stdlib.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.47 2003/01/02 20:44:41 jmallett Exp $ */ #ifndef _STDLIB_H_ @@ -184,7 +184,7 @@ int getsubopt(char **, char *const *, char **); #define _GETSUBOPT_DECLARED #endif -/* int grantpt(int); */ +int grantpt(int); char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); /* char *l64a(long); */ @@ -200,8 +200,8 @@ #endif long mrand48(void); long nrand48(unsigned short[3]); -/* int posix_openpt(int); */ -/* char *ptsname(int); */ +int posix_openpt(int); +char *ptsname(int); int putenv(const char *); long random(void); char *realpath(const char *, char resolved_path[]); @@ -214,7 +214,7 @@ char *setstate(/* const */ char *); void srand48(long); void srandom(unsigned long); -/* int unlockpt(int); */ +int unlockpt(int); #endif /* __XSI_VISIBLE */ #if __BSD_VISIBLE ==== //depot/projects/ia64/include/ulimit.h#2 (text+ko) ==== @@ -23,15 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/ulimit.h,v 1.1 2002/08/08 04:50:36 mike Exp $ + * $FreeBSD: src/include/ulimit.h,v 1.3 2003/01/04 01:11:49 tjr Exp $ */ #ifndef _ULIMIT_H_ #define _ULIMIT_H_ -#define UL_GETSIZE 1 -#define UL_SETSIZE 2 +#include <sys/cdefs.h> + +#define UL_GETFSIZE 1 +#define UL_SETFSIZE 2 + +#if __BSD_VISIBLE +/* + * The "F" was mistakenly omitted from the macro names in FreeBSD 5.0. + * Do not use these names; they will be removed before 6.0. + */ +#define UL_GETSIZE UL_GETFSIZE +#define UL_SETSIZE UL_SETFSIZE +#endif +__BEGIN_DECLS long ulimit(int, ...); +__END_DECLS #endif /* !_ULIMIT_H_ */ ==== //depot/projects/ia64/include/wordexp.h#2 (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/wordexp.h,v 1.3 2002/12/26 14:44:45 tjr Exp $ + * $FreeBSD: src/include/wordexp.h,v 1.4 2003/01/03 12:03:38 tjr Exp $ */ #ifndef _WORDEXP_H_ @@ -50,7 +50,7 @@ */ #define WRDE_APPEND 0x1 /* append to previously generated */ #define WRDE_DOOFS 0x2 /* we_offs member is valid */ -#define WRDE_NOCMD 0x4 +#define WRDE_NOCMD 0x4 /* disallow command substitution */ #define WRDE_REUSE 0x8 /* reuse wordexp_t */ #define WRDE_SHOWERR 0x10 /* don't redirect stderr to /dev/null */ #define WRDE_UNDEF 0x20 /* disallow undefined shell vars */ ==== //depot/projects/ia64/lib/libc/gen/exec.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.19 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.20 2003/01/03 23:16:55 tjr Exp $"); #include "namespace.h" #include <sys/param.h> @@ -110,7 +110,6 @@ execlp(const char *name, const char *arg, ...) { va_list ap; - int sverrno; char **argv; int n; ==== //depot/projects/ia64/lib/libc/gen/fts.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.21 2002/09/21 01:28:38 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.22 2003/01/03 23:25:25 tjr Exp $"); #include "namespace.h" #include <sys/types.h> @@ -273,7 +273,6 @@ fts_read(sp) FTS *sp; { - struct stat sb; FTSENT *p, *tmp; int instr; char *t; ==== //depot/projects/ia64/lib/libc/gen/getcap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.18 2002/12/27 08:43:40 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.19 2003/01/02 10:19:43 thomas Exp $"); #include "namespace.h" #include <sys/types.h> @@ -577,6 +577,9 @@ { const char *np, *bp; + if (name == NULL || *name == '\0') + return -1; + /* * Start search at beginning of record. */ ==== //depot/projects/ia64/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* LIBC_SCCS and not lint */ /* $NetBSD: getgrent.c,v 1.34.2.1 1999/04/27 14:10:58 perry Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.22 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.23 2003/01/04 00:24:35 tjr Exp $"); #include <sys/types.h> @@ -263,7 +263,6 @@ char **hp; void *context; int r; - size_t sz; r = NS_UNAVAIL; if (!search && _gr_hesnum == -1) @@ -327,7 +326,6 @@ char *key, *data; int keylen, datalen; int r; - size_t sz; if(__ypdomain == NULL) { switch (yp_get_default_domain(&__ypdomain)) { ==== //depot/projects/ia64/lib/libc/gen/getnetgrent.c#5 (text+ko) ==== @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.29 2002/12/30 21:18:02 schweikh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.30 2003/01/03 23:55:58 tjr Exp $"); +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> ==== //depot/projects/ia64/lib/libc/gen/getvfsent.c#4 (text+ko) ==== @@ -6,10 +6,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsent.c,v 1.19 2002/08/10 20:19:03 mux Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsent.c,v 1.20 2003/01/04 00:13:00 tjr Exp $"); #include <sys/param.h> #include <sys/types.h> +#include <sys/linker.h> #include <sys/mount.h> #include <sys/sysctl.h> #include <unistd.h> ==== //depot/projects/ia64/lib/libc/gen/opendir.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)opendir.c 8.8 (Berkeley) 5/1/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.18 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.19 2003/01/04 00:18:50 tjr Exp $"); #include "namespace.h" #include <sys/param.h> @@ -46,6 +46,7 @@ #include <errno.h> #include <fcntl.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include "un-namespace.h" ==== //depot/projects/ia64/lib/libc/gen/popen.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)popen.3 8.2 (Berkeley) 5/3/95 -.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.14 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.15 2003/01/03 05:21:59 tjr Exp $ .\" .Dd May 3, 1995 .Dt POPEN 3 @@ -184,7 +184,7 @@ .Pp The .Fn popen -argument +function always calls .Xr sh 1 , never calls ==== //depot/projects/ia64/lib/libc/gen/popen.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.16 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.18 2003/01/04 00:15:15 tjr Exp $"); #include "namespace.h" #include <sys/param.h> @@ -51,7 +51,9 @@ #include <stdlib.h> #include <string.h> #include <paths.h> +#include <pthread.h> #include "un-namespace.h" +#include "libc_private.h" extern char **environ; @@ -60,7 +62,11 @@ FILE *fp; pid_t pid; } *pidlist; +static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER; +#define THREAD_LOCK() if (__isthreaded) _pthread_mutex_lock(&pidlist_mutex) +#define THREAD_UNLOCK() if (__isthreaded) _pthread_mutex_unlock(&pidlist_mutex) + FILE * popen(command, type) const char *command, *type; @@ -97,8 +103,10 @@ argv[2] = (char *)command; argv[3] = NULL; + THREAD_LOCK(); switch (pid = vfork()) { case -1: /* Error. */ + THREAD_UNLOCK(); (void)_close(pdes[0]); (void)_close(pdes[1]); free(cur); @@ -136,6 +144,7 @@ _exit(127); /* NOTREACHED */ } + THREAD_UNLOCK(); /* Parent; assume fdopen can't fail. */ if (*type == 'r') { @@ -148,9 +157,11 @@ /* Link into list of file descriptors. */ cur->fp = iop; - cur->pid = pid; + cur->pid = pid; + THREAD_LOCK(); cur->next = pidlist; pidlist = cur; + THREAD_UNLOCK(); return (iop); } @@ -165,16 +176,25 @@ FILE *iop; { struct pid *cur, *last; - int omask; int pstat; pid_t pid; - /* Find the appropriate file pointer. */ + /* + * Find the appropriate file pointer and remove it from the list. + */ + THREAD_LOCK(); for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next) if (cur->fp == iop) break; - if (cur == NULL) + if (cur == NULL) { + THREAD_UNLOCK(); return (-1); + } + if (last == NULL) + pidlist = cur->next; + else + last->next = cur->next; + THREAD_UNLOCK(); (void)fclose(iop); @@ -182,11 +202,6 @@ pid = _wait4(cur->pid, &pstat, 0, (struct rusage *)0); } while (pid == -1 && errno == EINTR); - /* Remove the entry from the linked list. */ - if (last == NULL) - pidlist = cur->next; - else - last->next = cur->next; free(cur); return (pid == -1 ? -1 : pstat); ==== //depot/projects/ia64/lib/libc/gen/sysctlnametomib.c#3 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.3 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.4 2003/01/04 00:11:11 tjr Exp $"); #include <sys/types.h> #include <sys/sysctl.h> +#include <string.h> /* * This function uses a presently undocumented interface to the kernel ==== //depot/projects/ia64/lib/libc/gen/ulimit.3#5 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.4 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.5 2003/01/04 01:11:49 tjr Exp $ .\" -.Dd August 8, 2002 +.Dd January 4, 2003 .Dt ULIMIT 3 .Os .Sh NAME @@ -43,11 +43,11 @@ The .Fa cmd argument is one of the following: -.Bl -tag -width ".Dv UL_GETSIZE" -.It Dv UL_GETSIZE +.Bl -tag -width ".Dv UL_GETFSIZE" +.It Dv UL_GETFSIZE will return the maximum file size in units of 512 blocks of the current process. -.It Dv UL_SETSIZE +.It Dv UL_SETFSIZE will attempt to set the maximum file size of the current process and its children with the second argument expressed as a long. .El ==== //depot/projects/ia64/lib/libc/gen/ulimit.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.1 2002/08/08 04:50:36 mike Exp $ + * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.3 2003/01/04 01:11:49 tjr Exp $ */ #include <sys/types.h> @@ -40,16 +40,16 @@ { struct rlimit limit; va_list ap; - long arg, size; + long arg; - if (cmd == UL_GETSIZE) { + if (cmd == UL_GETFSIZE) { if (getrlimit(RLIMIT_FSIZE, &limit) == -1) return (-1); limit.rlim_cur /= 512; if (limit.rlim_cur > LONG_MAX) return (LONG_MAX); return ((long)limit.rlim_cur); - } else if (cmd == UL_SETSIZE) { + } else if (cmd == UL_SETFSIZE) { va_start(ap, cmd); arg = va_arg(ap, long); va_end(ap); ==== //depot/projects/ia64/lib/libc/gen/wordexp.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.2 2002/12/27 08:28:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.3 2003/01/03 12:04:36 tjr Exp $ .\" .Dd December 27, 2002 .Dt WORDEXP 3 @@ -34,7 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In wordexp.h .Ft int .Fo wordexp ==== //depot/projects/ia64/lib/libc/gen/wordexp.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include <wordexp.h> #include "un-namespace.h" -__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.2 2002/12/27 01:01:03 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.3 2003/01/04 06:07:44 tjr Exp $"); static int we_askshell(const char *, wordexp_t *, int); static int we_check(const char *, int); @@ -141,7 +141,8 @@ close(pdes[1]); if (read(pdes[0], wbuf, 8) != 8 || read(pdes[0], bbuf, 8) != 8) { close(pdes[0]); - return (WRDE_NOSPACE); /* XXX */ + waitpid(pid, &status, 0); + return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX); } wbuf[8] = bbuf[8] = '\0'; nwords = strtol(wbuf, NULL, 16); @@ -154,17 +155,21 @@ */ sofs = we->we_nbytes; vofs = we->we_wordc; + if ((flags & (WRDE_DOOFS|WRDE_APPEND)) == (WRDE_DOOFS|WRDE_APPEND)) + vofs += we->we_offs; we->we_wordc += nwords; we->we_nbytes += nbytes; if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 + (flags & WRDE_DOOFS ? we->we_offs : 0)) * sizeof(char *))) == NULL) { close(pdes[0]); + waitpid(pid, &status, 0); return (WRDE_NOSPACE); } we->we_wordv = nwv; if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) { close(pdes[0]); + waitpid(pid, &status, 0); return (WRDE_NOSPACE); } for (i = 0; i < vofs; i++) @@ -174,7 +179,8 @@ if (read(pdes[0], we->we_strings + sofs, nbytes) != nbytes) { close(pdes[0]); - return (WRDE_NOSPACE); /* XXX */ + waitpid(pid, &status, 0); + return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX); } if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || @@ -221,7 +227,7 @@ switch (c) { case '\\': quote ^= 1; - break; + continue; case '\'': if (quote + dquote == 0) squote ^= 1; @@ -247,8 +253,8 @@ case '$': if ((c = *words++) == '\0') break; - else if (c == '(') { - if (flags & WRDE_NOCMD) + else if (quote + squote == 0 && c == '(') { + if (flags & WRDE_NOCMD && *words != '(') return (WRDE_CMDSUB); level = 1; while ((c = *words++) != '\0') { @@ -262,7 +268,7 @@ } if (c == '\0' || level != 0) return (WRDE_SYNTAX); - } else if (c == '{') { + } else if (quote + squote == 0 && c == '{') { level = 1; while ((c = *words++) != '\0') { if (c == '\\') { @@ -275,11 +281,13 @@ } if (c == '\0' || level != 0) return (WRDE_SYNTAX); - } + } else + c = *--words; break; default: break; } + quote = 0; } if (quote + squote + dquote != 0) return (WRDE_SYNTAX); ==== //depot/projects/ia64/lib/libc/stdio/freopen.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.9 2002/10/12 16:13:39 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.10 2003/01/03 12:27:19 tjr Exp $"); #include "namespace.h" #include <sys/types.h> @@ -133,6 +133,7 @@ if (HASLB(fp)) FREELB(fp); fp->_lb._size = 0; + fp->_extra->orientation = 0; if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ ==== //depot/projects/ia64/lib/libc/stdio/fscanf.c#5 (text+ko) ==== @@ -38,13 +38,14 @@ static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.11 2002/10/12 16:13:40 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $"); #include "namespace.h" #include <stdio.h> >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the messagehelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301042123.h04LN5F3078755>