Date: Tue, 11 May 2004 23:06:30 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 52711 for review Message-ID: <200405120606.i4C66UoL088939@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=52711 Change 52711 by marcel@marcel_nfs on 2004/05/11 23:06:17 IFC @52708 Affected files ... .. //depot/projects/gdb/MAINTAINERS#8 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#4 integrate .. //depot/projects/gdb/games/morse/morse.6#3 integrate .. //depot/projects/gdb/games/morse/morse.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 integrate .. //depot/projects/gdb/include/fts.h#3 integrate .. //depot/projects/gdb/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/gdb/lib/libc/locale/big5.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/euc.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/gbk.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/mskanji.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/send.2#2 integrate .. //depot/projects/gdb/lib/libutil/login_cap.3#2 integrate .. //depot/projects/gdb/lib/libutil/login_cap.c#2 integrate .. //depot/projects/gdb/lib/libutil/login_class.3#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/gdb/sbin/natd/natd.c#3 integrate .. //depot/projects/gdb/share/examples/diskless/README.TEMPLATING#2 integrate .. //depot/projects/gdb/share/man/man4/ch.4#2 integrate .. //depot/projects/gdb/share/man/man4/fxp.4#2 integrate .. //depot/projects/gdb/share/man/man4/geom.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#7 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ichwd.4#1 branch .. //depot/projects/gdb/share/man/man5/elf.5#2 integrate .. //depot/projects/gdb/share/man/man5/style.Makefile.5#3 integrate .. //depot/projects/gdb/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/gdb/share/mk/sys.mk#4 integrate .. //depot/projects/gdb/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/gdb/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/gdb/sys/conf/Makefile.i386#2 integrate .. //depot/projects/gdb/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/gdb/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/gdb/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/gdb/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/gdb/sys/conf/files.i386#15 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/gdb/sys/dev/ichwd/ichwd.c#1 branch .. //depot/projects/gdb/sys/dev/ichwd/ichwd.h#1 branch .. //depot/projects/gdb/sys/dev/led/led.h#2 integrate .. //depot/projects/gdb/sys/dev/pccard/files.pccard#2 delete .. //depot/projects/gdb/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/gdb/sys/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/gdb/sys/dev/twe/twe.c#4 integrate .. //depot/projects/gdb/sys/dev/twe/twereg.h#2 integrate .. //depot/projects/gdb/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/gdb/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/gdb/sys/geom/geom_disk.c#3 integrate .. //depot/projects/gdb/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/gdb/sys/i386/conf/PAE#2 integrate .. //depot/projects/gdb/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#4 integrate .. //depot/projects/gdb/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/gdb/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/gdb/sys/i386/isa/atpic_vector.s#5 integrate .. //depot/projects/gdb/sys/i386/isa/clock.c#8 integrate .. //depot/projects/gdb/sys/i386/isa/icu.h#3 integrate .. //depot/projects/gdb/sys/i386/isa/npx.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/gdb/sys/modules/Makefile#10 integrate .. //depot/projects/gdb/sys/modules/ichwd/Makefile#1 branch .. //depot/projects/gdb/sys/net/rtsock.c#9 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate .. //depot/projects/gdb/sys/netinet/ip_output.c#8 integrate .. //depot/projects/gdb/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/counter.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/gdb/sys/sys/_label.h#3 integrate .. //depot/projects/gdb/sys/sys/acl.h#2 integrate .. //depot/projects/gdb/sys/sys/mac.h#4 integrate .. //depot/projects/gdb/sys/sys/mac_policy.h#4 integrate .. //depot/projects/gdb/sys/sys/regression.h#2 integrate .. //depot/projects/gdb/sys/sys/socket.h#5 integrate .. //depot/projects/gdb/sys/sys/ttycom.h#4 integrate .. //depot/projects/gdb/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/gdb/tools/regression/lib/libc/locale/test-mbrtowc.c#2 integrate .. //depot/projects/gdb/usr.bin/talk/io.c#3 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi.c#3 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/gdb/usr.sbin/config/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/config/config.h#2 integrate .. //depot/projects/gdb/usr.sbin/config/config.y#2 integrate .. //depot/projects/gdb/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/gdb/usr.sbin/config/lang.l#2 integrate .. //depot/projects/gdb/usr.sbin/config/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/config/mkmakefile.c#2 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.88 2004/04/19 17:47:45 tackerman Exp $ +$FreeBSD: src/MAINTAINERS,v 1.89 2004/05/10 10:07:25 pjd Exp $ subsystem login notes ----------------------------- @@ -92,6 +92,8 @@ changes pre-commit review requested. contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits +geom_concat pjd Pre-commit review requested. +geom_gate pjd Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.130 2004/04/29 06:14:00 cperciva Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.134 2004/05/11 17:26:15 fanf Exp $ % -- Gifts for Children -- @@ -7570,12 +7570,12 @@ "If I am elected, the concrete barriers around the WHITE HOUSE will be replaced by tasteful foam replicas of ANN MARGARET!" % +If I could drop dead right now, I'd be the happiest man alive! + -- Samuel Goldwyn +% If I 'cp /bin/csh /dev/audio' shouldn't I hear the ocean? -- Danno Coppock % -If I could drop dead right now, I'd be the happiest man alive! - -- Samuel Goldwyn -% If I don't drive around the park, I'm pretty sure to make my mark. If I'm in bed each night by ten, @@ -10141,6 +10141,9 @@ Neckties strangle clear thinking. -- Lin Yutang % +Network packets are like buses. You wait all day, and then 3Com +along at once. +% Never be led astray onto the path of virtue. % Never call a man a fool; borrow from him. @@ -12969,6 +12972,8 @@ "The climate of Bombay is such that its inhabitants have to live elsewhere." % +The computer gets faster! --Moore-- +% "The Computer made me do it." % The computing field is always in need of new cliches. ==== //depot/projects/gdb/games/fortune/datfiles/fortunes2#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.65 2004/04/20 19:20:17 ceri Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.69 2004/05/11 17:43:36 fanf Exp $ % ======================================================================= || || @@ -7648,6 +7648,11 @@ scientists. Researchers into the phenomenon cite the added concentration needed to "make sense" of such unnatural three dimensional objects. % +A regular expression goes into a pub with a friend, intending to +help him find a girl. However, when the cockney barman finds this +out, he says to it, "Ere! I'll have no pattern match-making in my +pub!" +% A rich man told me recently that a liberal is a man who tells other people what to do with their money. -- Imamu Amiri Baraka (Leroi Jones) ==== //depot/projects/gdb/games/morse/morse.6#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/games/morse/morse.6,v 1.12 2004/02/20 11:55:38 fanf Exp $ +.\" $FreeBSD: src/games/morse/morse.6,v 1.13 2004/05/11 11:11:14 dds Exp $ .\" -.Dd December 7, 2000 +.Dd May 11, 2004 .Dt MORSE 6 .Os .Sh NAME @@ -143,20 +143,20 @@ speaker device file .El .Sh ENVIRONMENT -If your +Your .Ev LC_CTYPE -locale codeset is -.Ql KOI8-R , -characters with the high-order bit set are interpreted as -Cyrillic characters. If your -.Ev LC_CTYPE -locale codeset is -.Ql ISO8859-1 -compatible, -they are interpreted -as belonging to the -.Ql ISO-8859-1 -character set. +locale codeset determines how +characters with the high-order bit set +are interpreted. +.Bl -tag -width ".Li ISO8859-15" -compact +.It Li ISO8859-1 +.It Li ISO8859-15 +Interpret characters with the high-order bit set as Western European characters. +.It Li KOI8-R +Interpret characters with the high-order bit set as Cyrillic characters. +.It Li ISO8859-7 +Interpret characters with the high-order bit set as Greek characters. +.El .Sh SEE ALSO .Xr speaker 4 .Sh HISTORY ==== //depot/projects/gdb/games/morse/morse.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.17 2004/02/20 13:46:39 fanf Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.18 2004/05/11 11:11:14 dds Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -145,7 +145,7 @@ }; -static const struct morsetab iso8859tab[] = { +static const struct morsetab iso8859_1tab[] = { {'á', ".--.-"}, {'à', ".--.-"}, {'â', ".--.-"}, @@ -160,6 +160,67 @@ {'\0', ""} }; +static const struct morsetab iso8859_7tab[] = { + /* + * The greek alphabet; you'll need an 8859-7 font in order + * to see the actual characters. + * This table does not implement: + * - the special sequences for the seven diphthongs, + * - the punctuation differences. + * Implementing these features would introduce too many + * special-cases in the program's main loop. + * The diphtong sequences are: + * alpha iota .-.- + * alpha upsilon ..-- + * epsilon upsilon ---. + * eta upsilon ...- + * omikron iota ---.. + * omikron upsilon ..- + * upsilon iota .--- + * The different punctuation symbols are: + * ; ..-.- + * ! --..-- + */ + {'á', ".-"}, /* alpha */ + {'Ü', ".-"}, /* alpha with acute */ + {'â', "-..."}, /* beta */ + {'ã', "--."}, /* gamma */ + {'ä', "-.."}, /* delta */ + {'å', "."}, /* epsilon */ + {'Ý', "."}, /* epsilon with acute */ + {'æ', "--.."}, /* zeta */ + {'ç', "...."}, /* eta */ + {'Þ', "...."}, /* eta with acute */ + {'è', "-.-."}, /* theta */ + {'é', ".."}, /* iota */ + {'ß', ".."}, /* iota with acute */ + {'ú', ".."}, /* iota with diairesis */ + {'À', ".."}, /* iota with acute and diairesis */ + {'ê', "-.-"}, /* kappa */ + {'ë', ".-.."}, /* lamda */ + {'ì', "--"}, /* mu */ + {'í', "-."}, /* nu */ + {'î', "-..-"}, /* xi */ + {'ï', "---"}, /* omicron */ + {'ü', "---"}, /* omicron with acute */ + {'ð', ".--."}, /* pi */ + {'ñ', ".-."}, /* rho */ + {'ó', "..."}, /* sigma */ + {'ò', "..."}, /* final sigma */ + {'ô', "-"}, /* tau */ + {'õ', "-.--"}, /* upsilon */ + {'ý', "-.--"}, /* upsilon with acute */ + {'û', "-.--"}, /* upsilon and diairesis */ + {'à', "-.--"}, /* upsilon with acute and diairesis */ + {'ö', "..-."}, /* phi */ + {'÷', "----"}, /* chi */ + {'ø', "--.-"}, /* psi */ + {'ù', ".--"}, /* omega */ + {'þ', ".--"}, /* omega with acute */ + + {'\0', ""} +}; + static const struct morsetab koi8rtab[] = { /* * the cyrillic alphabet; you'll need a KOI8R font in order @@ -335,7 +396,9 @@ hightab = koi8rtab; else if (strcmp(codeset, "ISO8859-1") == 0 || strcmp(codeset, "ISO8859-15") == 0) - hightab = iso8859tab; + hightab = iso8859_1tab; + else if (strcmp(codeset, "ISO8859-7") == 0) + hightab = iso8859_7tab; } if (lflag) ==== //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.47 2004/01/26 06:07:33 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.48 2004/05/10 17:45:51 obrien Exp $ */ /* * This works like "remote" but, you use it like this: @@ -537,9 +537,9 @@ * the last context switch to the debugger. * XXX do something with the floating-point registers? */ - supply_register (SP_REGNUM, (char *)&pcbp->pcb_fp); + supply_register (SP_REGNUM, (char *)&pcbp->pcb_ufp); supply_register (PC_REGNUM, (char *)&pcbp->pcb_pc); - f_addr = extract_address (&pcbp->pcb_fp, SPARC_INTREG_SIZE); + f_addr = extract_address (&pcbp->pcb_ufp, SPARC_INTREG_SIZE); /* Load the previous frame by hand (XXX) and supply it. */ read_memory (f_addr + SPOFF, (char *)&top, sizeof (top)); for (i = 0; i < 8; i++) ==== //depot/projects/gdb/include/fts.h#3 (text+ko) ==== @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: src/include/fts.h,v 1.8 2004/05/08 15:09:01 peadar Exp $ + * $FreeBSD: src/include/fts.h,v 1.9 2004/05/10 09:36:26 bde Exp $ */ #ifndef _FTS_H_ #define _FTS_H_ -struct _fts_private; /* implementation data */ - typedef struct { struct _ftsent *fts_cur; /* current node */ struct _ftsent *fts_child; /* linked list of children */ @@ -65,7 +63,7 @@ #define FTS_STOP 0x200 /* (private) unrecoverable error */ int fts_options; /* fts_open options, global flags */ void *fts_clientptr; /* thunk for sort function */ - struct _fts_private *fts_priv; /* Implementation data */ + struct _fts_private *fts_priv; /* implementation data */ } FTS; typedef struct _ftsent { ==== //depot/projects/gdb/lib/libc/gen/syslog.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.29 2003/02/10 08:31:28 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.30 2004/05/10 17:12:52 dds Exp $"); #include "namespace.h" #include <sys/types.h> @@ -222,6 +222,10 @@ cnt = sizeof(tbuf) - tbuf_cookie.left; + /* Remove a trailing newline */ + if (tbuf[cnt - 1] == '\n') + cnt--; + /* Output to stderr if requested. */ if (LogStat & LOG_PERROR) { struct iovec iov[2]; ==== //depot/projects/gdb/lib/libc/gen/ualarm.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.17 2002/12/29 00:59:09 mike Exp $ +.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.18 2004/05/09 11:11:21 brueffer Exp $ .\" .Dd April 19, 1994 .Dt UALARM 3 @@ -68,8 +68,8 @@ to the process every .Fa interval microseconds after the timer expires (e.g. after -.Fa value -microseconds have passed). +.Fa microseconds +number of microseconds have passed). .Pp Due to .Xr setitimer 2 @@ -78,7 +78,7 @@ and .Fa interval is limited to 100000000000000 -(in case this value fit in the unsigned integer). +(in case this value fits in the unsigned integer). .Sh RETURN VALUES When the signal has successfully been caught, .Fn ualarm ==== //depot/projects/gdb/lib/libc/locale/big5.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.12 2004/04/12 13:09:17 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.13 2004/05/11 14:08:22 tjr Exp $"); #include <errno.h> #include <runetype.h> @@ -122,6 +122,10 @@ if (n == 0 || (size_t)(len = _big5_check(*s)) > n) /* Incomplete multibyte sequence */ return ((size_t)-2); + if (n == 2 && s[1] == '\0') { + errno = EILSEQ; + return ((size_t)-1); + } wc = 0; i = len; while (i-- > 0) ==== //depot/projects/gdb/lib/libc/locale/euc.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.16 2004/04/12 13:09:17 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.17 2004/05/11 14:08:22 tjr Exp $"); #include <errno.h> #include <limits.h> @@ -185,8 +185,14 @@ /* FALLTHROUGH */ case 1: case 0: - while (remain-- > 0) + wc = (unsigned char)*s++; + while (--remain > 0) { + if (*s == '\0') { + errno = EILSEQ; + return ((size_t)-1); + } wc = (wc << 8) | (unsigned char)*s++; + } break; } wc = (wc & ~CEI->mask) | CEI->bits[set]; ==== //depot/projects/gdb/lib/libc/locale/gbk.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/param.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.7 2004/04/12 13:09:18 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.8 2004/05/11 14:08:22 tjr Exp $"); #include <errno.h> #include <runetype.h> @@ -119,6 +119,10 @@ if (n == 0 || (size_t)(len = _gbk_check(*s)) > n) /* Incomplete multibyte sequence */ return ((size_t)-2); + if (n == 2 && s[1] == '\0') { + errno = EILSEQ; + return ((size_t)-1); + } wc = 0; i = len; while (i-- > 0) ==== //depot/projects/gdb/lib/libc/locale/mskanji.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.13 2004/04/12 13:09:18 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.14 2004/05/11 14:08:22 tjr Exp $"); #include <errno.h> #include <runetype.h> @@ -118,6 +118,10 @@ if (n < 2) /* Incomplete multibyte sequence */ return ((size_t)-2); + if (*s == '\0') { + errno = EILSEQ; + return ((size_t)-1); + } wc = (wc << 8) | (*s++ & 0xff); len = 2; } ==== //depot/projects/gdb/lib/libc/locale/runetype.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.8 2002/08/21 16:19:56 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.9 2004/05/09 13:04:49 tjr Exp $"); #include <stdio.h> #include <rune.h> @@ -44,21 +44,25 @@ ___runetype(c) __ct_rune_t c; { - int x; + size_t lim; _RuneRange *rr = &_CurrentRuneLocale->runetype_ext; - _RuneEntry *re = rr->ranges; + _RuneEntry *base, *re; if (c < 0 || c == EOF) return(0L); - for (x = 0; x < rr->nranges; ++x, ++re) { - if (c < re->min) - return(0L); - if (c <= re->max) { + /* Binary search -- see bsearch.c for explanation. */ + base = rr->ranges; + for (lim = rr->nranges; lim != 0; lim >>= 1) { + re = base + (lim >> 1); + if (re->min <= c && c <= re->max) { if (re->types) return(re->types[c - re->min]); else return(re->map); + } else if (c > re->max) { + base = re + 1; + lim--; } } ==== //depot/projects/gdb/lib/libc/locale/tolower.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.8 2002/08/21 16:19:56 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.9 2004/05/09 13:04:49 tjr Exp $"); #include <stdio.h> #include <rune.h> @@ -44,18 +44,23 @@ ___tolower(c) __ct_rune_t c; { - int x; + size_t lim; _RuneRange *rr = &_CurrentRuneLocale->maplower_ext; - _RuneEntry *re = rr->ranges; + _RuneEntry *base, *re; if (c < 0 || c == EOF) return(c); - for (x = 0; x < rr->nranges; ++x, ++re) { - if (c < re->min) - return(c); - if (c <= re->max) - return(re->map + c - re->min); + /* Binary search -- see bsearch.c for explanation. */ + base = rr->ranges; + for (lim = rr->nranges; lim != 0; lim >>= 1) { + re = base + (lim >> 1); + if (re->min <= c && c <= re->max) + return (re->map + c - re->min); + else if (c > re->max) { + base = re + 1; + lim--; + } } return(c); ==== //depot/projects/gdb/lib/libc/locale/toupper.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/toupper.c,v 1.8 2002/08/21 16:19:56 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/toupper.c,v 1.9 2004/05/09 13:04:49 tjr Exp $"); #include <stdio.h> #include <rune.h> @@ -44,18 +44,23 @@ ___toupper(c) __ct_rune_t c; { - int x; + size_t lim; _RuneRange *rr = &_CurrentRuneLocale->mapupper_ext; - _RuneEntry *re = rr->ranges; + _RuneEntry *base, *re; if (c < 0 || c == EOF) return(c); - for (x = 0; x < rr->nranges; ++x, ++re) { - if (c < re->min) - return(c); - if (c <= re->max) - return(re->map + c - re->min); + /* Binary search -- see bsearch.c for explanation. */ + base = rr->ranges; + for (lim = rr->nranges; lim != 0; lim >>= 1) { + re = base + (lim >> 1); + if (re->min <= c && c <= re->max) + return (re->map + c - re->min); + else if (c > re->max) { + base = re + 1; + lim--; + } } return(c); ==== //depot/projects/gdb/lib/libc/sys/send.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.22 2003/09/10 19:19:49 roberto Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.23 2004/05/11 16:28:07 csjp Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 @@ -189,6 +189,10 @@ The remote host was down. .It Bq Er ENETDOWN The remote network was down. +.It Bq Er EPERM +The process using a SOCK_RAW socket was jailed and the source +address specified in the IP header did not match the IP +address bound to the prison. .It Bq Er EPIPE The socket is unable to send anymore data (SS_CANTSENDMORE has been set on the socket). This typically means that the socket ==== //depot/projects/gdb/lib/libutil/login_cap.3#2 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.30 2003/03/24 15:55:03 charnier Exp $ +.\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.31 2004/05/11 11:05:26 dds Exp $ .\" .Dd December 27, 1996 .Os @@ -175,13 +175,15 @@ of the program handling a login itself. .Pp As noted above, the -.Fn get*class +.Fn login_get*class functions return a login_cap_t object which is used to access the matching or default record in the capabilities database. The -.Fn getclassbyname +.Fn login_getclassbyname function accepts two arguments: the first one is the record identifier of the -record to be retrieved, the second is an optional directory name. +record to be retrieved, the second is an optional pointer to a +.Li passwd +structure. If the first .Ar name argument is NULL, an empty string, or a class that does not exist @@ -189,9 +191,17 @@ .Em default record is returned instead. If the second -.Ar dir +.Ar pwd parameter is NULL, then only the system login class database is -used, but when not NULL, the named directory is searched for +used. +However, +if the +.Ar pwd +parameter and the value of +.Ar pwd->pw_dir +are both not NULL, then the directory contained in +.Ar pwd->pw_dir +is searched for a login database file called ".login_conf", and capability records contained within it may override the system defaults. This scheme allows users to override some login settings from @@ -215,6 +225,15 @@ .Pa .login_conf merely provides a convenient way for a user to set up their preferred login environment before the shell is invoked on login. +Note that access to the +.Pa /etc/login.conf +and +.Pa .login_conf +files will only be performed subject to the security checks documented in +.Xr _secure_path 3 +for the uids 0 and +.Ar pwd->pw_uid +respectively. .Pp If the specified record is NULL, empty or does not exist, and the system has no "default" record available to fall back to, there is a ==== //depot/projects/gdb/lib/libutil/login_cap.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.31 2003/10/26 03:51:47 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.32 2004/05/11 11:05:26 dds Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -172,9 +172,10 @@ * login_getclassbyname() get the login class by its name. * If the name given is NULL or empty, the default class * LOGIN_DEFCLASS (ie. "default") is fetched. If the - * 'dir' argument contains a non-NULL non-empty string, - * then the file _FILE_LOGIN_CONF is picked up from that - * directory instead of the system login database. + * 'pwd' argument is non-NULL and contains an non-NULL + * dir entry, then the file _FILE_LOGIN_CONF is picked + * up from that directory and used before the system + * login database. * Return a filled-out login_cap_t structure, including * class name, and the capability record buffer. */ ==== //depot/projects/gdb/lib/libutil/login_class.3#2 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.16 2003/04/26 15:18:27 trhodes Exp $ +.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.17 2004/05/11 11:10:09 dds Exp $ .\" .Dd December 28, 1996 .Os @@ -65,10 +65,10 @@ The .Fn setusercontext function sets class context values based on a given login_cap_t -object, a specific passwd record (if login_cap_t is NULL), -sets the current session's login and the current process +object and a specific passwd record (if login_cap_t is NULL), +the current session's login, and the current process user and group ownership. -Each of these functions is selectable via bit-flags passed +Each of these actions is selectable via bit-flags passed in the .Ar flags parameter, which is comprised of one or more of the following: ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/errata/article.sgml#5 (text+ko) ==== @@ -42,7 +42,7 @@ The &os; Project </corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.67 2004/03/30 17:43:26 kensmith Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.68 2004/05/09 23:07:08 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -203,6 +203,20 @@ for a more detailed description and instructions on how to patch existing systems.</para> + <para>(9 May 2004) Two programming errors in + <application>CVS</application> can allow a server to overwrite + arbitrary files on the client, and a client to read arbitrary + files on the server when accessing remote CVS repositories. + More details, including patch and upgrade information, can be + found in security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:07.cvs.asc">FreeBSD-SA-04:07</ulink>.</para>; + + <para>(9 May 2004) <application>Heimdal</application> may, under + some circumstances, not perform adequate checking of + authentication across autonomous realms. For more information, + see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:08.heimdal.asc">FreeBSD-SA-04:08</ulink>.</para>; + ]]> </sect1> ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.217 2004/04/06 12:19:09 rik Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.218 2004/05/09 21:27:15 simon Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -737,41 +737,7 @@ (&man.fe.4; driver)</para> <para arch="i386,pc98,alpha,ia64,sparc64,amd64">Intel 82557-, 82258-, 82559-, 82550- - or 82562-based Fast Ethernet NICs (&man.fxp.4; driver) - <itemizedlist> - <listitem> - <para>Intel EtherExpress Pro/100B PCI Fast Ethernet</para> - </listitem> - <listitem arch="i386,alpha,ia64,amd64"> - <para>Intel InBusiness 10/100 PCI Network Adapter</para> - </listitem> - <listitem> - <para>Intel PRO/100+ Management Adapter</para> - </listitem> - <listitem> - <para>Intel Pro/100 VE Desktop Adapter</para> - </listitem> - <listitem> - <para>Intel Pro/100 M Desktop Adapter</para> - </listitem> - <listitem> - <para>Intel Pro/100 S Desktop, Server and Dual-Port Server Adapters</para> - </listitem> - <listitem arch="i386,ia64,amd64"> - <para>On-board Ethernet NICs on many Intel motherboards.</para> - </listitem> - <listitem arch="pc98"> - <para>NEC PC-9821Ra20, Rv20, Xv13, Xv20 internal 100Base-TX - (PCI)</para> - </listitem> - <listitem arch="pc98"> - <para>NEC PC-9821X-B06 (PCI)</para> - </listitem> - <listitem arch="pc98"> - <para>Contec C-NET(PI)-100TX (PCI)</para> - </listitem> - </itemizedlist> - </para> + or 82562-based Fast Ethernet NICs (&man.fxp.4; driver)</para> <para arch="i386,amd64">Intel 82595-based Ethernet NICs (&man.ex.4; driver) </para> ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.724 2004/05/06 13:51:00 joerg Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.726 2004/05/09 23:04:47 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -181,6 +181,12 @@ on the server when accessing remote CVS repositories. More details can be found in security advisory <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:07.cvs.asc">FreeBSD-SA-04:07</ulink>. &merged;</para> + + <para>A bugfix for <application>Heimdal</application> rectifies a + problem in which it would not perform adequate checking of + authentication across autonomous realms. For more information, + see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:08.heimdal.asc">FreeBSD-SA-04:08</ulink>. &merged;</para> </sect2> <sect2 id="kernel"> ==== //depot/projects/gdb/sbin/natd/natd.c#3 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.45 2004/04/13 11:23:13 luigi Exp $"); +__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.46 2004/05/10 22:33:12 hmp Exp $"); #define SYSLOG_NAMES @@ -1379,7 +1379,7 @@ int i; struct alias_link *link = NULL; - strcpy (buf, parms); + strlcpy (buf, parms, sizeof(buf)); /* * Extract protocol. */ @@ -1510,7 +1510,7 @@ char* protoName; struct protoent *protoent; - strcpy (buf, parms); + strlcpy (buf, parms, sizeof(buf)); /* * Extract protocol. */ @@ -1564,7 +1564,7 @@ char* serverPool; struct alias_link *link; - strcpy (buf, parms); + strlcpy (buf, parms, sizeof(buf)); /* * Extract local address. */ ==== //depot/projects/gdb/share/examples/diskless/README.TEMPLATING#2 (text+ko) ==== @@ -11,7 +11,7 @@ and the /usr/share/examples/diskless/clone_root script which can be useful to set up clients and server for diskless boot. ---- $FreeBSD: src/share/examples/diskless/README.TEMPLATING,v 1.3 2002/03/15 06:47:37 luigi Exp $ --- +--- $FreeBSD: src/share/examples/diskless/README.TEMPLATING,v 1.4 2004/05/10 20:39:32 simon Exp $ --- ------------------------------------------------------------------------ TEMPLATING machine configurations @@ -183,7 +183,7 @@ file in / or /usr on a target machine instead of the template machine. If the target machine is updated once a night from cron, the sysop quickly learns not to do this ( because his changes get overwritten - overnight ). With a manual update, these sorts of mistakes can propogate + overnight ). With a manual update, these sorts of mistakes can propagate for weeks or months before they are caught. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405120606.i4C66UoL088939>