From owner-svn-src-user@FreeBSD.ORG Fri Jun 11 02:09:18 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B6E511065672;
Fri, 11 Jun 2010 02:09:18 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A3F788FC12;
Fri, 11 Jun 2010 02:09:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5B29IPR033834;
Fri, 11 Jun 2010 02:09:18 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5B29IgS033828;
Fri, 11 Jun 2010 02:09:18 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201006110209.o5B29IgS033828@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 Jun 2010 02:09:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r209023 - in user/imp/tbemd: contrib/llvm/Xcode
contrib/llvm/cmake contrib/llvm/projects
contrib/llvm/tools/clang/INPUTS
contrib/llvm/tools/clang/clang.xcodeproj contrib/llvm/tools/clan...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jun 2010 02:09:18 -0000
Author: imp
Date: Fri Jun 11 02:09:18 2010
New Revision: 209023
URL: http://svn.freebsd.org/changeset/base/209023
Log:
svn merge svn+ssh://svn.freebsd.org/base/head@209022
Deleted:
user/imp/tbemd/contrib/llvm/Xcode/
user/imp/tbemd/contrib/llvm/cmake/
user/imp/tbemd/contrib/llvm/projects/
user/imp/tbemd/contrib/llvm/tools/clang/INPUTS/
user/imp/tbemd/contrib/llvm/tools/clang/clang.xcodeproj/
user/imp/tbemd/contrib/llvm/tools/clang/win32/
user/imp/tbemd/contrib/llvm/unittests/
user/imp/tbemd/contrib/llvm/win32/
Modified:
user/imp/tbemd/sys/dev/isp/isp_library.c
user/imp/tbemd/sys/net80211/ieee80211_hwmp.c
user/imp/tbemd/sys/net80211/ieee80211_sta.c
user/imp/tbemd/usr.bin/gzip/gzip.c
user/imp/tbemd/usr.sbin/sysinstall/tcpip.c
Directory Properties:
user/imp/tbemd/ (props changed)
user/imp/tbemd/cddl/contrib/opensolaris/ (props changed)
user/imp/tbemd/contrib/bind9/ (props changed)
user/imp/tbemd/contrib/ee/ (props changed)
user/imp/tbemd/contrib/expat/ (props changed)
user/imp/tbemd/contrib/file/ (props changed)
user/imp/tbemd/contrib/gdb/ (props changed)
user/imp/tbemd/contrib/gdtoa/ (props changed)
user/imp/tbemd/contrib/gnu-sort/ (props changed)
user/imp/tbemd/contrib/groff/ (props changed)
user/imp/tbemd/contrib/less/ (props changed)
user/imp/tbemd/contrib/libpcap/ (props changed)
user/imp/tbemd/contrib/ncurses/ (props changed)
user/imp/tbemd/contrib/netcat/ (props changed)
user/imp/tbemd/contrib/ntp/ (props changed)
user/imp/tbemd/contrib/one-true-awk/ (props changed)
user/imp/tbemd/contrib/openbsm/ (props changed)
user/imp/tbemd/contrib/openpam/ (props changed)
user/imp/tbemd/contrib/pf/ (props changed)
user/imp/tbemd/contrib/sendmail/ (props changed)
user/imp/tbemd/contrib/tcpdump/ (props changed)
user/imp/tbemd/contrib/tcsh/ (props changed)
user/imp/tbemd/contrib/top/ (props changed)
user/imp/tbemd/contrib/top/install-sh (props changed)
user/imp/tbemd/contrib/tzcode/stdtime/ (props changed)
user/imp/tbemd/contrib/tzcode/zic/ (props changed)
user/imp/tbemd/contrib/tzdata/ (props changed)
user/imp/tbemd/contrib/wpa/ (props changed)
user/imp/tbemd/crypto/openssh/ (props changed)
user/imp/tbemd/crypto/openssl/ (props changed)
user/imp/tbemd/lib/libc/ (props changed)
user/imp/tbemd/lib/libc/stdtime/ (props changed)
user/imp/tbemd/lib/libutil/ (props changed)
user/imp/tbemd/lib/libz/ (props changed)
user/imp/tbemd/sbin/ (props changed)
user/imp/tbemd/sbin/ipfw/ (props changed)
user/imp/tbemd/share/zoneinfo/ (props changed)
user/imp/tbemd/sys/ (props changed)
user/imp/tbemd/sys/amd64/include/xen/ (props changed)
user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed)
user/imp/tbemd/sys/contrib/dev/acpica/ (props changed)
user/imp/tbemd/sys/contrib/pf/ (props changed)
user/imp/tbemd/sys/contrib/x86emu/ (props changed)
user/imp/tbemd/sys/dev/xen/xenpci/ (props changed)
user/imp/tbemd/usr.bin/csup/ (props changed)
user/imp/tbemd/usr.bin/procstat/ (props changed)
user/imp/tbemd/usr.sbin/zic/ (props changed)
Modified: user/imp/tbemd/sys/dev/isp/isp_library.c
==============================================================================
--- user/imp/tbemd/sys/dev/isp/isp_library.c Fri Jun 11 01:32:42 2010 (r209022)
+++ user/imp/tbemd/sys/dev/isp/isp_library.c Fri Jun 11 02:09:18 2010 (r209023)
@@ -344,7 +344,7 @@ isp_print_qentry(ispsoftc_t *isp, const
for (j = 0; j < (QENTRY_LEN >> 2); j++) {
ISP_SNPRINTF(buf, TBA, "%s %02x", buf, ptr[amt++] & 0xff);
}
- isp_prt(isp, ISP_LOGALL, buf);
+ isp_prt(isp, ISP_LOGALL, "%s", buf);
}
}
Modified: user/imp/tbemd/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- user/imp/tbemd/sys/net80211/ieee80211_hwmp.c Fri Jun 11 01:32:42 2010 (r209022)
+++ user/imp/tbemd/sys/net80211/ieee80211_hwmp.c Fri Jun 11 02:09:18 2010 (r209023)
@@ -707,9 +707,10 @@ hwmp_recv_preq(struct ieee80211vap *vap,
rtorig = ieee80211_mesh_rt_find(vap, preq->preq_origaddr);
if (rtorig == NULL)
rtorig = ieee80211_mesh_rt_add(vap, preq->preq_origaddr);
- if (rtorig == NULL)
+ if (rtorig == NULL) {
/* XXX stat */
return;
+ }
hrorig = IEEE80211_MESH_ROUTE_PRIV(rtorig, struct ieee80211_hwmp_route);
/*
* Sequence number validation.
Modified: user/imp/tbemd/sys/net80211/ieee80211_sta.c
==============================================================================
--- user/imp/tbemd/sys/net80211/ieee80211_sta.c Fri Jun 11 01:32:42 2010 (r209022)
+++ user/imp/tbemd/sys/net80211/ieee80211_sta.c Fri Jun 11 02:09:18 2010 (r209023)
@@ -584,7 +584,7 @@ sta_input(struct ieee80211_node *ni, str
}
IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
ni->ni_noise = nf;
- if (HAS_SEQ(type)) {
+ if (HAS_SEQ(type) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
uint8_t tid = ieee80211_gettid(wh);
if (IEEE80211_QOS_HAS_SEQ(wh) &&
TID_TO_WME_AC(tid) >= WME_AC_VI)
Modified: user/imp/tbemd/usr.bin/gzip/gzip.c
==============================================================================
--- user/imp/tbemd/usr.bin/gzip/gzip.c Fri Jun 11 01:32:42 2010 (r209022)
+++ user/imp/tbemd/usr.bin/gzip/gzip.c Fri Jun 11 02:09:18 2010 (r209023)
@@ -65,10 +65,6 @@ __RCSID("$FreeBSD$");
#include <getopt.h>
#include <time.h>
-#ifndef PRIdOFF
-#define PRIdOFF PRId64
-#endif
-
/* what type of file are we dealing with */
enum filetype {
FT_GZIP,
@@ -1221,46 +1217,46 @@ file_compress(char *file, char *outfile,
in = open(file, O_RDONLY);
if (in == -1) {
maybe_warn("can't open %s", file);
- return -1;
+ return (-1);
}
#ifndef SMALL
if (fstat(in, &isb) != 0) {
maybe_warn("couldn't stat: %s", file);
close(in);
- return -1;
+ return (-1);
}
#endif
if (cflag == 0) {
#ifndef SMALL
- if (isb.st_nlink != 1 && fflag == 0) {
- maybe_warnx("%s has %d other link%s -- "
- "skipping", file, isb.st_nlink - 1,
- isb.st_nlink == 1 ? "" : "s");
+ if (isb.st_nlink > 1 && fflag == 0) {
+ maybe_warnx("%s has %d other link%s -- skipping",
+ file, isb.st_nlink - 1,
+ (isb.st_nlink - 1) == 1 ? "" : "s");
close(in);
- return -1;
+ return (-1);
}
- if (fflag == 0 && (suff = check_suffix(file, 0))
- && suff->zipped[0] != 0) {
+ if (fflag == 0 && (suff = check_suffix(file, 0)) &&
+ suff->zipped[0] != 0) {
maybe_warnx("%s already has %s suffix -- unchanged",
- file, suff->zipped);
+ file, suff->zipped);
close(in);
- return -1;
+ return (-1);
}
#endif
/* Add (usually) .gz to filename */
if ((size_t)snprintf(outfile, outsize, "%s%s",
- file, suffixes[0].zipped) >= outsize)
+ file, suffixes[0].zipped) >= outsize)
memcpy(outfile + outsize - suffixes[0].ziplen - 1,
- suffixes[0].zipped, suffixes[0].ziplen + 1);
+ suffixes[0].zipped, suffixes[0].ziplen + 1);
#ifndef SMALL
if (check_outfile(outfile) == 0) {
close(in);
- return -1;
+ return (-1);
}
#endif
}
@@ -1270,7 +1266,7 @@ file_compress(char *file, char *outfile,
if (out == -1) {
maybe_warn("could not create output: %s", outfile);
fclose(stdin);
- return -1;
+ return (-1);
}
#ifndef SMALL
remove_file = outfile;
@@ -1290,7 +1286,7 @@ file_compress(char *file, char *outfile,
* has the expected size.
*/
if (cflag != 0)
- return insize == -1 ? -1 : size;
+ return (insize == -1 ? -1 : size);
#ifndef SMALL
if (fstat(out, &osb) != 0) {
@@ -1299,9 +1295,8 @@ file_compress(char *file, char *outfile,
}
if (osb.st_size != size) {
- maybe_warnx("output file: %s wrong size (%" PRIdOFF
- " != %" PRIdOFF "), deleting",
- outfile, osb.st_size, size);
+ maybe_warnx("output file: %s wrong size (%ju != %ju), deleting",
+ outfile, (uintmax_t)osb.st_size, (uintmax_t)size);
goto bad_outfile;
}
@@ -1313,7 +1308,7 @@ file_compress(char *file, char *outfile,
/* output is good, ok to delete input */
unlink_input(file, &isb);
- return size;
+ return (size);
#ifndef SMALL
bad_outfile:
@@ -1322,7 +1317,7 @@ file_compress(char *file, char *outfile,
maybe_warnx("leaving original %s", file);
unlink(outfile);
- return size;
+ return (size);
#endif
}
@@ -1570,9 +1565,8 @@ file_uncompress(char *file, char *outfil
return -1;
}
if (osb.st_size != size) {
- maybe_warnx("stat gave different size: %" PRIdOFF
- " != %" PRIdOFF " (leaving original)",
- size, osb.st_size);
+ maybe_warnx("stat gave different size: %ju != %ju (leaving original)",
+ (uintmax_t)size, (uintmax_t)osb.st_size);
close(ofd);
unlink(outfile);
return -1;
Modified: user/imp/tbemd/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- user/imp/tbemd/usr.sbin/sysinstall/tcpip.c Fri Jun 11 01:32:42 2010 (r209022)
+++ user/imp/tbemd/usr.sbin/sysinstall/tcpip.c Fri Jun 11 02:09:18 2010 (r209023)
@@ -732,6 +732,9 @@ tcpDeviceSelect(void)
return (NULL);
}
+ devs = deviceFind(NULL, DEVICE_TYPE_NETWORK);
+ cnt = deviceCount(devs);
+
if ((!RunningAsInit) && (variable_check("NETWORK_CONFIGURED=NO") != TRUE)) {
if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
return devs[0];