Date: Wed, 30 Jul 2003 23:13:22 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 35255 for review Message-ID: <200307310613.h6V6DMvR019974@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=35255 Change 35255 by marcel@marcel_nfs on 2003/07/30 23:12:52 IFC @35254 Affected files ... .. //depot/projects/ia64/MAINTAINERS#35 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/b.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/lex.c#4 integrate .. //depot/projects/ia64/contrib/one-true-awk/main.c#7 integrate .. //depot/projects/ia64/contrib/one-true-awk/run.c#6 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#19 integrate .. //depot/projects/ia64/etc/rc.d/hostname#3 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#10 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#6 integrate .. //depot/projects/ia64/etc/rc.d/netif#3 integrate .. //depot/projects/ia64/etc/rc.d/ttys#4 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/makecontext.c#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#9 integrate .. //depot/projects/ia64/release/Makefile#62 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#111 integrate .. //depot/projects/ia64/release/sparc64/dokern.sh#2 delete .. //depot/projects/ia64/sbin/atm/fore_dnld/Makefile#3 integrate .. //depot/projects/ia64/sbin/atm/fore_dnld/fore_dnld.c#3 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#34 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#37 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#23 integrate .. //depot/projects/ia64/sys/alpha/include/param.h#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/ia64/sys/amd64/include/param.h#6 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#22 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#20 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#16 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatmvar.h#3 integrate .. //depot/projects/ia64/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#43 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#52 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#18 integrate .. //depot/projects/ia64/sys/i386/include/pcpu.h#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#83 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#33 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#72 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#31 integrate .. //depot/projects/ia64/sys/ia64/include/param.h#9 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#64 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#34 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#35 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#39 integrate .. //depot/projects/ia64/sys/powerpc/include/param.h#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#30 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#28 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/sparc64/include/param.h#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#22 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#43 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#42 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#27 integrate .. //depot/projects/ia64/sys/sys/param.h#38 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#46 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#31 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf.5#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#35 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $ +$FreeBSD: src/MAINTAINERS,v 1.76 2003/07/30 10:43:13 bp Exp $ subsystem login notes ----------------------------- @@ -78,6 +78,10 @@ unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. +nwfs bp In case of functional changes pre-commit review + requested. +contrib/smbfs bp Open for in-tree committs. In case of functional + changes pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/ia64/contrib/one-true-awk/FIXES#6 (text+ko) ==== @@ -25,6 +25,52 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Jul 29, 2003: + fixed (i think) the long-standing botch that included the beginning of + line state ^ for RE's in the set of valid characters; this led to a + variety of odd problems, including failure to properly match certain + regular expressions in non-US locales. thanks to ruslan for keeping + at this one. + +Jul 28, 2003: + n-th try at getting internationalization right, with thanks to volker + kiefel, arnold robbins and ruslan ermilov for advice, though they + should not be blamed for the outcome. according to posix, "." is the + radix character in programs and command line arguments regardless of + the locale; otherwise, the locale should prevail for input and output + of numbers. so it's intended to work that way. + + i have rescinded the attempt to use strcoll in expanding shorthands in + regular expressions (cclenter). its properties are much too + surprising; for example [a-c] matches aAbBc in locale en_US but abBcC + in locale fr_CA. i can see how this might arise by implementation + but i cannot explain it to a human user. (this behavior can be seen + in gawk as well; we're leaning on the same library.) + + the issue appears to be that strcoll is meant for sorting, where + merging upper and lower case may make sense (though note that unix + sort does not do this by default either). it is not appropriate + for regular expressions, where the goal is to match specific + patterns of characters. in any case, the notations [:lower:], etc., + are available in awk, and they are more likely to work correctly in + most locales. + + a moratorium is hereby declared on internationalization changes. + i apologize to friends and colleagues in other parts of the world. + i would truly like to get this "right", but i don't know what + that is, and i do not want to keep making changes until it's clear. + +Jul 4, 2003: + fixed bug that permitted non-terminated RE, as in "awk /x". + +Jun 1, 2003: + subtle change to split: if source is empty, number of elems + is always 0 and the array is not set. + +Mar 21, 2003: + added some parens to isblank, in another attempt to make things + internationally portable. + Mar 14, 2003: the internationalization changes, somewhat modified, are now reinstated. in theory awk will now do character comparisons ==== //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#6 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.5 2002/12/19 04:34:00 obrien Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.6 2003/07/30 06:50:31 ru Exp $ -Import of the February 1998 version of the "one true awk", as described +Import of the July 2003 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original source were taken from Brian Kernighan's home page +Original sources were taken from the Brian Kernighan's home page (http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -Novembe 29, 2002. +July 29, 2003. The following files were removed for this import: buildwin.bat makefile.win missing95.c + vcvars32.bat ytab.c ytab.h ytabc.bak @@ -20,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20021213 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20030729 ==== //depot/projects/ia64/contrib/one-true-awk/b.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include "awk.h" #include "ytab.h" -#define HAT (NCHARS-2) /* matches ^ in regular expr */ +#define HAT (NCHARS+2) /* matches ^ in regular expr */ /* NCHARS is 2**n */ #define MAXLIN 22 @@ -282,24 +282,9 @@ return c; } -static int collate_range_cmp(int a, int b) -{ - int r; - static char s[2][2]; - - if ((uschar)a == (uschar)b) - return 0; - s[0][0] = a; - s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (uschar)a - (uschar)b; - return r; -} - char *cclenter(const char *argp) /* add a character class */ { int i, c, c2; - int j; uschar *p = (uschar *) argp; uschar *op, *bp; static uschar *buf = 0; @@ -318,18 +303,15 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (collate_range_cmp(c, c2) > 0) { /* empty; ignore */ + if (c > c2) { /* empty; ignore */ bp--; i--; continue; } - for (j = 0; j < NCHARS; j++) { - if ((collate_range_cmp(c, j) > 0) || - collate_range_cmp(j, c2) > 0) - continue; + while (c < c2) { if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = j; + *bp++ = ++c; i++; } continue; @@ -718,11 +700,14 @@ * system i use, it's defined here. if some other locale has a richer * definition of "blank", define HAS_ISBLANK and provide your own * version. + * the parentheses here are an attempt to find a path through the maze + * of macro definition and/or function and/or version provided. thanks + * to nelson beebe for the suggestion; let's see if it works everywhere. */ #ifndef HAS_ISBLANK -int isblank(int c) +int (isblank)(int c) { return c==' ' || c=='\t'; } @@ -839,8 +824,6 @@ int i, j, k; int *p, *q; - if (c < 0 || c > 255) - FATAL("can't happen: neg char %d in cgoto", c); while (f->accept >= maxsetvec) { /* guessing here! */ maxsetvec *= 4; setvec = (int *) realloc(setvec, maxsetvec * sizeof(int)); ==== //depot/projects/ia64/contrib/one-true-awk/lex.c#4 (text+ko) ==== @@ -529,6 +529,8 @@ } } *bp = 0; + if (c == 0) + SYNTAX("non-terminated regular expression %.10s...", buf); yylval.s = tostring(buf); unput('/'); RET(REGEXPR); ==== //depot/projects/ia64/contrib/one-true-awk/main.c#7 (text+ko) ==== @@ -22,7 +22,7 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20030314"; +const char *version = "version 20030729"; #define DEBUG #include <stdio.h> @@ -55,10 +55,8 @@ { const char *fs = NULL; - setlocale(LC_ALL, ""); - setlocale(LC_COLLATE, ""); setlocale(LC_CTYPE, ""); - setlocale(LC_MESSAGES, ""); + setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */ cmdname = argv[0]; if (argc == 1) { fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); @@ -147,6 +145,7 @@ if (!safe) envinit(environ); yyparse(); + setlocale(LC_NUMERIC, ""); /* back to whatever it is locally */ if (fs) *FS = qstring(fs, '\0'); dprintf( ("errorflag=%d\n", errorflag) ); ==== //depot/projects/ia64/contrib/one-true-awk/run.c#6 (text+ko) ==== @@ -1221,7 +1221,7 @@ ap->sval = (char *) makesymtab(NSYMTAB); n = 0; - if ((*s != '\0' && strlen(fs) > 1) || arg3type == REGEXPR) { /* reg expr */ + if (*s != '\0' && (strlen(fs) > 1 || arg3type == REGEXPR)) { /* reg expr */ fa *pfa; if (arg3type == REGEXPR) { /* it's ready already */ pfa = (fa *) a[2]; ==== //depot/projects/ia64/etc/rc.d/Makefile#19 (text+ko) ==== @@ -1,24 +1,45 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.21 2003/07/28 13:30:42 harti Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.23 2003/07/30 20:05:20 mtm Exp $ .include <bsd.own.mk> -FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 bgfsck bootparams ccd cleanvar \ - cleartmp cron devd devfs dhclient diskless dmesg dumpon fsck \ - hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ - ipnat ipsec ipxrouted isdnd jail \ +FILES= DAEMON LOGIN NETWORKING SERVERS \ + abi accounting addswap adjkerntz amd \ + apm apmd archdep atm1 atm2 atm3 \ + bgfsck bootparams \ + ccd cleanvar cleartmp cron \ + devd devfs dhclient diskless \ + dmesg dumpon \ + early.sh \ + fsck \ + gbde \ + hostname \ + inetd initdiskless initrandom \ + ip6fw ipfilter ipfs ipfw ipmon \ + ipnat ipsec ipxrouted isdnd \ + jail \ kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localdaemons lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ - named netif netoptions network1 network2 network3 \ - network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ - ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ - rarpd rcconf.sh root route6d routed routing rpcbind rtadvd rwho savecore \ - securelevel sendmail serial sppp sshd swap1 syscons sysctl \ - syslogd timed ttys usbd vinum virecover watchdogd ypbind \ - yppasswdd ypserv ypset ypupdated ypxfrd + named netif netoptions \ + network1 network2 network3 \ + network_ipv6 nfsclient nfsd \ + nfslocking nfsserver nisdomain ntpd ntpdate \ + othermta \ + pccard pcvt ppp-user pppoed pwcheck \ + quota \ + random rarpd rcconf.sh root \ + route6d routed routing rpcbind rtadvd rwho \ + savecore securelevel sendmail \ + serial sppp sshd swap1 \ + syscons sysctl syslogd \ + timed ttys \ + usbd \ + vinum virecover \ + watchdogd \ + ypbind yppasswdd ypserv \ + ypset ypupdated ypxfrd FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} ==== //depot/projects/ia64/etc/rc.d/hostname#3 (text+ko) ==== @@ -23,11 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.2 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.3 2003/07/30 18:53:59 mtm Exp $ # # PROVIDE: hostname -# REQUIRE: mountcritlocal tty +# REQUIRE: mountcritlocal # BEFORE: netif # KEYWORD: FreeBSD ==== //depot/projects/ia64/etc/rc.d/ipfilter#10 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.11 2003/07/30 18:53:59 mtm Exp $ # # PROVIDE: ipfilter -# REQUIRE: root beforenetlkm mountcritlocal tty ipmon +# REQUIRE: root beforenetlkm mountcritlocal ipmon # BEFORE: netif # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/etc/rc.d/ipsec#6 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.5 2003/02/16 20:46:08 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.6 2003/07/30 18:53:59 mtm Exp $ # # PROVIDE: ipsec -# REQUIRE: root beforenetlkm mountcritlocal tty +# REQUIRE: root beforenetlkm mountcritlocal # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/etc/rc.d/netif#3 (text+ko) ==== @@ -22,11 +22,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.2 2003/06/29 05:34:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.3 2003/07/30 18:53:59 mtm Exp $ # # PROVIDE: netif -# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl tty +# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/ttys#4 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: ttys,v 1.1.1.1 2000/03/10 11:53:24 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ttys,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ttys,v 1.4 2003/07/30 18:53:59 mtm Exp $ # # PROVIDE: tty -# REQUIRE: root +# REQUIRE: root mountcritremote +# BEFORE: SERVERS # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64/lib/libc/alpha/gen/makecontext.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.2 2002/11/16 06:39:10 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.3 2003/07/30 06:36:20 marcel Exp $"); #include <sys/param.h> #include <sys/signal.h> @@ -90,7 +90,7 @@ * Make sure the context is valid. For now, we only allow * trapframe format contexts to be used for makecontext. */ - else if (ucp->uc_mcontext.mc_format == _MC_REV0_SIGFRAME) { + else if (ucp->uc_mcontext.mc_format == _MC_REV0_TRAPFRAME) { /* * Alpha passes the first 6 parameters in registers and * remaining parameters on the stack. Set up the context @@ -119,15 +119,15 @@ va_start(ap, argc); for (i = 0; i < argc; i++) { switch (i) { - case 0: ucp->uc_mcontext.mc_regs[FRAME_TRAPARG_A0] = + case 0: ucp->uc_mcontext.mc_regs[FRAME_A0] = (unsigned long)va_arg(ap, intptr_t); break; - case 1: ucp->uc_mcontext.mc_regs[FRAME_TRAPARG_A1] = + case 1: ucp->uc_mcontext.mc_regs[FRAME_A1] = (unsigned long)va_arg(ap, intptr_t); break; - case 2: ucp->uc_mcontext.mc_regs[FRAME_TRAPARG_A2] = + case 2: ucp->uc_mcontext.mc_regs[FRAME_A2] = (unsigned long)va_arg(ap, intptr_t); break; ==== //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91 -.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.17 2003/06/09 11:46:22 jhb Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.18 2003/07/31 02:13:48 davidxu Exp $ .\" .Dd September 20, 1993 .Dt I386_GET_LDT 2 @@ -73,6 +73,38 @@ .Aq Pa i386/segments.h . These structures are defined by the architecture as disjoint bit-fields, so care must be taken in constructing them. +.Pp +If +.Fa start_sel +is 0, +.Fa num_sels +is 1 and the descriptor pointed to by +.Fa descs +is legal, then +.Fn i386_set_ldt +will allocate a descriptor and return its +selector number. +.Pp +If +.Fa num_descs +is 1, +.Fa start_sels +is valid, and +.Fa descs +is NULL, then +.Fn i386_set_ldt +will free that descriptor +(making it available to be reallocated again later). +.Pp +If +.Fa num_descs +is 0, +.Fa start_sels +is 0 and +.Fa descs +is NULL then, as a special case, +.Fn i386_set_ldt +will free all descriptors. .Sh RETURN VALUES Upon successful completion, .Fn i386_get_ldt @@ -81,6 +113,8 @@ .Fn i386_set_ldt system call returns the first selector set. +In the case when a descriptor is allocated by the kernel, its number will +be returned. Otherwise, a value of -1 is returned and the global variable .Va errno ==== //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.39 2003/07/23 02:11:07 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.40 2003/07/30 13:28:05 deischen Exp $ */ #include <stdlib.h> #include <errno.h> @@ -1008,6 +1008,7 @@ * This thread now owns one less priority mutex. */ curthread->priority_mutex_count--; + THR_SCHED_UNLOCK(curthread, curthread); /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); ==== //depot/projects/ia64/release/Makefile#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.802 2003/07/29 18:29:44 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.806 2003/07/30 14:46:46 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -238,7 +238,7 @@ ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - # Things that need to be compiled without crypto support in releases -.if !defined(FIXCRYPTO) +.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease) FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \ cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS .endif @@ -295,10 +295,12 @@ DOCREL= doc.1 doc.2 .endif +.if !make(release) && !make(rerelease) BINMAKE!= cd ${.CURDIR}/..; ${MAKE} -V BINMAKE WMAKEENV!= cd ${.CURDIR}/..; \ ${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV WMAKE= ${WMAKEENV} ${BINMAKE} +.endif CVS_SRCARGS= -P .if defined(RELEASETAG) @@ -757,16 +759,10 @@ .endif .if defined(BOOTSIZE) @echo "Making the regular boot floppy." - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ - ${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \ - ${BOOTINODE} ${BOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern .endif .if defined(SMALLBOOTSIZE) @echo "Making the small boot floppy." - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ - ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ - ${BOOTINODE} ${SMALLBOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL .endif .if defined(BIGBOOTSIZE) @@ -1035,9 +1031,13 @@ doMFSKERN: @echo "Running ${.TARGET} for ${FSIMAGE}" @rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE} - @cd ${.CURDIR}/../sys/${TARGET}/conf && \ - sh ${.CURDIR}/${TARGET}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \ - [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints + @cd ${.CURDIR}/../sys/${TARGET}/conf; \ + if [ -r ${.CURDIR}/${TARGET}/dokern.sh ]; then \ + sh ${.CURDIR}/${TARGET}/dokern.sh ${FDSIZE}; \ + else \ + sed -e 's/ident.*GENERIC/ident BOOTMFS/g'; \ + fi < GENERIC > BOOTMFS; \ + [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints .if defined(FDSIZE) && ${FDSIZE} == "SMALL" && \ exists(${.CURDIR}/${TARGET}/drivers-small.conf) @awk -f ${.CURDIR}/scripts/driver-remove.awk \ @@ -1051,7 +1051,8 @@ cd ${.CURDIR}/..; \ KERNEL_KO=BOOTMFS KODIR= \ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES -DNO_KERNELCLEAN \ - KERNCONF=BOOTMFS COPTFLAGS="-Os -pipe" -DNO_CPU_COPTFLAGS \ + KERNCONF=BOOTMFS COPTFLAGS="-Os -fno-strict-aliasing -pipe" \ + -DNO_CPU_COPTFLAGS \ buildkernel reinstallkernel \ DESTDIR=${RD}/kernels [ -r ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS.hints ] && \ @@ -1110,10 +1111,16 @@ ${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \ ${BOOTINODE} ${BIGBOOTLABEL} .elif defined(FDSIZE) && ${FDSIZE} == "SMALL" + sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \ ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/image.${FSIMAGE} \ ${BOOTINODE} ${SMALLBOOTLABEL} .else + sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ + ${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \ + ${BOOTINODE} ${BOOTLABEL} sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \ ${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \ ${BOOTINODE} ${BOOTLABEL} ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#111 (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.602 2003/07/29 21:20:44 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.603 2003/07/30 08:36:16 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -350,6 +350,9 @@ <para>The <application>ACPI-CA</application> code has been updated from the 20030228 snapshot to the 20030619 snapshot.</para> + <para><application>awk</application> from Bell Labs has been + updated from a 14 March 2003 snapshot to a 29 July 2003 snapshot.</para> + <para><application>BIND</application> has been updated from 8.3.4 to 8.3.6.</para> ==== //depot/projects/ia64/sbin/atm/fore_dnld/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.8 2001/12/04 02:19:43 obrien Exp $ +# @(#) $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.9 2003/07/30 15:58:08 harti Exp $ # # @@ -32,7 +32,7 @@ SRCS= fore_dnld.c pca200e.c CFLAGS+= -I${.CURDIR}/../../../sys -WARNS= 0 +WARNS= 6 LDADD+= -latm DPADD+= ${LIBATM} ==== //depot/projects/ia64/sbin/atm/fore_dnld/fore_dnld.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $ + * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.14 2003/07/30 16:15:49 harti Exp $ * */ @@ -46,6 +46,7 @@ #include <netatm/atm_sap.h> #include <netatm/atm_sys.h> #include <netatm/atm_ioctl.h> +#include <netinet/in.h> #include <dev/hfa/fore.h> #include <dev/hfa/fore_aali.h> #include <dev/hfa/fore_slave.h> @@ -64,7 +65,7 @@ #include <unistd.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.14 2003/07/30 16:15:49 harti Exp $"); #endif extern u_char pca200e_microcode[]; @@ -79,38 +80,36 @@ #define MAX_CHECK 60 -int comm_mode = 0; -char *progname; +static int comm_mode = 0; +static const char *progname; -int tty; -cc_t vmin, vtime; +static int tty; +static cc_t vmin, vtime; #if (defined(BSD) && (BSD >= 199103)) -struct termios sgtty; +static struct termios sgtty; #define TCSETA TIOCSETA #define TCGETA TIOCGETA #else -struct termio sgtty; +static struct termio sgtty; #endif /* !BSD */ -int endian = 0; -int verbose = 0; -int reset = 0; +static int endian = 0; +static int verbose = 0; +static int reset = 0; -char line[132]; -int lineptr = 0; +static char line[132]; +static u_int lineptr; -Mon960 *Uart; +static Mon960 *Uart; -void -delay(cnt) - int cnt; +static void +delay(int cnt) { usleep(cnt); } -unsigned long -CP_READ ( val ) -unsigned long val; +static uint32_t +CP_READ(uint32_t val) { if ( endian ) return ( ntohl ( val ) ); @@ -118,9 +117,8 @@ return ( val ); } -unsigned long -CP_WRITE ( val ) -unsigned long val; +static uint32_t +CP_WRITE(uint32_t val) { if ( endian ) return ( htonl ( val ) ); @@ -137,9 +135,8 @@ * Returns: * none */ -void -error ( msg ) -char *msg; +static void +error(const char *msg) { printf ( "%s\n", msg ); exit (1); @@ -148,22 +145,18 @@ /* * Get a byte for the uart and if printing, display it. * - * Arguments: - * prn Are we displaying characters - * * Returns: * c Character from uart */ -char -getbyte ( prn ) -int prn; +static char +getbyte(void) { - int c; + char c; while ( ! ( CP_READ(Uart->mon_xmithost) & UART_VALID ) ) delay(10); - c = ( CP_READ(Uart->mon_xmithost) & UART_DATAMASK ); + c = CP_READ(Uart->mon_xmithost) & UART_DATAMASK; Uart->mon_xmithost = CP_WRITE(UART_READY); /* @@ -183,7 +176,7 @@ if (isprint(c) || (c == '\n') || (c == '\r')) putc(c, stdout); } - return ( c & 0xff ); + return (c); } /* @@ -196,16 +189,15 @@ * Returns: * none Line in global string 'line[]' */ -void -getline ( prn ) -int prn; +static void +getline(int prn) { char c = '\0'; - int i = 0; + u_int i = 0; while ( c != '>' && c != '\n' && c != '\r' ) { - c = getbyte(0); + c = getbyte(); if ( ++i >= sizeof(line) ) { if ( prn ) @@ -231,24 +223,22 @@ * Returns: * none */ -void -xmit_byte ( c, dn ) -unsigned char c; -int dn; +static void +xmit_byte(u_char c, int dn) { int val; while ( CP_READ(Uart->mon_xmitmon) != UART_READY ) { if ( CP_READ(Uart->mon_xmithost) & UART_VALID ) - getbyte ( 0 ); + getbyte(); if ( !dn ) delay ( 10000 ); } - val = ( c | UART_VALID ); + val = (int)c | UART_VALID; Uart->mon_xmitmon = CP_WRITE( val ); if ( !dn ) delay ( 10000 ); if ( CP_READ(Uart->mon_xmithost) & UART_VALID ) - getbyte ( 0 ); + getbyte(); } @@ -256,23 +246,20 @@ * Transmit a line to the i960. Eol must be included as part of text to transmit. * * Arguments: - * line Character string to transmit + * msg Character string to transmit * len len of string. This allows us to include NULL's * in the string/block to be transmitted. * * Returns: * none */ -void -xmit_to_i960 ( line, len, dn ) -char *line; -int len; -int dn; +static void +xmit_to_i960(const char *msg, int len, int dn) { - int i; + int i; - for ( i = 0; i < len; i++ ) - xmit_byte ( line[i], dn ); + for (i = 0; i < len; i++) + xmit_byte(msg[i], dn); } /* @@ -284,8 +271,8 @@ * Returns: * none */ -void -autobaud() +static void +autobaud(void) { if ( strncmp ( line, "Mon960", 6 ) == 0 ) xmit_to_i960 ( "\r\n\r\n\r\n\r\n", 8, 0 ); @@ -301,8 +288,8 @@ * none * */ -void -finish ( ret ) +static void +finish(int ret) { sgtty.c_lflag |= ( ICANON | ECHO ); sgtty.c_cc[VMIN] = vmin; @@ -321,11 +308,10 @@ * fname striped filename * */ -char * -basename ( path ) - char *path; +static const char * +basename(const char *path) { - char *fname; + const char *fname; if ( ( fname = strrchr ( path, '/' ) ) != NULL ) fname++; @@ -368,7 +354,7 @@ * from Usenet contribution by Mark G. Mendel, Network Systems Corp. * (ihnp4!umn-cs!hyper!mark) */ -unsigned short crctab[1<<B] = { +static unsigned short crctab[1<<B] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307310613.h6V6DMvR019974>