Date: Sun, 3 Aug 2008 11:02:25 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 146514 for review Message-ID: <200808031102.m73B2PZ1005393@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=146514 Change 146514 by ed@ed_dull on 2008/08/03 11:02:22 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile.inc1#2 integrate .. //depot/projects/mpsafetty/etc/defaults/rc.conf#2 integrate .. //depot/projects/mpsafetty/etc/freebsd-update.conf#2 integrate .. //depot/projects/mpsafetty/etc/rc.d/named#2 integrate .. //depot/projects/mpsafetty/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/fmtcheck.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/fmtcheck.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/mpsafetty/lib/msun/i387/invtrig.c#1 branch .. //depot/projects/mpsafetty/lib/msun/ld80/invtrig.h#2 integrate .. //depot/projects/mpsafetty/lib/msun/src/e_acosl.c#2 integrate .. //depot/projects/mpsafetty/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/mpsafetty/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/mpsafetty/lib/msun/src/e_atan2l.c#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifgre.c#1 branch .. //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/mpsafetty/share/man/man4/wi.4#3 integrate .. //depot/projects/mpsafetty/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/mpsafetty/share/man/man9/firmware.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/timeout.9#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/mpsafetty/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/mpsafetty/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/param.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/AVILA#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/KB920X#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/NSLU#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/mpsafetty/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/mpsafetty/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#4 integrate .. //depot/projects/mpsafetty/sys/ddb/db_run.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/mpsafetty/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bpfdesc.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_loop.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_media.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/mpsafetty/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/mpsafetty/sys/sys/callout.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/elf_common.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/lib/libc/gen/Makefile#2 integrate .. //depot/projects/mpsafetty/tools/regression/lib/libc/gen/test-fmtcheck.c#1 branch .. //depot/projects/mpsafetty/tools/regression/lib/msun/test-invtrig.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/net80211/scripts/setup.dfs#2 integrate .. //depot/projects/mpsafetty/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/mpsafetty/usr.bin/ldd/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/ldd/ldd.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/printf/printf.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate Differences ... ==== //depot/projects/mpsafetty/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.609 2008/08/02 12:14:22 jhb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -453,7 +453,8 @@ .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t} + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + ${_t} .endfor .endif .for _t in obj includes @@ -475,13 +476,14 @@ .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all - cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -500,10 +502,11 @@ .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools @@ -666,7 +669,8 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute .if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \ + DISTRIBUTION=lib32 .endif distrib-dirs distribution: ==== //depot/projects/mpsafetty/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.337 2008/06/19 07:06:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.338 2008/08/01 05:15:54 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -234,8 +234,8 @@ # details. # named_enable="NO" # Run named, the DNS server (or NO). -named_program="/usr/sbin/named" # path to named, if you want a different one. -#named_flags="" # Flags for named +named_program="/usr/sbin/named" # Path to named, if you want a different one. +#named_flags="-c /etc/namedb/named.conf" # Uncomment for named not in /usr/sbin named_pidfile="/var/run/named/pid" # Must set this in named.conf as well named_uid="bind" # User to run named as named_chrootdir="/var/named" # Chroot directory (or "" not to auto-chroot it) ==== //depot/projects/mpsafetty/etc/freebsd-update.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.4 2008/03/25 12:13:12 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.5 2008/08/02 00:11:43 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from <security-officer@FreeBSD.org> telling you to @@ -21,6 +21,10 @@ # statement will be ignored. IgnorePaths +# Paths which start with anything matching an entry in an IDSIgnorePaths +# statement will be ignored by "freebsd-update IDS". +IDSIgnorePaths /usr/share/man/cat + # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been # modified by the user (unless changes are merged; see below). ==== //depot/projects/mpsafetty/etc/rc.d/named#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.28 2008/08/01 06:11:33 dougb Exp $ # # PROVIDE: named @@ -32,6 +32,8 @@ # chroot_autoupdate() { + local file + # Create (or update) the chroot directory structure # if [ -r /etc/mtree/BIND.chroot.dist ]; then @@ -64,12 +66,14 @@ devfs -m ${named_chrootdir}/dev rule apply path null unhide devfs -m ${named_chrootdir}/dev rule apply path random unhide - # Copy local timezone information if it is not up to date. + # Copy and/or update key files to the chroot /etc # - if [ -r /etc/localtime ]; then - cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || - cp -p /etc/localtime "${named_chrootdir}/etc/localtime" - fi + for file in localtime protocols services; do + if [ -r /etc/$file ]; then + cmp -s /etc/$file "${named_chrootdir}/etc/$file" || + cp -p /etc/$file "${named_chrootdir}/etc/$file" + fi + done } # Make symlinks to the correct pid file ==== //depot/projects/mpsafetty/games/fortune/datfiles/fortunes#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.269 2008/07/22 14:21:56 maxim Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.270 2008/08/02 20:11:56 phk Exp $ % ======================================================================= || || @@ -28112,6 +28112,10 @@ rolled back. -- Hunter S. Thompson, "Fear and Loathing in Las Vegas" % +"In the age of the internet attaching a famous name to your personal +opinion to give more weight to it is a very valid strategy." + -- Benjamin Franklin +% In the beginning there was nothing. And the Lord said "Let There Be Light!" And still there was nothing, but at least now you could see it. % @@ -34279,11 +34283,6 @@ My own business always bores me to death; I prefer other people's. -- Oscar Wilde % -My own feelings are perhaps best described by saying that I am -perfectly aware that there is no Royal Road to Mathematics, in other -words, that I have only a very small head and must live with it. - -- Edsger W. Dijkstra -% My own dear love, he is strong and bold And he cares not what comes after. His words ring sweet as a chime of gold, @@ -34294,6 +34293,11 @@ And I wish I'd never met him. -- Dorothy Parker, part 1 % +My own feelings are perhaps best described by saying that I am +perfectly aware that there is no Royal Road to Mathematics, in other +words, that I have only a very small head and must live with it. + -- Edsger W. Dijkstra +% My own life has been spent chronicling the rise and fall of human systems, and I am convinced that we are terribly vulnerable. ... We should be reluctant to turn back upon the frontier of this epoch. Space is indifferent ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/arm/Makefile#2 (text+ko) ==== @@ -1,8 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/Makefile,v 1.2 2007/11/17 21:30:03 cognet Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/Makefile,v 1.4 2008/08/02 12:33:39 cognet Exp $ GENSRCS+= xm.h LIBSRCS+= armfbsd-nat.c -LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c fbsd-threads.c +LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-threads.c +.endif nm.h: #XXX this should be arm/nm-fbsd.h but won't until it's merged into the gdb repo ==== //depot/projects/mpsafetty/lib/libc/gen/fmtcheck.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.9 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.10 2008/08/02 06:02:42 das Exp $ .Dd October 16, 2002 .Os .Dt FMTCHECK 3 @@ -112,6 +112,4 @@ .Sh BUGS The .Fn fmtcheck -function does not understand all of the conversions that -.Xr printf 3 -does. +function does not recognize positional parameters. ==== //depot/projects/mpsafetty/lib/libc/gen/fmtcheck.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ /* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.9 2008/08/02 06:02:42 das Exp $"); #include <stdio.h> #include <string.h> @@ -47,14 +47,18 @@ FMTCHECK_START, FMTCHECK_SHORT, FMTCHECK_INT, + FMTCHECK_WINTT, FMTCHECK_LONG, FMTCHECK_QUAD, + FMTCHECK_INTMAXT, FMTCHECK_PTRDIFFT, FMTCHECK_SIZET, + FMTCHECK_CHARPOINTER, FMTCHECK_SHORTPOINTER, FMTCHECK_INTPOINTER, FMTCHECK_LONGPOINTER, FMTCHECK_QUADPOINTER, + FMTCHECK_INTMAXTPOINTER, FMTCHECK_PTRDIFFTPOINTER, FMTCHECK_SIZETPOINTER, #ifndef NO_FLOATING_POINT @@ -62,6 +66,7 @@ FMTCHECK_LONGDOUBLE, #endif FMTCHECK_STRING, + FMTCHECK_WSTRING, FMTCHECK_WIDTH, FMTCHECK_PRECISION, FMTCHECK_DONE, @@ -69,6 +74,18 @@ }; typedef enum __e_fmtcheck_types EFT; +enum e_modifier { + MOD_NONE, + MOD_CHAR, + MOD_SHORT, + MOD_LONG, + MOD_QUAD, + MOD_INTMAXT, + MOD_LONGDOUBLE, + MOD_PTRDIFFT, + MOD_SIZET, +}; + #define RETURN(pf,f,r) do { \ *(pf) = (f); \ return r; \ @@ -77,101 +94,148 @@ static EFT get_next_format_from_precision(const char **pf) { - int sh, lg, quad, longdouble, ptrdifft, sizet; + enum e_modifier modifier; const char *f; - sh = lg = quad = longdouble = ptrdifft = sizet = 0; - f = *pf; switch (*f) { case 'h': f++; - sh = 1; + if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN); + if (*f == 'h') { + f++; + modifier = MOD_CHAR; + } else { + modifier = MOD_SHORT; + } + break; + case 'j': + f++; + modifier = MOD_INTMAXT; break; case 'l': f++; if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN); if (*f == 'l') { f++; - quad = 1; + modifier = MOD_QUAD; } else { - lg = 1; + modifier = MOD_LONG; } break; case 'q': f++; - quad = 1; + modifier = MOD_QUAD; break; case 't': f++; - ptrdifft = 1; + modifier = MOD_PTRDIFFT; break; case 'z': f++; - sizet = 1; + modifier = MOD_SIZET; break; case 'L': f++; - longdouble = 1; + modifier = MOD_LONGDOUBLE; break; default: + modifier = MOD_NONE; break; } if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN); if (strchr("diouxX", *f)) { - if (longdouble) - RETURN(pf,f,FMTCHECK_UNKNOWN); - if (lg) + switch (modifier) { + case MOD_LONG: RETURN(pf,f,FMTCHECK_LONG); - if (quad) + case MOD_QUAD: RETURN(pf,f,FMTCHECK_QUAD); - if (ptrdifft) + case MOD_INTMAXT: + RETURN(pf,f,FMTCHECK_INTMAXT); + case MOD_PTRDIFFT: RETURN(pf,f,FMTCHECK_PTRDIFFT); - if (sizet) + case MOD_SIZET: RETURN(pf,f,FMTCHECK_SIZET); - RETURN(pf,f,FMTCHECK_INT); + case MOD_CHAR: + case MOD_SHORT: + case MOD_NONE: + RETURN(pf,f,FMTCHECK_INT); + default: + RETURN(pf,f,FMTCHECK_UNKNOWN); + } } if (*f == 'n') { - if (longdouble) - RETURN(pf,f,FMTCHECK_UNKNOWN); - if (sh) + switch (modifier) { + case MOD_CHAR: + RETURN(pf,f,FMTCHECK_CHARPOINTER); + case MOD_SHORT: RETURN(pf,f,FMTCHECK_SHORTPOINTER); - if (lg) + case MOD_LONG: RETURN(pf,f,FMTCHECK_LONGPOINTER); - if (quad) + case MOD_QUAD: RETURN(pf,f,FMTCHECK_QUADPOINTER); - if (ptrdifft) + case MOD_INTMAXT: + RETURN(pf,f,FMTCHECK_INTMAXTPOINTER); + case MOD_PTRDIFFT: RETURN(pf,f,FMTCHECK_PTRDIFFTPOINTER); - if (sizet) + case MOD_SIZET: RETURN(pf,f,FMTCHECK_SIZETPOINTER); - RETURN(pf,f,FMTCHECK_INTPOINTER); + case MOD_NONE: + RETURN(pf,f,FMTCHECK_INTPOINTER); + default: + RETURN(pf,f,FMTCHECK_UNKNOWN); + } } if (strchr("DOU", *f)) { - if (sh + lg + quad + longdouble + ptrdifft + sizet) + if (modifier != MOD_NONE) RETURN(pf,f,FMTCHECK_UNKNOWN); RETURN(pf,f,FMTCHECK_LONG); } #ifndef NO_FLOATING_POINT if (strchr("aAeEfFgG", *f)) { - if (longdouble) + switch (modifier) { + case MOD_LONGDOUBLE: RETURN(pf,f,FMTCHECK_LONGDOUBLE); - if (sh + lg + quad + ptrdifft + sizet) + case MOD_LONG: + case MOD_NONE: + RETURN(pf,f,FMTCHECK_DOUBLE); + default: RETURN(pf,f,FMTCHECK_UNKNOWN); - RETURN(pf,f,FMTCHECK_DOUBLE); + } } #endif if (*f == 'c') { - if (sh + lg + quad + longdouble + ptrdifft + sizet) + switch (modifier) { + case MOD_LONG: + RETURN(pf,f,FMTCHECK_WINTT); + case MOD_NONE: + RETURN(pf,f,FMTCHECK_INT); + default: + RETURN(pf,f,FMTCHECK_UNKNOWN); + } + } + if (*f == 'C') { + if (modifier != MOD_NONE) RETURN(pf,f,FMTCHECK_UNKNOWN); - RETURN(pf,f,FMTCHECK_INT); + RETURN(pf,f,FMTCHECK_WINTT); } if (*f == 's') { - if (sh + lg + quad + longdouble + ptrdifft + sizet) + switch (modifier) { + case MOD_LONG: + RETURN(pf,f,FMTCHECK_WSTRING); + case MOD_NONE: + RETURN(pf,f,FMTCHECK_STRING); + default: + RETURN(pf,f,FMTCHECK_UNKNOWN); + } + } + if (*f == 'S') { + if (modifier != MOD_NONE) RETURN(pf,f,FMTCHECK_UNKNOWN); - RETURN(pf,f,FMTCHECK_STRING); + RETURN(pf,f,FMTCHECK_WSTRING); } if (*f == 'p') { - if (sh + lg + quad + longdouble + ptrdifft + sizet) + if (modifier != MOD_NONE) RETURN(pf,f,FMTCHECK_UNKNOWN); RETURN(pf,f,FMTCHECK_LONG); } ==== //depot/projects/mpsafetty/lib/libc/stdlib/getenv.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Sean C. Farley <scf@FreeBSD.org> + * Copyright (c) 2007-2008 Sean C. Farley <scf@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.13 2008/02/28 04:09:08 scf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.14 2008/08/02 02:34:35 scf Exp $"); #include "namespace.h" @@ -431,11 +431,13 @@ /* * Find environment variable via environ if no changes have been made - * via a *env() call or environ has been replaced by a running program, - * otherwise, use the rebuilt environment. + * via a *env() call or environ has been replaced or cleared by a + * running program, otherwise, use the rebuilt environment. */ if (envVars == NULL || environ != intEnviron) return (__findenv_environ(name, nameLen)); + else if (environ[0] == NULL) + return (NULL); else { envNdx = envVarsTotal - 1; return (__findenv(name, nameLen, &envNdx, true)); @@ -525,8 +527,8 @@ /* * If the program attempts to replace the array of environment variables - * (environ) environ, then deactivate all variables and merge in the new list - * from environ. + * (environ) environ or sets the first varible to NULL, then deactivate all + * variables and merge in the new list from environ. */ static int __merge_environ(void) @@ -534,8 +536,11 @@ char **env; char *equals; - /* environ has been replaced. clean up everything. */ - if (envVarsTotal > 0 && environ != intEnviron) { + /* + * Internally-built environ has been replaced or cleared. clean up + * everything. + */ + if (envVarsTotal > 0 && (environ != intEnviron || environ[0] == NULL)) { /* Deactivate all environment variables. */ if (envActive > 0) { origEnviron = NULL; ==== //depot/projects/mpsafetty/lib/libc/sys/ktrace.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ktrace.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.26 2008/07/13 13:42:52 remko Exp $ +.\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.27 2008/08/02 13:49:12 remko Exp $ .\" .Dd July 13, 2008 .Dt KTRACE 2 @@ -101,7 +101,7 @@ pid_t ktr_pid; /* process id */ char ktr_comm[MAXCOMLEN+1]; /* command name */ struct timeval ktr_time; /* timestamp */ - intptr_t ktr_tid; /* was ktr_buffer */ + intptr_t ktr_tid; /* was ktr_buffer */ }; .Ed .Pp ==== //depot/projects/mpsafetty/lib/msun/ld80/invtrig.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/lib/msun/ld80/invtrig.h,v 1.1 2008/07/31 22:41:26 das Exp $ + * $FreeBSD: src/lib/msun/ld80/invtrig.h,v 1.2 2008/08/02 03:56:22 das Exp $ */ #include <float.h> @@ -64,10 +64,21 @@ #define pio2_lo atanlo[3] #define pio4_hi atanhi[1] -extern const long double pS0, pS1, pS2, pS3, pS4, pS5, pS6; -extern const long double qS1, qS2, qS3, qS4, qS5; -extern const long double atanhi[], atanlo[], aT[]; -extern const long double pi_lo; +#ifdef STRUCT_DECLS +typedef struct longdouble { + uint64_t mant; + uint16_t expsign; +} LONGDOUBLE; +#else +typedef long double LONGDOUBLE; +#endif + +extern const LONGDOUBLE pS0, pS1, pS2, pS3, pS4, pS5, pS6; +extern const LONGDOUBLE qS1, qS2, qS3, qS4, qS5; +extern const LONGDOUBLE atanhi[], atanlo[], aT[]; +extern const LONGDOUBLE pi_lo; + +#ifndef STRUCT_DECLS static inline long double P(long double x) @@ -99,3 +110,5 @@ return (aT[1] + x * (aT[3] + x * (aT[5] + x * (aT[7] + x * \ (aT[9] + x * aT[11]))))); } + +#endif ==== //depot/projects/mpsafetty/lib/msun/src/e_acosl.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/msun/src/e_acosl.c,v 1.1 2008/07/31 22:41:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_acosl.c,v 1.2 2008/08/02 03:56:22 das Exp $"); /* * See comments in e_acos.c. @@ -27,9 +27,19 @@ #include "math_private.h" static const long double -one= 1.00000000000000000000e+00, +one= 1.00000000000000000000e+00; + +#ifdef __i386__ +/* XXX Work around the fact that gcc truncates long double constants on i386 */ +static volatile double +pi1 = 3.14159265358979311600e+00, /* 0x1.921fb54442d18p+1 */ +pi2 = 1.22514845490862001043e-16; /* 0x1.1a80000000000p-53 */ +#define pi ((long double)pi1 + pi2) +#else +static const long double pi = 3.14159265358979323846264338327950280e+00L; - +#endif + long double acosl(long double x) { ==== //depot/projects/mpsafetty/lib/msun/src/e_atan2.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.13 2008/07/31 22:41:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.14 2008/08/02 19:17:00 das Exp $"); /* __ieee754_atan2(y,x) * Method : @@ -109,17 +109,15 @@ /* compute y/x */ k = (iy-ix)>>20; - if(k > 60) z=pi_o_2+0.5*pi_lo; /* |y/x| > 2**60 */ - else if(hx<0&&k<-60) z=0.0; /* |y|/x < -2**60 */ + if(k > 60) { /* |y/x| > 2**60 */ + z=pi_o_2+0.5*pi_lo; + m&=1; + } + else if(hx<0&&k<-60) z=0.0; /* 0 > |y|/x > -2**-60 */ else z=atan(fabs(y/x)); /* safe to do y/x */ switch (m) { case 0: return z ; /* atan(+,+) */ - case 1: { - u_int32_t zh; - GET_HIGH_WORD(zh,z); - SET_HIGH_WORD(z,zh ^ 0x80000000); - } - return z ; /* atan(-,+) */ + case 1: return -z ; /* atan(-,+) */ case 2: return pi-(z-pi_lo);/* atan(+,-) */ default: /* case 3 */ return (z-pi_lo)-pi;/* atan(-,-) */ ==== //depot/projects/mpsafetty/lib/msun/src/e_atan2f.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.10 2008/08/01 01:24:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.11 2008/08/02 19:17:00 das Exp $"); #include "math.h" #include "math_private.h" @@ -80,17 +80,15 @@ /* compute y/x */ k = (iy-ix)>>23; - if(k > 26) z=pi_o_2+(float)0.5*pi_lo; /* |y/x| > 2**26 */ - else if(hx<0&&k<-26) z=0.0; /* |y|/x < -2**26 */ + if(k > 26) { /* |y/x| > 2**26 */ + z=pi_o_2+(float)0.5*pi_lo; + m&=1; + } + else if(hx<0&&k<-26) z=0.0; /* 0 > |y|/x > -2**-26 */ else z=atanf(fabsf(y/x)); /* safe to do y/x */ switch (m) { case 0: return z ; /* atan(+,+) */ - case 1: { - u_int32_t zh; - GET_FLOAT_WORD(zh,z); - SET_FLOAT_WORD(z,zh ^ 0x80000000); - } - return z ; /* atan(-,+) */ + case 1: return -z ; /* atan(-,+) */ case 2: return pi-(z-pi_lo);/* atan(+,-) */ default: /* case 3 */ return (z-pi_lo)-pi;/* atan(-,-) */ ==== //depot/projects/mpsafetty/lib/msun/src/e_atan2l.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2l.c,v 1.1 2008/07/31 22:41:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2l.c,v 1.3 2008/08/02 19:17:00 das Exp $"); /* * See comments in e_atan2.c. @@ -30,8 +30,18 @@ static volatile long double tiny = 1.0e-300; static const long double -zero = 0.0, -pi = 3.14159265358979323846264338327950280e+00L; +zero = 0.0; + +#ifdef __i386__ +/* XXX Work around the fact that gcc truncates long double constants on i386 */ +static volatile double +pi1 = 3.14159265358979311600e+00, /* 0x1.921fb54442d18p+1 */ +pi2 = 1.22514845490862001043e-16; /* 0x1.1a80000000000p-53 */ +#define pi ((long double)pi1 + pi2) +#else +static const long double +pi = 3.14159265358979323846264338327950280e+00L; +#endif long double atan2l(long double y, long double x) @@ -94,7 +104,10 @@ /* compute y/x */ k = expty-exptx; - if(k > LDBL_MANT_DIG+2) z=pio2_hi+pio2_lo; /* |y/x| huge */ + if(k > LDBL_MANT_DIG+2) { /* |y/x| huge */ + z=pio2_hi+pio2_lo; + m&=1; + } else if(expsignx<0&&k<-LDBL_MANT_DIG-2) z=0.0; /* |y/x| tiny, x<0 */ else z=atanl(fabsl(y/x)); /* safe to do y/x */ switch (m) { ==== //depot/projects/mpsafetty/sbin/ifconfig/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.34 2008/04/20 20:35:46 sam Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.35 2008/08/03 03:36:12 thompsa Exp $ .include <bsd.own.mk> @@ -23,6 +23,7 @@ SRCS+= ifmac.c # MAC support SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifgre.c # GRE keys etc SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support DPADD+= ${LIBBSDXML} ${LIBSBUF} ==== //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.149 2008/07/30 16:22:52 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.150 2008/08/02 18:10:14 sam Exp $ .\" .Dd July 30, 2008 .Dt IFCONFIG 8 @@ -1300,7 +1300,11 @@ .Fl v flag causes this information to be displayed symbolicaly. .It Cm list wme -Display the current parameters to use when operating in WME mode. +Display the current channel parameters to use when operating in WME mode. +If the +.Fl v +option is specified then both channel and BSS parameters are displayed +for each AC (first channel, then BSS). When WME mode is enabled for an adaptor this information will be displayed with the regular status; this command is mostly useful for examining parameters when WME mode is disabled. ==== //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.137 2008/06/20 17:26:34 thompsa Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.138 2008/08/03 03:36:12 thompsa Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -51,7 +51,6 @@ #include <net/ethernet.h> #include <net/if.h> -#include <net/if_gre.h> #include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> @@ -750,18 +749,6 @@ } static void -setifgrekey(const char *val, int dummy __unused, int s, - const struct afswtch *afp) -{ - uint32_t grekey = atol(val); - - strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name)); - ifr.ifr_data = (caddr_t)&grekey; - if (ioctl(s, GRESKEY, (caddr_t)&ifr) < 0) - warn("ioctl (set grekey)"); -} - -static void setifname(const char *val, int dummy __unused, int s, const struct afswtch *afp) { @@ -876,12 +863,6 @@ if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) printf("%s", ifs.ascii); - int grekey = 0; - ifr.ifr_data = (caddr_t)&grekey; - if (ioctl(s, GREGKEY, &ifr) == 0) - if (grekey != 0) - printf("\tgrekey: %d\n", grekey); - close(s); return; } @@ -1053,7 +1034,6 @@ DEF_CMD("noicmp", IFF_LINK1, setifflags), DEF_CMD_ARG("mtu", setifmtu), DEF_CMD_ARG("name", setifname), - DEF_CMD_ARG("grekey", setifgrekey), }; static __constructor void ==== //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.53 2008/08/01 01:27:52 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.55 2008/08/02 18:10:14 sam Exp $ */ /*- @@ -185,7 +185,7 @@ if (rdp == NULL) { rdp = lib80211_alloc_regdata(); if (rdp == NULL) - exit(-1); + errx(-1, "missing or corrupted regdomain database"); } return rdp; } @@ -3114,48 +3114,63 @@ } static void -list_wme(int s) +list_wme_aci(int s, const char *tag, int ac) { - static const char *acnames[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" }; - int ac, val; + int val; - for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++) { -again: - if (ac & IEEE80211_WMEPARAM_BSS) - printf("\t%s", " "); - else - printf("\t%s", acnames[ac]); + printf("\t%s", tag); - /* show WME BSS parameters */ - if (get80211wme(s, IEEE80211_IOC_WME_CWMIN, ac, &val) != -1) - printf(" cwmin %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_CWMAX, ac, &val) != -1) - printf(" cwmax %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_AIFS, ac, &val) != -1) - printf(" aifs %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_TXOPLIMIT, ac, &val) != -1) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808031102.m73B2PZ1005393>