Date: Thu, 28 Jul 2005 15:45:35 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81123 for review Message-ID: <200507281545.j6SFjZb0061019@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81123 Change 81123 by sam@sam_ebb on 2005/07/28 15:44:44 IFC @ 81122 Affected files ... .. //depot/projects/wifi/bin/csh/USD.doc/csh.2#3 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/wifi/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/wifi/etc/devd.conf#10 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#6 integrate .. //depot/projects/wifi/sbin/dhclient/bpf.c#5 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#10 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#4 integrate .. //depot/projects/wifi/sbin/geom/class/eli/Makefile#2 integrate .. //depot/projects/wifi/sbin/reboot/boot_i386.8#4 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/wifi/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/wifi/usr.bin/vmstat/vmstat.c#6 integrate Differences ... ==== //depot/projects/wifi/bin/csh/USD.doc/csh.2#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.2 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.10 2005/01/10 08:39:21 imp Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.11 2005/07/28 12:40:23 keramida Exp $ .\" .nr H1 1 .NH @@ -673,7 +673,7 @@ Job numbers remain the same until the job terminates and then are re-used. .PP -When a job is started in the backgound using `&', its number, as well +When a job is started in the background using `&', its number, as well as the process numbers of all its (top level) commands, is typed by the shell before prompting you for another command. For example, @@ -699,7 +699,7 @@ .I stop command described below. When jobs are suspended they merely stop any further progress until started again, either in the foreground -or the backgound. The shell notices when a job becomes stopped and +or the background. The shell notices when a job becomes stopped and reports this fact, much like it reports the termination of background jobs. For foreground jobs this looks like .DS @@ -742,7 +742,7 @@ it in the background allowing more foreground commands to be executed. This is especially helpful when a foreground job ends up taking longer than you expected and you -wish you had started it in the backgound in the beginning. +wish you had started it in the background in the beginning. .PP All .I "job control" @@ -775,7 +775,7 @@ The .I jobs command types the table of jobs, giving the job number, -commands and status (`Stopped' or `Running') of each backgound or +commands and status (`Stopped' or `Running') of each background or suspended job. With the `\-l' option the process numbers are also typed. .DS @@ -874,7 +874,7 @@ Some time later when the `s' command was finished, .I ed tried to read another command and was stopped because jobs -in the backgound cannot read from the terminal. The +in the background cannot read from the terminal. The .I fg command returned the `ed' job to the foreground where it could once again accept commands from the terminal. ==== //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $ -.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.17 2005/06/16 20:21:03 ru Exp $ +.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.18 2005/07/28 13:03:19 keramida Exp $ .\" .Dd April 7, 1997 .Dt AMD.CONF 5 @@ -571,7 +571,7 @@ .Nm amd . If .Dq yes , -then the name refered to by +then the name referred to by .Va ${rhost} is normalized relative to the host database before being used. The effect is ==== //depot/projects/wifi/contrib/cvs/man/cvs.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.21 2004/04/15 01:17:26 peter Exp $ +.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.22 2005/07/28 13:53:45 keramida Exp $ .de Id .ds Rv \\$3 .ds Dt \\$4 @@ -584,7 +584,7 @@ .B \-T Create/Update CVS/Template by copying it from the (local) repository. This option is useful for developers maintaining a local cvs repository -but commiting to a remote repository. By maintaining CVS/Template the +but committing to a remote repository. By maintaining CVS/Template the remote commits will still be able to bring up the proper template in the commit editor session. Available with the ==== //depot/projects/wifi/etc/devd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.26 2005/06/07 04:49:11 brooks Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.27 2005/07/28 03:51:54 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -17,11 +17,12 @@ pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. + #XXX Yes, these are gross -- imp set ethernet-nic-regex - "(an|ar|ath|aue|awi|axe|bfe|bge|cdce|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|hme|ie|iwi|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ - rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|\ - xe|xl)\ + "(an|ar|ath|aue|awi|axe|bfe|bge|cdce|cm|cnw|cs|cue|dc|de|ed|el|\ + em|ep|ex|fe|fxp|gem|hme|ie|ipw|iwi|kue|lge|lnc|my|nge|pcn|ral|\ + ray|re|rl|rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|ural|vge|\ + vr|vx|wb|wi|xe|xl)\ [0-9]+"; set scsi-controller-regex "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ @@ -89,7 +90,8 @@ }; # -# Rescan scsi device-names on attach, but not detach. +# Rescan scsi device-names on attach, but not detach. However, it is +# disabled by default due to reports of problems. # attach 0 { device-name "$scsi-controller-regex"; ==== //depot/projects/wifi/etc/mtree/BSD.include.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.100 2005/06/09 19:45:05 jkoshy Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.101 2005/07/28 00:53:47 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -94,6 +94,8 @@ geom concat .. + eli + .. gate .. label ==== //depot/projects/wifi/lib/libthr/thread/thr_umtx.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/libthr/thread/thr_umtx.h,v 1.1 2005/04/02 01:20:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.2 2005/07/28 03:34:54 davidxu Exp $ */ #ifndef _THR_FBSD_UMTX_H_ @@ -47,30 +47,36 @@ static inline int _thr_umtx_trylock(volatile umtx_t *mtx, long id) { - return umtx_trylock((struct umtx *)mtx, id); + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) + return (0); + return (EBUSY); } static inline int _thr_umtx_lock(volatile umtx_t *mtx, long id) { - if (atomic_cmpset_acq_ptr(mtx, (void *)UMTX_UNOWNED, (void *)id)) + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) return (0); - return __thr_umtx_lock(mtx, id); + return (__thr_umtx_lock(mtx, id)); } static inline int _thr_umtx_timedlock(volatile umtx_t *mtx, long id, const struct timespec *timeout) { - if (atomic_cmpset_acq_ptr(mtx, (void *)UMTX_UNOWNED, (void *)id)) + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) return (0); - return __thr_umtx_timedlock(mtx, id, timeout); + return (__thr_umtx_timedlock(mtx, id, timeout)); } static inline int _thr_umtx_unlock(volatile umtx_t *mtx, long id) { - if (atomic_cmpset_rel_ptr(mtx, (void *)id, (void *)UMTX_UNOWNED)) + if (atomic_cmpset_rel_ptr((volatile uintptr_t *)mtx, + (uintptr_t)id, (uintptr_t)UMTX_UNOWNED)) return (0); return __thr_umtx_unlock(mtx, id); } ==== //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.33 2005/02/10 09:19:28 ru Exp $ +.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.34 2005/07/28 10:48:07 keramida Exp $ .\" .Dd July 17, 1995 .Dt CCDCONFIG 8 @@ -229,7 +229,7 @@ The initial disklabel returned by .Xr ccd 4 specifies only 3 partitions. -One needs to change the number of paritions to 8 using +One needs to change the number of partitions to 8 using .Dq Nm disklabel Fl e to get the usual .Bx ==== //depot/projects/wifi/sbin/dhclient/bpf.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $ */ -/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.3 2005/07/27 19:25:46 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.4 2005/07/28 15:30:19 brooks Exp $ */ /* BPF socket interface code, originally contributed by Archie Cobbs. */ @@ -325,7 +325,9 @@ * do is drop it. */ if (hdr.bh_caplen != hdr.bh_datalen) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } @@ -339,7 +341,9 @@ * this packet. */ if (offset < 0) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } interface->rbuf_offset += offset; @@ -351,7 +355,9 @@ /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } interface->rbuf_offset += offset; @@ -363,14 +369,18 @@ * life, though). */ if (hdr.bh_caplen > len) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } /* Copy out the data in the packet... */ memcpy(buf, interface->rbuf + interface->rbuf_offset, hdr.bh_caplen); - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); return (hdr.bh_caplen); } while (!length); return (0); ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.7 2005/07/25 04:32:40 sam Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.8 2005/07/28 00:24:39 brooks Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -987,7 +987,12 @@ lease->address.len = sizeof(packet->raw->yiaddr); memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len); - /* If the server name was filled out, copy it. */ + /* If the server name was filled out, copy it. + Do not attempt to validate the server name as a host name. + RFC 2131 merely states that sname is NUL-terminated (which do + do not assume) and that it is the server's host name. Since + the ISC client and server allow arbitrary characters, we do + as well. */ if ((!packet->options[DHO_DHCP_OPTION_OVERLOAD].len || !(packet->options[DHO_DHCP_OPTION_OVERLOAD].data[0] & 2)) && packet->raw->sname[0]) { @@ -999,12 +1004,6 @@ } memcpy(lease->server_name, packet->raw->sname, DHCP_SNAME_LEN); lease->server_name[DHCP_SNAME_LEN]='\0'; - if (!res_hnok(lease->server_name) ) { - warning("Bogus server name %s", lease->server_name ); - free_client_lease(lease); - return (NULL); - } - } /* Ditto for the filename. */ ==== //depot/projects/wifi/sbin/geom/class/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sbin/geom/class/Makefile,v 1.7 2005/07/27 23:30:50 pjd Exp $ +# $FreeBSD: src/sbin/geom/class/Makefile,v 1.8 2005/07/27 23:56:32 pjd Exp $ SUBDIR= concat -#SUBDIR+=eli +SUBDIR+=eli SUBDIR+=label SUBDIR+=mirror SUBDIR+=nop ==== //depot/projects/wifi/sbin/geom/class/eli/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.1 2005/07/27 21:43:35 pjd Exp $ +# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.2 2005/07/27 23:56:01 pjd Exp $ .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2 @@ -8,10 +8,11 @@ SRCS+= pkcs5v2.c SRCS+= sha2.c -DPADD= ${LIBMD} ${LIBCRYPTO} -LDADD= -lmd -lcrypto +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto + +WARNS?= 3 -NO_MAN= CFLAGS+=-I${.CURDIR}/../../../../sys .include <bsd.lib.mk> ==== //depot/projects/wifi/sbin/reboot/boot_i386.8#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" -.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.52 2005/01/18 10:09:37 ru Exp $ +.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.53 2005/07/28 10:48:07 keramida Exp $ .\" .Dd September 30, 2004 .Dt BOOT 8 i386 @@ -89,7 +89,7 @@ partition. As a result, slices which are missing an .Ql a -parition require user intervention during the boot process. +partition require user intervention during the boot process. .Pp The remainder of this subsection deals only with the boot blocks. The ==== //depot/projects/wifi/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.242 2005/07/01 16:28:30 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.243 2005/07/28 10:10:01 gnn Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1162,7 +1162,10 @@ } cm = cmn; } - nextrecord = so->so_rcv.sb_mb->m_nextpkt; + if (so->so_rcv.sb_mb) + nextrecord = so->so_rcv.sb_mb->m_nextpkt; + else + nextrecord = NULL; orig_resid = 0; } if (m != NULL) { ==== //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.25 2005/04/22 18:49:30 trhodes Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.26 2005/07/28 13:55:12 trhodes Exp $ */ /* @@ -209,13 +209,10 @@ mtx_unlock(&mac_bsdextended_mtx); if (ruleptr != NULL) FREE(ruleptr, M_MACBSDEXTENDED); - if (req->oldptr && error == 0) { + if (req->oldptr && error == 0) error = SYSCTL_OUT(req, &temprule, sizeof(temprule)); - if (error) - return (error); - } - return (0); + return (error); } SYSCTL_NODE(_security_mac_bsdextended, OID_AUTO, rules, ==== //depot/projects/wifi/tools/tools/tinderbox/tbmaster.pl#4 (text+ko) ==== @@ -26,7 +26,7 @@ # (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/tools/tools/tinderbox/tbmaster.pl,v 1.54 2005/07/20 19:58:47 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tbmaster.pl,v 1.55 2005/07/28 10:09:22 des Exp $ # use 5.006_001; @@ -71,6 +71,33 @@ my %CONFIG; ### +### Expand a path +### +sub realpath($;$); +sub realpath($;$) { + my $path = shift; + my $base = shift || ""; + + my $realpath = ($path =~ m|^/|) ? "" : $base; + my @parts = split('/', $path); + while (defined(my $part = shift(@parts))) { + if ($part eq '' || $part eq '.') { + # nothing + } elsif ($part eq '..') { + $realpath =~ s|/[^/]+$|| + or die("'$path' is not a valid path relative to '$base'\n"); + } elsif (-l "$realpath/$part") { + my $target = readlink("$realpath/$part") + or die("unable to resolve symlink '$realpath/$part': $!\n"); + $realpath = realpath($target, $realpath); + } else { + $realpath .= "/$part"; + } + } + return $realpath; +} + +### ### Perform variable expansion ### sub expand($); @@ -243,7 +270,7 @@ # Fork and start the tinderbox my @args = @{$CONFIG{'OPTIONS'}}; push(@args, "--hostname=" . expand('HOSTNAME')); - push(@args, "--sandbox=" . expand('SANDBOX')); + push(@args, "--sandbox=" . realpath(expand('SANDBOX'))); push(@args, "--arch=$arch"); push(@args, "--machine=$machine"); push(@args, "--cvsup=" . expand('CVSUP')) @@ -287,7 +314,9 @@ my @lines = (); my $error = 0; my $summary = ""; + my $root = realpath(expand('SANDBOX') . "/$branch/$arch/$machine"); while (<RPIPE>) { + s/\Q$root\E\/(src|obj)/\/$1/g; print(FULL $_); if (/^TB ---/ || /^>>> /) { if ($error) { ==== //depot/projects/wifi/usr.bin/vmstat/vmstat.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.87 2005/07/25 22:35:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.88 2005/07/28 09:45:08 rwatson Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -897,9 +897,6 @@ (long long)inttotal, (long long)(inttotal / uptime)); } -/* - * Query libmemstat(3) for information on malloc(9). - */ static void domemstat_malloc(void) { @@ -912,17 +909,13 @@ warn("memstat_mtl_alloc"); return; } - if (memstat_sysctl_malloc(mtlp, 0) < 0) { warnx("memstat_sysctl_malloc: %s", memstat_strerror(memstat_mtl_geterror(mtlp))); return; } - - printf("\n"); printf("%13s %5s %6s %7s %8s Size(s)\n", "Type", "InUse", "MemUse", "HighUse", "Requests"); - for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { if (memstat_get_numallocs(mtp) == 0 && @@ -932,7 +925,6 @@ memstat_get_name(mtp), memstat_get_count(mtp), ((int64_t)memstat_get_bytes(mtp) + 1023) / 1024, "-", memstat_get_numallocs(mtp)); - first = 1; for (i = 0; i < 32; i++) { if (memstat_get_sizemask(mtp) & (1 << i)) { @@ -944,13 +936,9 @@ } printf("\n"); } - memstat_mtl_free(mtlp); } -/* - * Query libmemstat(3) for information on uma(9). - */ static void domemstat_zone(void) { @@ -963,17 +951,13 @@ warn("memstat_mtl_alloc"); return; } - if (memstat_sysctl_uma(mtlp, 0) < 0) { warnx("memstat_sysctl_uma: %s", memstat_strerror(memstat_mtl_geterror(mtlp))); return; } - - printf("\n"); printf("%-15s %-8s %-9s %-7s %-5s %-8s\n\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQUESTS"); - for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { strlcpy(name, memstat_get_name(mtp), MEMTYPE_MAXNAME); @@ -983,7 +967,6 @@ memstat_get_count(mtp), memstat_get_free(mtp), memstat_get_numallocs(mtp)); } - memstat_mtl_free(mtlp); printf("\n"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507281545.j6SFjZb0061019>