From owner-p4-projects@FreeBSD.ORG Fri Jul 9 23:42:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7240316A4CE; Fri, 9 Jul 2004 23:42:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D47616A4CE for ; Fri, 9 Jul 2004 23:42:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 233E643D49 for ; Fri, 9 Jul 2004 23:42:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i69NgScA099784 for ; Fri, 9 Jul 2004 23:42:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i69NgR9H099781 for perforce@freebsd.org; Fri, 9 Jul 2004 23:42:27 GMT (envelope-from marcel@freebsd.org) Date: Fri, 9 Jul 2004 23:42:27 GMT Message-Id: <200407092342.i69NgR9H099781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2004 23:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=56934 Change 56934 by marcel@marcel_nfs on 2004/07/09 23:42:08 IFC @56933 Affected files ... .. //depot/projects/gdb/Makefile#6 integrate .. //depot/projects/gdb/UPDATING#20 integrate .. //depot/projects/gdb/include/strings.h#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/amd64/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/arm/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/arm/gen/isinf.c#2 delete .. //depot/projects/gdb/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/gdb/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/isinf.c#1 branch .. //depot/projects/gdb/lib/libc/gen/isnan.c#1 branch .. //depot/projects/gdb/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/ia64/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/locale/utf8.c#7 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/Makefile.inc#4 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/gen/isinf.c#3 delete .. //depot/projects/gdb/lib/libc/stdio/fgetwc.c#4 integrate .. //depot/projects/gdb/lib/libc/sys/intro.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/gdb/lib/msun/Makefile#9 integrate .. //depot/projects/gdb/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/gdb/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/gdb/lib/msun/src/math.h#10 integrate .. //depot/projects/gdb/lib/msun/src/s_isfinite.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_isnormal.c#1 branch .. //depot/projects/gdb/sbin/geom/class/stripe/geom_stripe.c#4 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#6 integrate .. //depot/projects/gdb/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/gdb/share/man/man4/multicast.4#4 integrate .. //depot/projects/gdb/share/man/man4/ng_atm.4#6 integrate .. //depot/projects/gdb/share/man/man4/ng_atmllc.4#3 integrate .. //depot/projects/gdb/share/man/man4/ng_atmpif.4#6 integrate .. //depot/projects/gdb/share/man/man4/ng_sppp.4#6 integrate .. //depot/projects/gdb/share/man/man4/ng_sscfu.4#5 integrate .. //depot/projects/gdb/share/man/man4/ng_sscop.4#5 integrate .. //depot/projects/gdb/share/man/man4/ng_uni.4#5 integrate .. //depot/projects/gdb/share/man/man4/pim.4#2 integrate .. //depot/projects/gdb/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/gdb/share/man/man9/Makefile#10 integrate .. //depot/projects/gdb/share/man/man9/sbuf.9#3 integrate .. //depot/projects/gdb/share/man/man9/vfs_suser.9#1 branch .. //depot/projects/gdb/sys/alpha/alpha/autoconf.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/autoconf.c#4 integrate .. //depot/projects/gdb/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/gdb/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/gdb/sys/boot/common/loader.8#7 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/gdb/sys/conf/NOTES#31 integrate .. //depot/projects/gdb/sys/conf/files#37 integrate .. //depot/projects/gdb/sys/conf/files.amd64#13 integrate .. //depot/projects/gdb/sys/conf/options#29 integrate .. //depot/projects/gdb/sys/dev/fb/creator.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/gdb/sys/dev/ppbus/pcfclock.c#6 integrate .. //depot/projects/gdb/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/gdb/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/gdb/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/gdb/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/gdb/sys/geom/geom_subr.c#7 integrate .. //depot/projects/gdb/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/autoconf.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/locore.s#4 integrate .. //depot/projects/gdb/sys/ia64/ia64/autoconf.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#17 integrate .. //depot/projects/gdb/sys/kern/subr_sbuf.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_witness.c#11 integrate .. //depot/projects/gdb/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/gdb/sys/modules/de/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/nfs4client/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/gdb/sys/netinet/ip_input.c#12 integrate .. //depot/projects/gdb/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/gdb/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/gdb/sys/pci/if_devar.h#3 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#12 integrate .. //depot/projects/gdb/sys/pci/if_vr.c#9 integrate .. //depot/projects/gdb/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/gdb/sys/pci/if_xl.c#9 integrate .. //depot/projects/gdb/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/trap.c#5 integrate .. //depot/projects/gdb/sys/sparc64/creator/creator_upa.c#5 integrate .. //depot/projects/gdb/sys/sys/param.h#18 integrate .. //depot/projects/gdb/sys/sys/sbuf.h#2 integrate .. //depot/projects/gdb/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/gdb/tools/tools/tinderbox/tinderbox.pl#8 integrate .. //depot/projects/gdb/usr.bin/tr/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/tr/cmap.c#1 branch .. //depot/projects/gdb/usr.bin/tr/cmap.h#1 branch .. //depot/projects/gdb/usr.bin/tr/cset.c#1 branch .. //depot/projects/gdb/usr.bin/tr/cset.h#1 branch .. //depot/projects/gdb/usr.bin/tr/extern.h#2 integrate .. //depot/projects/gdb/usr.bin/tr/str.c#2 integrate .. //depot/projects/gdb/usr.bin/tr/tr.1#4 integrate .. //depot/projects/gdb/usr.bin/tr/tr.c#2 integrate .. //depot/projects/gdb/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/gdb/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.299 2004/04/13 13:42:01 des Exp $ +# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $ # # The user-driven targets are: # @@ -235,7 +235,7 @@ .for arch in i386 sparc64 alpha ia64 amd64 .for mach in ${arch} ${${arch}_mach} @echo ">> ${mach} started on `LC_ALL=C date`" - -cd ${.CURDIR} && ${MAKE} buildworld \ + -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ TARGET_ARCH=${arch} TARGET=${mach} \ __MAKE_CONF=/dev/null \ > _.${mach}.buildworld 2>&1 @@ -244,7 +244,7 @@ -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ > ${.CURDIR}/_.${mach}.makeLINT 2>&1 .endif - cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach} + cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernels TARGET_ARCH=${arch} TARGET=${mach} @echo ">> ${mach} completed on `LC_ALL=C date`" .endfor .endfor @@ -260,7 +260,7 @@ buildkernels: .for kernel in ${KERNCONFS} - -cd ${.CURDIR} && ${MAKE} buildkernel \ + -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ > _.${TARGET}.${kernel} 2>&1 ==== //depot/projects/gdb/UPDATING#20 (text+ko) ==== @@ -17,6 +17,10 @@ developers choose to disable these features on build machines to maximize performance. +20040708: + Bluetooth code has been marked as non-i386 specific. + __FreeBSD_version has been bumped to 502121 to mark this change. + 20040702: The native preemption has been added to the kernel scheduler. There is some report that ULE scheduler was broken in some @@ -1680,4 +1684,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.322 2004/07/05 18:11:59 imp Exp $ +$FreeBSD: src/UPDATING,v 1.323 2004/07/09 16:57:24 emax Exp $ ==== //depot/projects/gdb/include/strings.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/strings.h,v 1.4 2004/01/13 16:05:47 des Exp $ + * $FreeBSD: src/include/strings.h,v 1.5 2004/07/09 13:52:42 des Exp $ */ #ifndef _STRINGS_H_ @@ -42,9 +42,11 @@ void bcopy(const void *, void *, size_t); /* LEGACY */ void bzero(void *, size_t); /* LEGACY */ int ffs(int); +#ifdef __BSD_VISIBLE int ffsl(long); int fls(int); int flsl(long); +#endif char *index(const char *, int); /* LEGACY */ char *rindex(const char *, int); /* LEGACY */ int strcasecmp(const char *, const char *); ==== //depot/projects/gdb/lib/libc/alpha/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.12 2003/08/09 05:37:54 deischen Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.13 2004/07/09 03:32:39 das Exp $ -SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S +SRCS+= _setjmp.S fabs.S frexp.c 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/gdb/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.24 2003/10/13 20:32:33 alc Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.25 2004/07/09 03:32:39 das Exp $ SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ - frexp.c infinity.c isinf.c ldexp.c \ + frexp.c infinity.c ldexp.c \ makecontext.c signalcontext.c \ fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c ==== //depot/projects/gdb/lib/libc/arm/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.1 2004/05/14 12:04:30 cognet Exp $ +# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.2 2004/07/09 03:32:40 das Exp $ SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c frexp.c \ - infinity.c isinf.c ldexp.c makecontext.c modf.c \ + infinity.c ldexp.c makecontext.c modf.c \ setjmp.S signalcontext.c sigsetjmp.S divsi3.S ==== //depot/projects/gdb/lib/libc/gen/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.111 2004/07/05 23:13:16 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.112 2004/07/09 03:32:40 das Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -17,7 +17,7 @@ getobjformat.c getosreldate.c getpagesize.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ getusershell.c getvfsbyname.c glob.c \ - initgroups.c isatty.c jrand48.c lcong48.c \ + initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nice.c \ nlist.c nrand48.c ntp_gettime.c opendir.c \ pause.c pmadvise.c popen.c posixshm.c pselect.c \ ==== //depot/projects/gdb/lib/libc/gen/fpclassify.3#2 (text+ko) ==== @@ -22,16 +22,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.3 2003/06/01 19:19:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.5 2004/07/09 06:37:44 das Exp $ .\" -.Dd February 12, 2003 +.Dd July 8, 2004 .Dt FPCLASSIFY 3 .Os .Sh NAME .Nm fpclassify , isfinite , isinf , isnan , isnormal .Nd "classify a floating-point number" .Sh LIBRARY -.Lb libc +.Lb libm .Sh SYNOPSIS .In math.h .Ft int @@ -125,6 +125,3 @@ .Vt double arguments; these have been superseded by the macros described above. -.Sh BUGS -By default, the DEC Alpha architecture does not support IEEE rounding. -See the compiler documentation for additional details. ==== //depot/projects/gdb/lib/libc/i386/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.19 2004/07/09 03:32:40 das Exp $ SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \ - infinity.c isinf.c ldexp.c makecontext.c modf.S \ + infinity.c ldexp.c makecontext.c modf.S \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/gdb/lib/libc/ia64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.8 2003/06/24 05:06:42 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.9 2004/07/09 03:32:40 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 \ - isinf.c ldexp.c makecontext.c modf.c setjmp.S signalcontext.c \ - sigsetjmp.S + ldexp.c makecontext.c modf.c setjmp.S signalcontext.c sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. ==== //depot/projects/gdb/lib/libc/locale/utf8.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.9 2004/05/17 12:32:40 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.10 2004/07/09 15:46:06 tjr Exp $"); #include #include @@ -90,6 +90,13 @@ /* Incomplete multibyte sequence */ return ((size_t)-2); + if (us->want == 0 && ((ch = (unsigned char)*s) & ~0x7f) == 0) { + /* Fast path for plain ASCII characters. */ + if (pwc != NULL) + *pwc = ch; + return (ch != '\0' ? 1 : 0); + } + if (us->want == 0) { /* * Determine the number of octets that make up this character @@ -198,6 +205,12 @@ /* Reset to initial shift state (no-op) */ return (1); + if ((wc & ~0x7f) == 0) { + /* Fast path for plain ASCII characters. */ + *s = (char)wc; + return (1); + } + /* * Determine the number of octets needed to represent this character. * We always output the shortest sequence possible. Also specify the ==== //depot/projects/gdb/lib/libc/powerpc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.3 2004/03/02 06:22:24 grehan Exp $ +# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.4 2004/07/09 03:32:40 das Exp $ SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c frexp.c \ - infinity.c isinf.c ldexp.c makecontext.c modf.c _setjmp.S \ + infinity.c ldexp.c makecontext.c modf.c _setjmp.S \ setjmp.S sigsetjmp.S syncicache.c ==== //depot/projects/gdb/lib/libc/sparc64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.8 2003/08/08 15:40:28 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.9 2004/07/09 03:32:40 das Exp $ SRCS+= _ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \ fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \ - frexp.c infinity.c isinf.c ldexp.c makecontext.c modf.S \ + frexp.c infinity.c ldexp.c makecontext.c modf.S \ signalcontext.c setjmp.S sigsetjmp.S ==== //depot/projects/gdb/lib/libc/stdio/fgetwc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.10 2004/05/22 15:41:03 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.11 2004/07/09 15:12:10 tjr Exp $"); #include "namespace.h" #include @@ -36,29 +36,7 @@ #include "libc_private.h" #include "local.h" -static __inline wint_t __fgetwc_nbf(FILE *); - /* - * Non-MT-safe version. - */ -wint_t -__fgetwc(FILE *fp) -{ - wint_t wc; - - if (MB_CUR_MAX == 1) { - /* - * Assume we're using a single-byte locale. A safer test - * might be to check _CurrentRuneLocale->encoding. - */ - wc = (wint_t)__sgetc(fp); - } else - wc = __fgetwc_nbf(fp); - - return (wc); -} - -/* * MT-safe version. */ wint_t @@ -74,14 +52,23 @@ return (r); } -static __inline wint_t -__fgetwc_nbf(FILE *fp) +/* + * Non-MT-safe version. + */ +wint_t +__fgetwc(FILE *fp) { wchar_t wc; size_t nconv; if (fp->_r <= 0 && __srefill(fp)) return (WEOF); + if (MB_CUR_MAX == 1) { + /* Fast path for single-byte encodings. */ + wc = *fp->_p++; + fp->_r--; + return (wc); + } do { nconv = mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); if (nconv == (size_t)-1) ==== //depot/projects/gdb/lib/libc/sys/intro.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.41 2004/07/03 22:30:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.42 2004/07/08 20:27:38 wollman Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -367,12 +367,16 @@ .Pq Dv MAXSYMLINKS symbolic links. .It Er 63 ENAMETOOLONG Em "File name too long" . -A component of a path name exceeded 255 -.Pq Dv MAXNAMELEN +A component of a path name exceeded +.Brq Dv NAME_MAX characters, or an entire -path name exceeded 1023 -.Pq Dv MAXPATHLEN Ns -1 +path name exceeded +.Brq Dv PATH_MAX characters. +(See also the description of +.Dv _PC_NO_TRUNC +in +.Xr pathconf 2 . ) .It Er 64 EHOSTDOWN Em "Host is down" . A socket operation failed because the destination host was down. .It Er 65 EHOSTUNREACH Em "No route to host" . @@ -468,7 +472,7 @@ integer called a process ID. The range of this ID is from 0 to 99999. .It Parent process ID -A new process is created by a currently active process; (see +A new process is created by a currently active process (see .Xr fork 2 ) . The parent process ID of a process is initially the process ID of its creator. If the creating process exits, @@ -595,19 +599,20 @@ which uniquely identifies an access path to that file or socket from a given process or any of its children. .It File Name -Names consisting of up to 255 -.Pq Dv MAXNAMELEN +Names consisting of up to +.Brq Dv NAME_MAX characters may be used to name an ordinary file, special file, or directory. .Pp -These characters may be selected from the set of all +These characters may be arbitrary eight-bit values, +excluding NUL +.Po Tn ASCII +.No 0 Pc +and the +.Ql \&/ +character (slash, .Tn ASCII -character -excluding 0 (NUL) and the -.Tn ASCII -code for -.Ql \&/ -(slash). +47). .Pp Note that it is generally unwise to use .Ql \&* , @@ -626,9 +631,10 @@ .Ql \&/ , followed by zero or more directory names separated by slashes, optionally followed by a file name. -The total length of a path name must be less than 1024 -.Pq Dv MAXPATHLEN +The total length of a path name must be less than +.Brq Dv PATH_MAX characters. +(On some systems, this limit may be infinite.) .Pp If a path name begins with a slash, the path search begins at the .Em root ==== //depot/projects/gdb/lib/libc/sys/pathconf.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pathconf.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.16 2004/07/07 20:47:42 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.17 2004/07/08 20:27:38 wollman Exp $ .\" .Dd November 4, 2002 .Dt PATHCONF 2 @@ -90,11 +90,24 @@ .It Li _PC_PIPE_BUF The maximum number of bytes which will be written atomically to a pipe. .It Li _PC_CHOWN_RESTRICTED -Return 1 if appropriate privileges are required for the +Return 1 if appropriate privilege is required for the .Xr chown 2 system call, otherwise 0. +.St -p1003.1-2001 +requires appropriate privilege in all cases, but this behavior was optional +in prior editions of the standard. .It Li _PC_NO_TRUNC -Return 1 if file names longer than _POSIX_NAME_MAX are truncated. +Return greater than zero if attempts to use pathname components longer than +.Brq Li NAME_MAX +will result in an +.Bq Er ENAMETOOLONG +error; otherwise, such components will be truncated to +.Brq Li NAME_MAX . +.St -p1003.1-2001 +requires the error in all cases, but this behavior was optional in prior +editions of the standard, and some +.No non- Ns Tn POSIX Ns \&-compliant +filesystems do not support this behavior. .It Li _PC_VDISABLE Returns the terminal character disabling value. .It Li _PC_ASYNC_IO @@ -175,8 +188,14 @@ .It Bq Er ENOTDIR A component of the path prefix is not a directory. .It Bq Er ENAMETOOLONG -A component of a pathname exceeded 255 characters, -or an entire path name exceeded 1023 characters. +A component of a pathname exceeded +.Brq Dv NAME_MAX +characters (but see +.Dv _PC_NO_TRUNC +above), +or an entire path name exceeded +.Brq Dv PATH_MAX +characters. .It Bq Er ENOENT The named file does not exist. .It Bq Er EACCES ==== //depot/projects/gdb/lib/msun/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.47 2004/07/06 04:46:08 das Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.48 2004/07/09 03:32:39 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -84,7 +84,8 @@ s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \ s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ - s_isnanf.c s_ldexpf.c s_lib_version.c s_log1p.c \ + s_isfinite.c s_isnanf.c s_isnormal.c s_ldexpf.c \ + s_lib_version.c s_log1p.c \ s_log1pf.c s_logb.c s_logbf.c s_matherr.c s_modff.c \ s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_rint.c s_rintf.c s_round.c s_roundf.c \ ==== //depot/projects/gdb/lib/msun/src/e_scalb.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.10 2003/10/27 01:28:07 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.11 2004/07/09 10:01:10 das Exp $"; #endif /* @@ -23,9 +23,6 @@ #include "math.h" #include "math_private.h" -/* XXX lost declaration of this and isinf() in math.h but still have funcs. */ -int (isnan)(float x); - #ifdef _SCALB_INT double __ieee754_scalb(double x, int fn) ==== //depot/projects/gdb/lib/msun/src/e_scalbf.c#2 (text+ko) ==== @@ -14,15 +14,12 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.8 2003/10/27 01:28:07 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.9 2004/07/09 10:01:10 das Exp $"; #endif #include "math.h" #include "math_private.h" -/* XXX lost declaration of this and isnan() in math.h but still have funcs. */ -int (isnanf)(float x); - #ifdef _SCALB_INT float __ieee754_scalbf(float x, int fn) ==== //depot/projects/gdb/lib/msun/src/math.h#10 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.38 2004/07/06 04:46:08 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.40 2004/07/09 03:32:39 das Exp $ */ #ifndef _MATH_H_ @@ -34,15 +34,35 @@ float __uf; } __nan; +#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__INTEL_COMPILER) +#define __MATH_BUILTIN_CONSTANTS +#endif + +#if (defined(__GNUC__) && __GNUC__ >= 3) +#define __MATH_BUILTIN_RELOPS +#endif + +#ifdef __MATH_BUILTIN_CONSTANTS +#define HUGE_VAL __builtin_huge_val() +#else #define HUGE_VAL (__infinity.__ud) +#endif #if __ISO_C_VISIBLE >= 1999 #define FP_ILOGB0 (-__INT_MAX) #define FP_ILOGBNAN __INT_MAX + +#ifdef __MATH_BUILTIN_CONSTANTS +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#define INFINITY __builtin_inf() +#define NAN __builtin_nan("") +#else #define HUGE_VALF (float)HUGE_VAL #define HUGE_VALL (long double)HUGE_VAL #define INFINITY HUGE_VALF #define NAN (__nan.__uf) +#endif /* __MATH_BUILTIN_CONSTANTS */ #define MATH_ERRNO 1 #define MATH_ERREXCEPT 2 @@ -59,11 +79,31 @@ : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \ : __fpclassifyl(x)) -#define isfinite(x) ((fpclassify(x) & (FP_INFINITE|FP_NAN)) == 0) -#define isinf(x) (fpclassify(x) == FP_INFINITE) -#define isnan(x) (fpclassify(x) == FP_NAN) -#define isnormal(x) (fpclassify(x) == FP_NORMAL) +#define isfinite(x) \ + ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \ + : (sizeof (x) == sizeof (double)) ? __isfinite(x) \ + : __isfinitel(x)) +#define isinf(x) \ + ((sizeof (x) == sizeof (float)) ? __isinff(x) \ + : (sizeof (x) == sizeof (double)) ? isinf(x) \ + : __isinfl(x)) +#define isnan(x) \ + ((sizeof (x) == sizeof (float)) ? isnanf(x) \ + : (sizeof (x) == sizeof (double)) ? isnan(x) \ + : __isnanl(x)) +#define isnormal(x) \ + ((sizeof (x) == sizeof (float)) ? __isnormalf(x) \ + : (sizeof (x) == sizeof (double)) ? __isnormal(x) \ + : __isnormall(x)) +#ifdef __MATH_BUILTIN_RELOPS +#define isgreater(x, y) __builtin_isgreater((x), (y)) +#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y)) +#define isless(x, y) __builtin_isless((x), (y)) +#define islessequal(x, y) __builtin_islessequal((x), (y)) +#define islessgreater(x, y) __builtin_islessgreater((x), (y)) +#define isunordered(x, y) __builtin_isunordered((x), (y)) +#else #define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) #define isgreaterequal(x, y) (!isunordered((x), (y)) && (x) >= (y)) #define isless(x, y) (!isunordered((x), (y)) && (x) < (y)) @@ -71,6 +111,7 @@ #define islessgreater(x, y) (!isunordered((x), (y)) && \ ((x) > (y) || (y) > (x))) #define isunordered(x, y) (isnan(x) || isnan(y)) +#endif /* __MATH_BUILTIN_RELOPS */ #define signbit(x) __signbit(x) @@ -132,8 +173,6 @@ }; #endif -#define isnanf(x) isnan(x) - #if 0 /* Old value from 4.4BSD-Lite math.h; this is probably better. */ #define HUGE HUGE_VAL @@ -166,6 +205,15 @@ int __fpclassifyd(double) __pure2; int __fpclassifyf(float) __pure2; int __fpclassifyl(long double) __pure2; +int __isfinitef(float) __pure2; +int __isfinite(double) __pure2; +int __isfinitel(long double) __pure2; +int __isinff(float) __pure2; +int __isinfl(long double) __pure2; +int __isnanl(long double) __pure2; +int __isnormalf(float) __pure2; +int __isnormal(double) __pure2; +int __isnormall(long double) __pure2; int __signbit(double) __pure2; double acos(double); @@ -212,6 +260,8 @@ double fmin(double, double) __pure2; double hypot(double, double); int ilogb(double); +int (isinf)(double) __pure2; +int (isnan)(double) __pure2; double lgamma(double); double log1p(double) __pure2; double logb(double) __pure2; @@ -250,6 +300,7 @@ #if __BSD_VISIBLE double drem(double, double); int finite(double) __pure2; +int isnanf(float) __pure2; /* * Reentrant version of gamma & lgamma; passes signgam back by reference ==== //depot/projects/gdb/sbin/geom/class/stripe/geom_stripe.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.3 2004/07/05 21:16:37 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.4 2004/07/09 14:41:51 pjd Exp $"); #include #include @@ -45,7 +45,7 @@ uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_STRIPE_VERSION; -static intmax_t stripesize = 65536; +static intmax_t stripesize = 4096; static void stripe_main(struct gctl_req *req, unsigned flags); static void stripe_label(struct gctl_req *req); ==== //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.7 2004/07/07 21:00:57 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.8 2004/07/09 14:41:51 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -145,7 +145,7 @@ The following example shows how to set up striped device from four disks for automatic configuration, create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/data.stripe mount /dev/data.stripe /mnt [...] ==== //depot/projects/gdb/sbin/mount_msdosfs/mount_msdosfs.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.32 2003/12/08 08:32:19 fjoe Exp $"; + "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.33 2004/07/08 18:06:44 trhodes Exp $"; #endif /* not lint */ #include @@ -70,9 +70,6 @@ MOPT_FORCE, MOPT_SYNC, MOPT_UPDATE, -#ifdef MSDOSFSMNT_GEMDOSFS - { "gemdosfs", 0, MSDOSFSMNT_GEMDOSFS, 1 }, -#endif { "shortnames", 0, MSDOSFSMNT_SHORTNAME, 1 }, { "longnames", 0, MSDOSFSMNT_LONGNAME, 1 }, { "nowin95", 0, MSDOSFSMNT_NOWIN95, 1 }, @@ -106,11 +103,6 @@ while ((c = getopt(argc, argv, "sl9u:g:m:M:o:L:D:")) != -1) { #endif switch (c) { -#ifdef MSDOSFSMNT_GEMDOSFS - case 'G': - args.flags |= MSDOSFSMNT_GEMDOSFS; - break; -#endif case 's': args.flags |= MSDOSFSMNT_SHORTNAME; break; ==== //depot/projects/gdb/share/man/man4/multicast.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.3 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.4 2004/07/09 09:22:36 ru Exp $ .\" .Dd September 4, 2003 .Dt MULTICAST 4 @@ -93,13 +93,11 @@ to control the multicast forwarding in the kernel. Note that most operations below require certain privilege (i.e., root privilege): -.Pp .Bd -literal /* IPv4 */ int mrouter_s4; mrouter_s4 = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP); .Ed -.Pp .Bd -literal int mrouter_s6; mrouter_s6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); @@ -108,11 +106,19 @@ Note that if the router needs to open an IGMP or ICMPv6 socket (in case of IPv4 and IPv6 respectively) for sending or receiving of IGMP or MLD multicast group membership messages, -then the same mrouter_s4 or mrouter_s6 sockets should be used +then the same +.Va mrouter_s4 +or +.Va mrouter_s6 +sockets should be used for sending and receiving respectively IGMP or MLD messages. -In case of BSD-derived kernel, it may be possible to open separate sockets +In case of +.Bx Ns +-derived kernel, it may be possible to open separate sockets for IGMP or MLD messages only. -However, some other kernels (e.g., Linux) require that the multicast +However, some other kernels (e.g., +.Tn Linux ) +require that the multicast routing socket must be used for sending and receiving of IGMP or MLD messages. Therefore, for portability reason the multicast @@ -125,7 +131,6 @@ int v = 1; /* 1 to enable, or 0 to disable */ setsockopt(mrouter_s4, IPPROTO_IP, MRT_INIT, (void *)&v, sizeof(v)); .Ed -.Pp .Bd -literal /* IPv6 */ int v = 1; /* 1 to enable, or 0 to disable */ @@ -165,30 +170,30 @@ .Ed .Pp The -.Dq vif_index +.Va vif_index must be unique per vif. The -.Dq vif_flags +.Va vif_flags contains the -.Dq VIFF_* -flags as defined in . +.Dv VIFF_* +flags as defined in +.In netinet/ip_mroute.h . The -.Dq min_ttl_threshold +.Va min_ttl_threshold contains the minimum TTL a multicast data packet must have to be forwarded on that vif. Typically, it would have value of 1. The -.Dq max_rate_limit +.Va max_rate_limit contains the maximum rate (in bits/s) of the multicast data packets forwarded on that vif. Value of 0 means no limit. The -.Dq vif_local_address +.Va vif_local_address contains the local IP address of the corresponding local interface. The -.Dq vif_remote_address +.Va vif_remote_address contains the remote IP address in case of DVMRP multicast tunnels. -.Pp .Bd -literal /* IPv6 */ struct mif6ctl mc; @@ -202,15 +207,16 @@ .Ed .Pp The -.Dq mif_index +.Va mif_index must be unique per vif. The -.Dq mif_flags +.Va mif_flags contains the -.Dq MIFF_* -flags as defined in . +.Dv MIFF_* +flags as defined in +.In netinet6/ip6_mroute.h . The -.Dq pif_index +.Va pif_index is the physical interface index of the corresponding local interface. .Pp A multicast interface is deleted by: @@ -220,7 +226,6 @@ setsockopt(mrouter_s4, IPPROTO_IP, MRT_DEL_VIF, (void *)&vifi, sizeof(vifi)); .Ed -.Pp .Bd -literal /* IPv6 */ mifi_t mifi = mif_index; @@ -233,53 +238,57 @@ added, the kernel may deliver upcall messages (also called signals later in this text) on the multicast routing socket that was open earlier with -.Dq MRT_INIT +.Dv MRT_INIT or -.Dq MRT6_INIT . +.Dv MRT6_INIT . The IPv4 upcalls have -.Dq struct igmpmsg -header (see ) with field -.Dq im_mbz +.Vt "struct igmpmsg" +header (see +.In netinet/ip_mroute.h ) >>> TRUNCATED FOR MAIL (1000 lines) <<<