svn commit: r281404 - head/tools/regression/sockets/zerosend
Author: ngie
Date: Sat Apr 11 05:20:01 2015
New Revision: 281404
URL: https://svnweb.freebsd.org/changeset/base/281404
Log:
Generate temporary files with mkstemp instead of mktemp
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/zerosend/zerosend.c
Modified: head/tools/regression/sockets/zerosend/zerosend.c
==
--- head/tools/regression/sockets/zerosend/zerosend.c Sat Apr 11 03:57:35
2015(r281403)
+++ head/tools/regression/sockets/zerosend/zerosend.c Sat Apr 11 05:20:01
2015(r281404)
@@ -209,12 +209,12 @@ setup_pipe(const char *test, int *fdp)
static void
setup_fifo(const char *test, int *fdp)
{
- char path[PATH_MAX];
+ char path[] = 0send_fifo.XXX;
int fd1, fd2;
- strcpy(path, /tmp/0send_fifo.XXX);
- if (mktemp(path) == NULL)
+ if (mkstemp(path) == -1)
err(-1, %s: setup_fifo: mktemp, test);
+ unlink(path);
if (mkfifo(path, 0600) 0)
err(-1, %s: setup_fifo: mkfifo(%s), test, path);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281405 - in head: . etc/mtree
Author: jkim
Date: Sat Apr 11 05:38:07 2015
New Revision: 281405
URL: https://svnweb.freebsd.org/changeset/base/281405
Log:
Catch up with r281373 and r281379.
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.usr.dist
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sat Apr 11 05:20:01 2015(r281404)
+++ head/ObsoleteFiles.inc Sat Apr 11 05:38:07 2015(r281405)
@@ -38,6 +38,18 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150410
+OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/10.exref
+OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/11.edit
+OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/12.vi
+OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/13.viref
# 20150329
.if ${TARGET_ARCH} == arm
OLD_FILES+=usr/include/bootconfig.h
Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Sat Apr 11 05:20:01 2015(r281404)
+++ head/etc/mtree/BSD.usr.dist Sat Apr 11 05:38:07 2015(r281405)
@@ -292,14 +292,6 @@
..
07.mail
..
-10.exref
-..
-11.edit
-..
-12.vi
-..
-13.viref
-..
18.msdiffs
..
19.memacros
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281400 - head/tools/regression/sockets/unix_close_race
Author: ngie
Date: Sat Apr 11 03:43:43 2015
New Revision: 281400
URL: https://svnweb.freebsd.org/changeset/base/281400
Log:
- Garbage collect argc/argv; bump WARNS to 6
- Make the socket path random and move it out of /tmp as that's outside ATF's
prescribed path
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/unix_close_race/Makefile
head/tools/regression/sockets/unix_close_race/unix_close_race.c
Modified: head/tools/regression/sockets/unix_close_race/Makefile
==
--- head/tools/regression/sockets/unix_close_race/Makefile Sat Apr 11
03:38:49 2015(r281399)
+++ head/tools/regression/sockets/unix_close_race/Makefile Sat Apr 11
03:43:43 2015(r281400)
@@ -2,6 +2,6 @@
PROG= unix_close_race
MAN=
-WARNS?=3
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/unix_close_race/unix_close_race.c
==
--- head/tools/regression/sockets/unix_close_race/unix_close_race.c Sat Apr
11 03:38:49 2015(r281399)
+++ head/tools/regression/sockets/unix_close_race/unix_close_race.c Sat Apr
11 03:43:43 2015(r281400)
@@ -54,12 +54,13 @@
#include unistd.h
#include err.h
-#defineUNIXSTR_PATH/tmp/mytest.socket
+static char socket_path[] = tmp.;
+
#defineUSLEEP 100
#defineLOOPS 10
int
-main(int argc, char **argv)
+main(void)
{
struct sockaddr_un servaddr;
int listenfd, connfd, pid;
@@ -74,16 +75,20 @@ main(int argc, char **argv)
if (ncpus 2)
warnx(SMP not present, test may be unable to trigger race);
+ if (mkstemp(socket_path) == -1)
+ err(1, mkstemp failed);
+ unlink(socket_path);
+
/*
* Create a UNIX domain socket that the child will repeatedly
* accept() from, and that the parent will repeatedly connect() to.
*/
if ((listenfd = socket(AF_LOCAL, SOCK_STREAM, 0)) 0)
err(1, parent: socket error);
- (void)unlink(UNIXSTR_PATH);
+ (void)unlink(socket_path);
bzero(servaddr, sizeof(servaddr));
servaddr.sun_family = AF_LOCAL;
- strcpy(servaddr.sun_path, UNIXSTR_PATH);
+ strcpy(servaddr.sun_path, socket_path);
if (bind(listenfd, (struct sockaddr *) servaddr,
sizeof(servaddr)) 0)
err(1, parent: bind error);
@@ -102,7 +107,7 @@ main(int argc, char **argv)
sleep(1);
bzero(servaddr, sizeof(servaddr));
servaddr.sun_family = AF_LOCAL;
- strcpy(servaddr.sun_path, UNIXSTR_PATH);
+ strcpy(servaddr.sun_path, socket_path);
for (counter = 0; counter LOOPS; counter++) {
if ((connfd = socket(AF_LOCAL, SOCK_STREAM, 0)) 0) {
(void)kill(pid, SIGTERM);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281401 - head/tools/regression/sockets/unix_sendtorace
Author: ngie
Date: Sat Apr 11 03:54:43 2015
New Revision: 281401
URL: https://svnweb.freebsd.org/changeset/base/281401
Log:
- Garbage collect argc/argv
- Use random paths instead of one in /tmp
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/unix_sendtorace/Makefile
head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
Modified: head/tools/regression/sockets/unix_sendtorace/Makefile
==
--- head/tools/regression/sockets/unix_sendtorace/Makefile Sat Apr 11
03:43:43 2015(r281400)
+++ head/tools/regression/sockets/unix_sendtorace/Makefile Sat Apr 11
03:54:43 2015(r281401)
@@ -2,6 +2,6 @@
PROG= unix_sendtorace
MAN=
-WARNS?=3
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
==
--- head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c Sat Apr
11 03:43:43 2015(r281400)
+++ head/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c Sat Apr
11 03:54:43 2015(r281401)
@@ -45,9 +45,10 @@
#include string.h
#include unistd.h
-#definePATH/tmp/123
#defineITERATIONS 100
+static char socket_path[] = tmp.XX;
+
static void
stream_server(int listenfd)
{
@@ -75,7 +76,7 @@ stream_client(void)
bzero(sun, sizeof(sun));
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, PATH);
+ strcpy(sun.sun_path, socket_path);
for (i = 0; i ITERATIONS; i++) {
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd 0) {
@@ -104,7 +105,7 @@ stream_test(void)
bzero(sun, sizeof(sun));
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, PATH);
+ strcpy(sun.sun_path, socket_path);
if (bind(listenfd, (struct sockaddr *)sun, sizeof(sun)) 0)
err(-1, stream_test: bind);
@@ -124,7 +125,7 @@ stream_test(void)
} else
stream_server(listenfd);
- (void)unlink(PATH);
+ (void)unlink(socket_path);
}
static void
@@ -151,7 +152,7 @@ datagram_client(void)
bzero(sun, sizeof(sun));
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, PATH);
+ strcpy(sun.sun_path, socket_path);
for (i = 0; i ITERATIONS; i++) {
fd = socket(PF_UNIX, SOCK_DGRAM, 0);
if (fd 0) {
@@ -180,7 +181,7 @@ datagram_test(void)
bzero(sun, sizeof(sun));
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, PATH);
+ strcpy(sun.sun_path, socket_path);
if (bind(serverfd, (struct sockaddr *)sun, sizeof(sun)) 0)
err(-1, datagram_test: bind);
@@ -197,14 +198,16 @@ datagram_test(void)
} else
datagram_server(serverfd);
- (void)unlink(PATH);
+ (void)unlink(socket_path);
}
int
-main(int argc, char *argv[])
+main(void)
{
-
- (void)unlink(PATH);
+
+ if (mkstemp(socket_path) == -1)
+ err(1, mkstemp failed);
+ (void)unlink(socket_path);
datagram_test();
if (0)
stream_test();
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281402 - head/tools/regression/sockets/unix_socket
Author: ngie
Date: Sat Apr 11 03:56:23 2015
New Revision: 281402
URL: https://svnweb.freebsd.org/changeset/base/281402
Log:
Garbage collect argc/argv and bump WARNS to 6
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/unix_socket/Makefile
head/tools/regression/sockets/unix_socket/unix_socket.c
Modified: head/tools/regression/sockets/unix_socket/Makefile
==
--- head/tools/regression/sockets/unix_socket/Makefile Sat Apr 11 03:54:43
2015(r281401)
+++ head/tools/regression/sockets/unix_socket/Makefile Sat Apr 11 03:56:23
2015(r281402)
@@ -2,6 +2,6 @@
PROG= unix_socket
MAN=
-WARNS?=3
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/unix_socket/unix_socket.c
==
--- head/tools/regression/sockets/unix_socket/unix_socket.c Sat Apr 11
03:54:43 2015(r281401)
+++ head/tools/regression/sockets/unix_socket/unix_socket.c Sat Apr 11
03:56:23 2015(r281402)
@@ -40,7 +40,7 @@
#include unistd.h
int
-main(int argc, char *argv[])
+main(void)
{
int sock, socks[2];
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281403 - head/tools/regression/sockets/unix_sorflush
Author: ngie
Date: Sat Apr 11 03:57:35 2015
New Revision: 281403
URL: https://svnweb.freebsd.org/changeset/base/281403
Log:
Garbage collect argc/argv and bump WARNS to 6
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/unix_sorflush/Makefile
head/tools/regression/sockets/unix_sorflush/unix_sorflush.c
Modified: head/tools/regression/sockets/unix_sorflush/Makefile
==
--- head/tools/regression/sockets/unix_sorflush/MakefileSat Apr 11
03:56:23 2015(r281402)
+++ head/tools/regression/sockets/unix_sorflush/MakefileSat Apr 11
03:57:35 2015(r281403)
@@ -2,6 +2,6 @@
PROG= unix_sorflush
MAN=
-WARNS?=3
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/unix_sorflush/unix_sorflush.c
==
--- head/tools/regression/sockets/unix_sorflush/unix_sorflush.c Sat Apr 11
03:56:23 2015(r281402)
+++ head/tools/regression/sockets/unix_sorflush/unix_sorflush.c Sat Apr 11
03:57:35 2015(r281403)
@@ -68,7 +68,7 @@ shutdown_and_exit(int s)
}
int
-main(int argc, char *argv[])
+main(void)
{
pid_t pida, pidb;
int sv[2];
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r281373 - in head: contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/docs contrib/nvi/docs/USD.doc contrib/nvi/docs/internals contrib/nvi/docs/interp contri
On Fri, Apr 11, 2015 at 09:19:39PM +0300, Dmitry Morozovsky wrote: Bapt, On Fri, 10 Apr 2015, Baptiste Daroussin wrote: Author: bapt Date: Fri Apr 10 17:50:28 2015 New Revision: 281373 URL: https://svnweb.freebsd.org/changeset/base/281373 Log: Update nvi to 2.1.3 which fixes the data corruption when locale conversion failed Thank you very much for this import. Any MFC Planned please? Not before I find how to readd the lost documentations Bapt pgpSz8hj7dg4R.pgp Description: PGP signature
svn commit: r281382 - stable/10
Author: dim
Date: Fri Apr 10 20:38:31 2015
New Revision: 281382
URL: https://svnweb.freebsd.org/changeset/base/281382
Log:
MFC r272814 (by bapt):
Add OBJCOPY to the list of external tools
MFC r272815 (by bapt):
Fix typo
This should fix the build troubles some people have been seeing after
the MFC of r280980 (in r281289). Sorry for the breakage.
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Fri Apr 10 19:26:45 2015(r281381)
+++ stable/10/Makefile.inc1 Fri Apr 10 20:38:31 2015(r281382)
@@ -311,7 +311,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +322,8 @@ X${BINUTIL}?= ${${BINUTIL}}
WMAKEENV+= CC=${XCC} ${XFLAGS} CXX=${XCXX} ${XFLAGS} \
CPP=${XCPP} ${XFLAGS} \
AS=${XAS} AR=${XAR} LD=${XLD} NM=${XNM} \
- OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ OBJDUMP=${XOBJDUMP} OBJCOPY=${XOBJCOPY} \
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
.if ${XCC:T:Mgcc} == gcc
WMAKE_COMPILER_TYPE= gcc
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r281373 - in head: contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/docs contrib/nvi/docs/USD.doc contrib/nvi/docs/internals contrib/nvi/docs/interp contri
On Fri, 10 Apr 2015, Baptiste Daroussin wrote: Update nvi to 2.1.3 which fixes the data corruption when locale conversion failed Thank you very much for this import. Any MFC Planned please? Not before I find how to readd the lost documentations Fair enough; thanks again for your attention! -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281383 - in head/sys: dev/iwn net80211
Author: eadler Date: Fri Apr 10 20:55:17 2015 New Revision: 281383 URL: https://svnweb.freebsd.org/changeset/base/281383 Log: iwn, wlan: fix typos Fxi tow typos Obtained from:DragonFlyBSD MFC after:3 days Modified: head/sys/dev/iwn/if_iwn.c head/sys/net80211/ieee80211_mesh.c Modified: head/sys/dev/iwn/if_iwn.c == --- head/sys/dev/iwn/if_iwn.c Fri Apr 10 20:38:31 2015(r281382) +++ head/sys/dev/iwn/if_iwn.c Fri Apr 10 20:55:17 2015(r281383) @@ -8060,7 +8060,7 @@ iwn_read_firmware_tlv(struct iwn_softc * case IWN_FW_TLV_WOWLAN_INST: case IWN_FW_TLV_WOWLAN_DATA: DPRINTF(sc, IWN_DEBUG_RESET, - TLV type %d reconized but not handled\n, + TLV type %d recognized but not handled\n, le16toh(tlv-type)); break; default: Modified: head/sys/net80211/ieee80211_mesh.c == --- head/sys/net80211/ieee80211_mesh.c Fri Apr 10 20:38:31 2015 (r281382) +++ head/sys/net80211/ieee80211_mesh.c Fri Apr 10 20:55:17 2015 (r281383) @@ -126,7 +126,7 @@ static int ieee80211_mesh_backofftimeout SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, backofftimeout, CTLTYPE_INT | CTLFLAG_RW, ieee80211_mesh_backofftimeout, 0, ieee80211_sysctl_msecs_ticks, I, Backoff timeout (msec). This is to throutles peering forever when -not receving answer or is rejected by a neighbor); +not receiving answer or is rejected by a neighbor); static int ieee80211_mesh_maxretries = 2; SYSCTL_INT(_net_wlan_mesh, OID_AUTO, maxretries, CTLFLAG_RW, ieee80211_mesh_maxretries, 0, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r281372 - head/lib/liblzma
On Apr 10, 2015, at 10:22 AM, Xin LI delp...@freebsd.org wrote: Author: delphij Date: Fri Apr 10 17:21:47 2015 New Revision: 281372 URL: https://svnweb.freebsd.org/changeset/base/281372 Log: For reasons that I am not understand yet, using the libmd version of SHA256 would make libarchive based application to give: archive_read_extract(): Lzma library error: Corrupted input data (Internally this is LZMA_DATA_ERR) However, the libmd version of SHA256 is supposed to give same result as the bundled version do, and xz(1) is not affected. Can you test libarchive from github? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281384 - in head: share/mk usr.sbin/fifolog/fifolog_reader usr.sbin/fifolog/fifolog_writer
Author: emaste
Date: Fri Apr 10 21:24:38 2015
New Revision: 281384
URL: https://svnweb.freebsd.org/changeset/base/281384
Log:
Fix libfifolog dependency on libz
Consumers should not need to encode fifolog's dependency on libz.
Handle it automatically in src.libnames.mk.
Differential Revision:https://reviews.freebsd.org/D2278
Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Modified:
head/share/mk/src.libnames.mk
head/usr.sbin/fifolog/fifolog_reader/Makefile
head/usr.sbin/fifolog/fifolog_writer/Makefile
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Fri Apr 10 20:55:17 2015
(r281383)
+++ head/share/mk/src.libnames.mk Fri Apr 10 21:24:38 2015
(r281384)
@@ -259,6 +259,9 @@ LDADD_sqlite3+= ${LDADD_pthread}
DPADD_atf_cxx+=${DPADD_atf_c}
LDADD_atf_cxx+=${LDADD_atf_c}
+DPADD_fifolog+=${DPADD_z}
+LDADD_fifolog+=${LDADD_z}
+
DPADD_ipf+=${DPADD_kvm}
LDADD_ipf+=${LDADD_kvm}
Modified: head/usr.sbin/fifolog/fifolog_reader/Makefile
==
--- head/usr.sbin/fifolog/fifolog_reader/Makefile Fri Apr 10 20:55:17
2015(r281383)
+++ head/usr.sbin/fifolog/fifolog_reader/Makefile Fri Apr 10 21:24:38
2015(r281384)
@@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib
MAN=
-LIBADD=z fifolog
+LIBADD=fifolog
regress:
./${PROG} /tmp/fifolog.0
Modified: head/usr.sbin/fifolog/fifolog_writer/Makefile
==
--- head/usr.sbin/fifolog/fifolog_writer/Makefile Fri Apr 10 20:55:17
2015(r281383)
+++ head/usr.sbin/fifolog/fifolog_writer/Makefile Fri Apr 10 21:24:38
2015(r281384)
@@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib
MAN=
-LIBADD=z fifolog
+LIBADD=fifolog
regress:
date | ./${PROG} -z 0 /tmp/fifolog.0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281385 - stable/9/sys/fs/nfsclient
Author: rmacklem
Date: Fri Apr 10 22:53:07 2015
New Revision: 281385
URL: https://svnweb.freebsd.org/changeset/base/281385
Log:
MFC: r276347
r245508 modified the NFS client's Setattr RPC to
use VA_UTIMES_NULL to indicate whether it should
set the time to the current tod on the server.
This had the side effect of making the NFS client
use the client's timestamp for exclusive create,
starting with FreeBSD9.2.
Unfortunately a bug in some Solaris NFS servers
causes these servers to return NFS_OK to the
Setattr RPC done during exclusive create, but not
actually set the file's mode, leaving the file's
mode == 0.
This patch restores the NFS client's behaviour to
use the server's tod for the exclusive open's
Setattr RPC, to avoid the Solaris server bug and
to restore the pre-FreeBSD9.2 NFS behaviour.
Modified:
stable/9/sys/fs/nfsclient/nfs_clport.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/nfsclient/nfs_clport.c
==
--- stable/9/sys/fs/nfsclient/nfs_clport.c Fri Apr 10 21:24:38 2015
(r281384)
+++ stable/9/sys/fs/nfsclient/nfs_clport.c Fri Apr 10 22:53:07 2015
(r281385)
@@ -1103,9 +1103,16 @@ nfscl_checksattr(struct vattr *vap, stru
* us to do a SETATTR RPC. FreeBSD servers store the verifier
* in atime, but we can't really assume that all servers will
* so we ensure that our SETATTR sets both atime and mtime.
+* Set the VA_UTIMES_NULL flag for this case, so that
+* the server's time will be used. This is needed to
+* work around a bug in some Solaris servers, where
+* setting the time TOCLIENT causes the Setattr RPC
+* to return NFS_OK, but not set va_mode.
*/
- if (vap-va_mtime.tv_sec == VNOVAL)
+ if (vap-va_mtime.tv_sec == VNOVAL) {
vfs_timestamp(vap-va_mtime);
+ vap-va_vaflags |= VA_UTIMES_NULL;
+ }
if (vap-va_atime.tv_sec == VNOVAL)
vap-va_atime = vap-va_mtime;
return (1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281386 - stable/10/sys/fs/nfsclient
Author: rmacklem
Date: Fri Apr 10 23:43:01 2015
New Revision: 281386
URL: https://svnweb.freebsd.org/changeset/base/281386
Log:
MFC: r276347
r245508 modified the NFS client's Setattr RPC to
use VA_UTIMES_NULL to indicate whether it should
set the time to the current tod on the server.
This had the side effect of making the NFS client
use the client's timestamp for exclusive create,
starting with FreeBSD9.2.
Unfortunately a bug in some Solaris NFS servers
causes these servers to return NFS_OK to the
Setattr RPC done during exclusive create, but not
actually set the file's mode, leaving the file's
mode == 0.
This patch restores the NFS client's behaviour to
use the server's tod for the exclusive open's
Setattr RPC, to avoid the Solaris server bug and
to restore the pre-FreeBSD9.2 NFS behaviour.
Modified:
stable/10/sys/fs/nfsclient/nfs_clport.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/nfsclient/nfs_clport.c
==
--- stable/10/sys/fs/nfsclient/nfs_clport.c Fri Apr 10 22:53:07 2015
(r281385)
+++ stable/10/sys/fs/nfsclient/nfs_clport.c Fri Apr 10 23:43:01 2015
(r281386)
@@ -1097,9 +1097,16 @@ nfscl_checksattr(struct vattr *vap, stru
* us to do a SETATTR RPC. FreeBSD servers store the verifier
* in atime, but we can't really assume that all servers will
* so we ensure that our SETATTR sets both atime and mtime.
+* Set the VA_UTIMES_NULL flag for this case, so that
+* the server's time will be used. This is needed to
+* work around a bug in some Solaris servers, where
+* setting the time TOCLIENT causes the Setattr RPC
+* to return NFS_OK, but not set va_mode.
*/
- if (vap-va_mtime.tv_sec == VNOVAL)
+ if (vap-va_mtime.tv_sec == VNOVAL) {
vfs_timestamp(vap-va_mtime);
+ vap-va_vaflags |= VA_UTIMES_NULL;
+ }
if (vap-va_atime.tv_sec == VNOVAL)
vap-va_atime = vap-va_mtime;
return (1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281387 - head/sys/dev/hptnr
Author: delphij Date: Sat Apr 11 00:45:03 2015 New Revision: 281387 URL: https://svnweb.freebsd.org/changeset/base/281387 Log: Merge changes from vendor driver version 1.1.1: v1.1.1 2015-03-26 * Support 4Kn drive. * Change the SCSI target ID of the disk to be the index of physical connetion to the HBA. * Support staggered drive spin up. * Fix a bug that command would be timeout because of improper interrupt service routine. * Error handling to avoid scsi command lost which caused system hang up. * Fix a bug that fail to get the devcie's serial number via FreeNAS WebGUI. Many thanks to HighPoint for continued support of FreeBSD! MFC after:2 weeks Modified: head/sys/dev/hptnr/README head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu head/sys/dev/hptnr/him.h head/sys/dev/hptnr/hptintf.h head/sys/dev/hptnr/hptnr_config.c head/sys/dev/hptnr/hptnr_config.h head/sys/dev/hptnr/hptnr_osm_bsd.c head/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu head/sys/dev/hptnr/ldm.h head/sys/dev/hptnr/os_bsd.h Modified: head/sys/dev/hptnr/README == --- head/sys/dev/hptnr/README Fri Apr 10 23:43:01 2015(r281386) +++ head/sys/dev/hptnr/README Sat Apr 11 00:45:03 2015(r281387) @@ -1,8 +1,16 @@ Rocket Controller Driver for FreeBSD -Copyright (C) 2014 HighPoint Technologies, Inc. All rights reserved. +Copyright (C) 2015 HighPoint Technologies, Inc. All rights reserved. # Revision History: + v1.1.1 2015-03-26 + * Support 4Kn drive. + * Change the SCSI target ID of the disk to be the index of physical connetion to the HBA. + * Support staggered drive spin up. + * Fix a bug that command would be timeout because of improper interrupt service routine. + * Error handling to avoid scsi command lost which caused system hang up. + * Fix a bug that fail to get the devcie's serial number via FreeNAS WebGUI. + v1.0.1 2014-8-19 * Do not retry the command and reset the disk when failed to enable or disable spin up feature. @@ -13,7 +21,7 @@ Revision History: * Support smartmontool for R750. v1.0 2013-7-3 - *First source code release +First source code release # @@ -49,7 +57,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hptnr_freebsd_src_v1.0.1_14_08_19.tgz + # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz 3) Update the kernel configuration file to include the HighPoint source. Assume the configure file is GENERIC, and new kernel configure file is Modified: head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu == --- head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Fri Apr 10 23:43:01 2015 (r281386) +++ head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Sat Apr 11 00:45:03 2015 (r281387) @@ -1,6297 +1,4969 @@ begin 644 hptnr_lib.o -M?T5,1@(!`0D```$`/@`!`+`#!@`` -M`$```$``$``-`(G0Q@(QD!$D$]G0@$\!.L$@^X3` -M=`:`9PS?ZP2`3PP@N!0```##9F9FD//#9F9FD9F9I!F9I!F9I!!5T%6055! -M5%532(/L$F)_4F)]DB)U8A,)`=%B=(BT8P2(E$)!!(QT8P`$B%P`^% -M=`$``.@`28G$N`!-A0/A!$``!,B_H`$B)1002(7`=15, -MB9,B_H`+@`ZH!``!!QD0D.!I!QD0D.0A!QD0D.@A!QD0D.P!! -MQD0D//]!QD0D/0!!QD0D):M!#[=.9!B40D($V);0H0=$)#3_0$ -M))0(2(M$)!!(BT`028E$)$A(!?\```!)B40D4$'10P)$B+100 -M28E$)'A)QX0DH`!!QD0D)(!)C5PD6+X`2(G?Z`!(BT0D -M$$B+!BZ_P```$B)W^@`3(GF3(GOZ`[R/___^L@9F9FD9FD+_H -M`P``Z`#ZP%,B_H`(3;=`Y!#[9$)0\@'3=A,!T,4B-=003(GO -MZ`!!#[=T)#))BWY0Z`!,B9,B_H`+@`Z```!)QT0D -M`!,B9,B_H`$B+1002(M8$$$/MM/MG0D!TB-P3H`$) -MQ,8#`,9#`0#0P(`QD,#`$B)[DR)[^@`2(U5.+@`9F:0Q@00`$B# -MP`%(@_@0=?)!C40D!,9%.!713D1B$4\QD4]`$B-75A$#[;@1(EE-,%E``` -M``!(BU0D$$B+0A!(B45(2(E5+X`2(G?Z`!(BT0D$$B+!A$ -MB)(B=_H`+@!2(/$%M=05Q!74%05_#D))\:)=PC1PX`9L=' -M#```9H7V=!^-4/^Y`9FD$B+!V:)%`A(@\$@^H!9H/Z_W7L\\-F9F:0 -M9F:09F:008GP9HEW,9'#@%FQT,``!FA?9T'KH`N0!(BP=FB10( -M@\(!2(/!`F9$.)U[//#9F9FD9FD9FD(!_#@%U*@^W1PP/M\A(BQ/MQ1* -M@\`!9HE'#8[1PIR!F;'1PP``:#;P@!#[?PTB+%P^W1PB#Z`%FB4(#[?` -M#[$0L-F9F:09F:09F:0@'\.`74J#[=7`^W1PP!P@^W1PJ)P8G0P?H?]_E( -M8])(BP=FB3109H-'`'#9F:0#[='`^WR$B+%V:)-$J#P`%FB4(PV9F9I!F -M9I!F9I!F@W\(``^4P`^VP,.0D)02(L/2#G/=0BY`.L/D$B+$4B+00A( -MB4((2(D02(G(PV9F9I!F9F:09F:09F:008G0A-)T.@^V!SH=2A(B?^ -M`.L4#[97`0^V00%(@\!2(/!`3C=0J#Q@%$.,9UY.L+N`!F9I!FD,.X -M`0```,-F9I!F9I!F9I#1P$`0(AW`L='!`##08G0#[97`0^VPDB-!$!( -MP`2(G!2`-/(/`8A7`40!1P2X`,8$`!(@\`!2(/X#'7R2(DQ1(A! -M$R)P@^VQHA!42)PL'J$(/B/P^V00J#X,`)T(A!L-F9F:0#[9'`3H'#Y+`
svn commit: r281388 - head/sys/netinet
Author: delphij Date: Sat Apr 11 01:06:59 2015 New Revision: 281388 URL: https://svnweb.freebsd.org/changeset/base/281388 Log: Attempt to fix build after 281351 by defining full prototype for the functions that were moved to ip_reass.c. Modified: head/sys/netinet/ip_input.c Modified: head/sys/netinet/ip_input.c == --- head/sys/netinet/ip_input.c Sat Apr 11 00:45:03 2015(r281387) +++ head/sys/netinet/ip_input.c Sat Apr 11 01:06:59 2015(r281388) @@ -90,11 +90,11 @@ CTASSERT(sizeof(struct ip) == 20); #endif /* IP reassembly functions are defined in ip_reass.c. */ -extern void ipreass_init(); -extern void ipreass_drain(); -extern void ipreass_slowtimo(); +extern void ipreass_init(void); +extern void ipreass_drain(void); +extern void ipreass_slowtimo(void); #ifdef VIMAGE -extern void ipreass_destroy(); +extern void ipreass_destroy(void); #endif struct rwlock in_ifaddr_lock; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281389 - in stable: 10/usr.sbin/acpi/acpiconf 8/usr.sbin/acpi/acpiconf 9/usr.sbin/acpi/acpiconf
Author: jkim
Date: Sat Apr 11 01:17:19 2015
New Revision: 281389
URL: https://svnweb.freebsd.org/changeset/base/281389
Log:
MFC: r281171
Tidy up battery status information. Remove a trailing white space.
PR: 193671
Modified:
stable/10/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/8/usr.sbin/acpi/acpiconf/acpiconf.c
stable/9/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/8/usr.sbin/acpi/acpiconf/ (props changed)
stable/9/usr.sbin/acpi/acpiconf/ (props changed)
Modified: stable/10/usr.sbin/acpi/acpiconf/acpiconf.c
==
--- stable/10/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:06:59 2015
(r281388)
+++ stable/10/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:17:19 2015
(r281389)
@@ -136,16 +136,30 @@ acpi_battinfo(int num)
if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, battio) == -1)
err(EX_IOERR, get battery user info (%d) failed, num);
if (battio.battinfo.state != ACPI_BATT_STAT_NOT_PRESENT) {
- printf(State:\t\t\t);
- if (battio.battinfo.state == 0)
- printf(high );
- if (battio.battinfo.state ACPI_BATT_STAT_CRITICAL)
- printf(critical );
- if (battio.battinfo.state ACPI_BATT_STAT_DISCHARG)
- printf(discharging );
- if (battio.battinfo.state ACPI_BATT_STAT_CHARGING)
- printf(charging );
- printf(\n);
+ const char *state;
+ switch (battio.battinfo.state ACPI_BATT_STAT_BST_MASK) {
+ case 0:
+ state = high;
+ break;
+ case ACPI_BATT_STAT_DISCHARG:
+ state = discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING:
+ state = charging;
+ break;
+ case ACPI_BATT_STAT_CRITICAL:
+ state = critical;
+ break;
+ case ACPI_BATT_STAT_DISCHARG | ACPI_BATT_STAT_CRITICAL:
+ state = critical discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING | ACPI_BATT_STAT_CRITICAL:
+ state = critical charging;
+ break;
+ default:
+ state = invalid;
+ }
+ printf(State:\t\t\t%s\n, state);
if (battio.battinfo.cap == -1)
printf(Remaining capacity:\tunknown\n);
else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281389 - in stable: 10/usr.sbin/acpi/acpiconf 8/usr.sbin/acpi/acpiconf 9/usr.sbin/acpi/acpiconf
Author: jkim
Date: Sat Apr 11 01:17:19 2015
New Revision: 281389
URL: https://svnweb.freebsd.org/changeset/base/281389
Log:
MFC: r281171
Tidy up battery status information. Remove a trailing white space.
PR: 193671
Modified:
stable/8/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/8/usr.sbin/acpi/acpiconf/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/usr.sbin/acpi/acpiconf/acpiconf.c
stable/9/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/10/ (props changed)
stable/9/usr.sbin/acpi/acpiconf/ (props changed)
Modified: stable/8/usr.sbin/acpi/acpiconf/acpiconf.c
==
--- stable/8/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:06:59 2015
(r281388)
+++ stable/8/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:17:19 2015
(r281389)
@@ -136,16 +136,30 @@ acpi_battinfo(int num)
if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, battio) == -1)
err(EX_IOERR, get battery user info (%d) failed, num);
if (battio.battinfo.state != ACPI_BATT_STAT_NOT_PRESENT) {
- printf(State:\t\t\t);
- if (battio.battinfo.state == 0)
- printf(high );
- if (battio.battinfo.state ACPI_BATT_STAT_CRITICAL)
- printf(critical );
- if (battio.battinfo.state ACPI_BATT_STAT_DISCHARG)
- printf(discharging );
- if (battio.battinfo.state ACPI_BATT_STAT_CHARGING)
- printf(charging );
- printf(\n);
+ const char *state;
+ switch (battio.battinfo.state ACPI_BATT_STAT_BST_MASK) {
+ case 0:
+ state = high;
+ break;
+ case ACPI_BATT_STAT_DISCHARG:
+ state = discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING:
+ state = charging;
+ break;
+ case ACPI_BATT_STAT_CRITICAL:
+ state = critical;
+ break;
+ case ACPI_BATT_STAT_DISCHARG | ACPI_BATT_STAT_CRITICAL:
+ state = critical discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING | ACPI_BATT_STAT_CRITICAL:
+ state = critical charging;
+ break;
+ default:
+ state = invalid;
+ }
+ printf(State:\t\t\t%s\n, state);
if (battio.battinfo.cap == -1)
printf(Remaining capacity:\tunknown\n);
else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281389 - in stable: 10/usr.sbin/acpi/acpiconf 8/usr.sbin/acpi/acpiconf 9/usr.sbin/acpi/acpiconf
Author: jkim
Date: Sat Apr 11 01:17:19 2015
New Revision: 281389
URL: https://svnweb.freebsd.org/changeset/base/281389
Log:
MFC: r281171
Tidy up battery status information. Remove a trailing white space.
PR: 193671
Modified:
stable/9/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/9/usr.sbin/acpi/acpiconf/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/usr.sbin/acpi/acpiconf/acpiconf.c
stable/8/usr.sbin/acpi/acpiconf/acpiconf.c
Directory Properties:
stable/10/ (props changed)
stable/8/usr.sbin/acpi/acpiconf/ (props changed)
Modified: stable/9/usr.sbin/acpi/acpiconf/acpiconf.c
==
--- stable/9/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:06:59 2015
(r281388)
+++ stable/9/usr.sbin/acpi/acpiconf/acpiconf.c Sat Apr 11 01:17:19 2015
(r281389)
@@ -136,16 +136,30 @@ acpi_battinfo(int num)
if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, battio) == -1)
err(EX_IOERR, get battery user info (%d) failed, num);
if (battio.battinfo.state != ACPI_BATT_STAT_NOT_PRESENT) {
- printf(State:\t\t\t);
- if (battio.battinfo.state == 0)
- printf(high );
- if (battio.battinfo.state ACPI_BATT_STAT_CRITICAL)
- printf(critical );
- if (battio.battinfo.state ACPI_BATT_STAT_DISCHARG)
- printf(discharging );
- if (battio.battinfo.state ACPI_BATT_STAT_CHARGING)
- printf(charging );
- printf(\n);
+ const char *state;
+ switch (battio.battinfo.state ACPI_BATT_STAT_BST_MASK) {
+ case 0:
+ state = high;
+ break;
+ case ACPI_BATT_STAT_DISCHARG:
+ state = discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING:
+ state = charging;
+ break;
+ case ACPI_BATT_STAT_CRITICAL:
+ state = critical;
+ break;
+ case ACPI_BATT_STAT_DISCHARG | ACPI_BATT_STAT_CRITICAL:
+ state = critical discharging;
+ break;
+ case ACPI_BATT_STAT_CHARGING | ACPI_BATT_STAT_CRITICAL:
+ state = critical charging;
+ break;
+ default:
+ state = invalid;
+ }
+ printf(State:\t\t\t%s\n, state);
if (battio.battinfo.cap == -1)
printf(Remaining capacity:\tunknown\n);
else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281390 - stable/10/sys/dev/usb/wlan
Author: rpaulo
Date: Sat Apr 11 02:23:59 2015
New Revision: 281390
URL: https://svnweb.freebsd.org/changeset/base/281390
Log:
MFC r281070:
urtwn: blink the LED when scanning.
Modified:
stable/10/sys/dev/usb/wlan/if_urtwn.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/usb/wlan/if_urtwn.c
==
--- stable/10/sys/dev/usb/wlan/if_urtwn.c Sat Apr 11 01:17:19 2015
(r281389)
+++ stable/10/sys/dev/usb/wlan/if_urtwn.c Sat Apr 11 02:23:59 2015
(r281390)
@@ -1561,14 +1561,9 @@ urtwn_newstate(struct ieee80211vap *vap,
urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(1), reg);
}
}
- /* Make link LED blink during scan. */
- urtwn_set_led(sc, URTWN_LED_LINK, !sc-ledlink);
-
/* Pause AC Tx queues. */
urtwn_write_1(sc, R92C_TXPAUSE,
urtwn_read_1(sc, R92C_TXPAUSE) | 0x0f);
-
- urtwn_set_chan(sc, ic-ic_curchan, NULL);
break;
case IEEE80211_S_AUTH:
/* Set initial gain under link. */
@@ -3124,8 +3119,13 @@ static void
urtwn_set_channel(struct ieee80211com *ic)
{
struct urtwn_softc *sc = ic-ic_ifp-if_softc;
+ struct ieee80211vap *vap = TAILQ_FIRST(ic-ic_vaps);
URTWN_LOCK(sc);
+ if (vap-iv_state == IEEE80211_S_SCAN) {
+ /* Make link LED blink during scan. */
+ urtwn_set_led(sc, URTWN_LED_LINK, !sc-ledlink);
+ }
urtwn_set_chan(sc, ic-ic_curchan, NULL);
URTWN_UNLOCK(sc);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281391 - head/tools/regression/sockets/reconnect
Author: ngie Date: Sat Apr 11 02:50:44 2015 New Revision: 281391 URL: https://svnweb.freebsd.org/changeset/base/281391 Log: - Use static buffers for temporary file paths instead of strdup of constant strings - Don't use /tmp because it's outside ATF's prescribed sandbox - Use mkstemp instead of mktemp to eliminate warning MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tools/regression/sockets/reconnect/reconnect.c Modified: head/tools/regression/sockets/reconnect/reconnect.c == --- head/tools/regression/sockets/reconnect/reconnect.c Sat Apr 11 02:23:59 2015(r281390) +++ head/tools/regression/sockets/reconnect/reconnect.c Sat Apr 11 02:50:44 2015(r281391) @@ -45,8 +45,8 @@ #include string.h #include unistd.h -static char *uds_name1 = NULL; -static char *uds_name2 = NULL; +static char uds_name1[] = reconnect.; +static char uds_name2[] = reconnect.; #definesstosa(ss) ((struct sockaddr *)(ss)) @@ -112,20 +112,14 @@ main() atexit(cleanup); -uds_name1 = strdup(/tmp/reconnect.XX); -if (uds_name1 == NULL) -err(1, can't allocate memory); -uds_name1 = mktemp(uds_name1); -if (uds_name1 == NULL) -err(1, mktemp(3) failed); +if (mkstemp(uds_name1) == -1) + err(1, mkstemp); +unlink(uds_name1); s_sock1 = create_uds_server(uds_name1); -uds_name2 = strdup(/tmp/reconnect.XX); -if (uds_name2 == NULL) -err(1, can't allocate memory); -uds_name2 = mktemp(uds_name2); -if (uds_name2 == NULL) -err(1, mktemp(3) failed); +if (mkstemp(uds_name2) == -1) +err(1, mkstemp); +unlink(uds_name2); s_sock2 = create_uds_server(uds_name2); c_sock = socket(PF_LOCAL, SOCK_DGRAM, 0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281392 - head/tools/regression/sockets/rtsocket
Author: ngie
Date: Sat Apr 11 02:59:45 2015
New Revision: 281392
URL: https://svnweb.freebsd.org/changeset/base/281392
Log:
- Garbage collect argc/argv (-Wunused)
- Bump WARNS to 6
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/rtsocket/Makefile
head/tools/regression/sockets/rtsocket/rtsocket.c
Modified: head/tools/regression/sockets/rtsocket/Makefile
==
--- head/tools/regression/sockets/rtsocket/Makefile Sat Apr 11 02:50:44
2015(r281391)
+++ head/tools/regression/sockets/rtsocket/Makefile Sat Apr 11 02:59:45
2015(r281392)
@@ -2,6 +2,6 @@
PROG= rtsocket
MAN=
-WARNS?=3
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/rtsocket/rtsocket.c
==
--- head/tools/regression/sockets/rtsocket/rtsocket.c Sat Apr 11 02:50:44
2015(r281391)
+++ head/tools/regression/sockets/rtsocket/rtsocket.c Sat Apr 11 02:59:45
2015(r281392)
@@ -41,7 +41,7 @@
#include unistd.h
int
-main(int argc, char *argv[])
+main(void)
{
int sock, socks[2];
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281393 - head/tools/regression/sockets/sblock
Author: ngie
Date: Sat Apr 11 03:13:09 2015
New Revision: 281393
URL: https://svnweb.freebsd.org/changeset/base/281393
Log:
Fix warnings and bump WARNS to 6
- Garbage collect argc/argv (-Wunused)
- sleep(3) will always return an unsigned int; don't check for return codes 0
(-Wsign-compare)
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/sblock/Makefile
head/tools/regression/sockets/sblock/sblock.c
Modified: head/tools/regression/sockets/sblock/Makefile
==
--- head/tools/regression/sockets/sblock/Makefile Sat Apr 11 02:59:45
2015(r281392)
+++ head/tools/regression/sockets/sblock/Makefile Sat Apr 11 03:13:09
2015(r281393)
@@ -4,6 +4,6 @@
PROG= sblock
MAN=
-WARNS?=2
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/sblock/sblock.c
==
--- head/tools/regression/sockets/sblock/sblock.c Sat Apr 11 02:59:45
2015(r281392)
+++ head/tools/regression/sockets/sblock/sblock.c Sat Apr 11 03:13:09
2015(r281393)
@@ -54,7 +54,7 @@
static int interrupted;
static void
-signal_handler(int signum)
+signal_handler(int signum __unused)
{
interrupted++;
@@ -95,7 +95,7 @@ locking_recver(int fd)
ssize_t len;
char ch;
- if (sleep(1) 0)
+ if (sleep(1) != 0)
err(-1, FAIL: locking_recver: sleep);
len = recv(fd, ch, sizeof(ch), 0);
if (len 0 errno != EINTR)
@@ -116,7 +116,7 @@ signaller(pid_t locking_recver_pid, int
ssize_t len;
char ch;
- if (sleep(2) 0) {
+ if (sleep(2) != 0) {
warn(signaller sleep(2));
return;
}
@@ -124,7 +124,7 @@ signaller(pid_t locking_recver_pid, int
warn(signaller kill(%d), locking_recver_pid);
return;
}
- if (sleep(1) 0) {
+ if (sleep(1) != 0) {
warn(signaller sleep(1));
return;
}
@@ -141,14 +141,14 @@ signaller(pid_t locking_recver_pid, int
warn(signaller close);
return;
}
- if (sleep(1) 0) {
+ if (sleep(1) != 0) {
warn(signaller sleep(1));
return;
}
}
int
-main(int argc, char *argv[])
+main(void)
{
int error, fds[2], recver_fd, sender_fd;
pid_t blocking_recver_pid;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281394 - head/tools/regression/sockets/sendfile
Author: ngie
Date: Sat Apr 11 03:18:14 2015
New Revision: 281394
URL: https://svnweb.freebsd.org/changeset/base/281394
Log:
- Don't use /tmp because it's outside ATF's prescribed sandbox
- Replace a hardcoded PATH_MAX value with sizeof(path)
- Use path like an array, not a pointer, and always try to unlink it in
cleanup
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/sendfile/sendfile.c
Modified: head/tools/regression/sockets/sendfile/sendfile.c
==
--- head/tools/regression/sockets/sendfile/sendfile.c Sat Apr 11 03:13:09
2015(r281393)
+++ head/tools/regression/sockets/sendfile/sendfile.c Sat Apr 11 03:18:14
2015(r281394)
@@ -452,8 +452,8 @@ run_parent(void)
static void
cleanup(void)
{
- if (*path != '\0')
- unlink(path);
+
+ unlink(path);
}
int
@@ -461,12 +461,12 @@ main(int argc, char *argv[])
{
int pagesize;
- *path = '\0';
+ path[0] = '\0';
pagesize = getpagesize();
if (argc == 1) {
- snprintf(path, PATH_MAX, /tmp/sendfile.);
+ snprintf(path, sizeof(path), sendfile.);
file_fd = mkstemp(path);
if (file_fd == -1)
FAIL_ERR(mkstemp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281395 - head/tools/regression/sockets/shutdown
Author: ngie Date: Sat Apr 11 03:19:48 2015 New Revision: 281395 URL: https://svnweb.freebsd.org/changeset/base/281395 Log: Fix a -Wuninitialized warning by setting the socket to -1 and bump WARNS to 6 MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tools/regression/sockets/shutdown/Makefile head/tools/regression/sockets/shutdown/shutdown.c Modified: head/tools/regression/sockets/shutdown/Makefile == --- head/tools/regression/sockets/shutdown/Makefile Sat Apr 11 03:18:14 2015(r281394) +++ head/tools/regression/sockets/shutdown/Makefile Sat Apr 11 03:19:48 2015(r281395) @@ -4,6 +4,6 @@ PROG= shutdown MAN= -WARNS?=2 +WARNS?=6 .include bsd.prog.mk Modified: head/tools/regression/sockets/shutdown/shutdown.c == --- head/tools/regression/sockets/shutdown/shutdown.c Sat Apr 11 03:18:14 2015(r281394) +++ head/tools/regression/sockets/shutdown/shutdown.c Sat Apr 11 03:19:48 2015(r281395) @@ -45,6 +45,8 @@ main(void) int listen_sock, connect_sock; u_short port; + listen_sock = -1; + /* Shutdown(2) on an invalid file descriptor has to return EBADF. */ if ((shutdown(listen_sock, SHUT_RDWR) != -1) (errno != EBADF)) errx(-1, shutdown() for invalid file descriptor does not ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281396 - in head/sys: contrib/dev/acpica contrib/dev/acpica/common contrib/dev/acpica/compiler contrib/dev/acpica/components/debugger contrib/dev/acpica/components/disassembler contrib...
Author: jkim Date: Sat Apr 11 03:23:41 2015 New Revision: 281396 URL: https://svnweb.freebsd.org/changeset/base/281396 Log: Merge ACPICA 20150410. Modified: head/sys/contrib/dev/acpica/acpica_prep.sh head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/adfile.c head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/common/dmtbdump.c head/sys/contrib/dev/acpica/common/dmtbinfo.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/asllisting.c head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmap.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslrules.y head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/asltree.c head/sys/contrib/dev/acpica/compiler/asltypes.y head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/aslwalks.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dttable.c head/sys/contrib/dev/acpica/compiler/dttemplate.h head/sys/contrib/dev/acpica/compiler/dtutils.c head/sys/contrib/dev/acpica/components/debugger/dbmethod.c head/sys/contrib/dev/acpica/components/debugger/dbxface.c head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c head/sys/contrib/dev/acpica/components/disassembler/dmwalk.c head/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c head/sys/contrib/dev/acpica/components/dispatcher/dsutils.c head/sys/contrib/dev/acpica/components/events/evregion.c head/sys/contrib/dev/acpica/components/events/evxfevnt.c head/sys/contrib/dev/acpica/components/executer/exdump.c head/sys/contrib/dev/acpica/components/executer/exfldio.c head/sys/contrib/dev/acpica/components/executer/exoparg3.c head/sys/contrib/dev/acpica/components/executer/exregion.c head/sys/contrib/dev/acpica/components/hardware/hwgpe.c head/sys/contrib/dev/acpica/components/hardware/hwvalid.c head/sys/contrib/dev/acpica/components/namespace/nsdump.c head/sys/contrib/dev/acpica/components/parser/psopcode.c head/sys/contrib/dev/acpica/components/parser/psopinfo.c head/sys/contrib/dev/acpica/components/resources/rsaddr.c head/sys/contrib/dev/acpica/components/resources/rsdump.c head/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c head/sys/contrib/dev/acpica/components/resources/rsxface.c head/sys/contrib/dev/acpica/components/tables/tbdata.c head/sys/contrib/dev/acpica/components/tables/tbinstal.c head/sys/contrib/dev/acpica/components/tables/tbprint.c head/sys/contrib/dev/acpica/components/tables/tbxfroot.c head/sys/contrib/dev/acpica/components/utilities/utaddress.c head/sys/contrib/dev/acpica/components/utilities/utbuffer.c head/sys/contrib/dev/acpica/components/utilities/utglobal.c head/sys/contrib/dev/acpica/components/utilities/utmisc.c head/sys/contrib/dev/acpica/components/utilities/utosi.c head/sys/contrib/dev/acpica/components/utilities/utprint.c head/sys/contrib/dev/acpica/components/utilities/utstate.c head/sys/contrib/dev/acpica/components/utilities/utuuid.c head/sys/contrib/dev/acpica/include/acdebug.h head/sys/contrib/dev/acpica/include/acdisasm.h head/sys/contrib/dev/acpica/include/acglobal.h head/sys/contrib/dev/acpica/include/aclocal.h head/sys/contrib/dev/acpica/include/acmacros.h head/sys/contrib/dev/acpica/include/acopcode.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/acresrc.h head/sys/contrib/dev/acpica/include/acrestyp.h head/sys/contrib/dev/acpica/include/acstruct.h head/sys/contrib/dev/acpica/include/actables.h head/sys/contrib/dev/acpica/include/actbl2.h head/sys/contrib/dev/acpica/include/actypes.h head/sys/contrib/dev/acpica/include/acutils.h head/sys/contrib/dev/acpica/include/amlcode.h head/sys/contrib/dev/acpica/include/platform/acenv.h head/sys/dev/acpica/acpi_pcib_acpi.c head/sys/dev/acpica/acpi_resource.c Directory Properties: head/sys/contrib/dev/acpica/ (props changed) Modified: head/sys/contrib/dev/acpica/acpica_prep.sh == --- head/sys/contrib/dev/acpica/acpica_prep.sh Sat Apr 11 03:19:48 2015 (r281395) +++ head/sys/contrib/dev/acpica/acpica_prep.sh Sat Apr 11 03:23:41 2015 (r281396) @@ -18,11 +18,12 @@ fulldirs=common compiler components inc # files to remove stripdirs=generate libraries tests tools -stripfiles=Makefile README accygwin.h
svn commit: r281397 - head/tools/regression/sockets/sigpipe
Author: ngie
Date: Sat Apr 11 03:24:49 2015
New Revision: 281397
URL: https://svnweb.freebsd.org/changeset/base/281397
Log:
Mark signum unused in signal_handler; bump WARNS to 6
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/sigpipe/Makefile
head/tools/regression/sockets/sigpipe/sigpipe.c
Modified: head/tools/regression/sockets/sigpipe/Makefile
==
--- head/tools/regression/sockets/sigpipe/Makefile Sat Apr 11 03:23:41
2015(r281396)
+++ head/tools/regression/sockets/sigpipe/Makefile Sat Apr 11 03:24:49
2015(r281397)
@@ -4,6 +4,6 @@
PROG= sigpipe
MAN=
-WARNS?=2
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/sigpipe/sigpipe.c
==
--- head/tools/regression/sockets/sigpipe/sigpipe.c Sat Apr 11 03:23:41
2015(r281396)
+++ head/tools/regression/sockets/sigpipe/sigpipe.c Sat Apr 11 03:24:49
2015(r281397)
@@ -69,7 +69,7 @@ got_signal(void)
}
static void
-signal_handler(int signum)
+signal_handler(int signum __unused)
{
signaled = 1;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281398 - head/tools/regression/sockets/socketpair
Author: ngie
Date: Sat Apr 11 03:35:33 2015
New Revision: 281398
URL: https://svnweb.freebsd.org/changeset/base/281398
Log:
Garbage collect argc/argv and bump WARNS to 6
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/socketpair/Makefile
head/tools/regression/sockets/socketpair/socketpair.c
Modified: head/tools/regression/sockets/socketpair/Makefile
==
--- head/tools/regression/sockets/socketpair/Makefile Sat Apr 11 03:24:49
2015(r281397)
+++ head/tools/regression/sockets/socketpair/Makefile Sat Apr 11 03:35:33
2015(r281398)
@@ -4,6 +4,6 @@
PROG= socketpair
MAN=
-WARNS?=2
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/socketpair/socketpair.c
==
--- head/tools/regression/sockets/socketpair/socketpair.c Sat Apr 11
03:24:49 2015(r281397)
+++ head/tools/regression/sockets/socketpair/socketpair.c Sat Apr 11
03:35:33 2015(r281398)
@@ -47,7 +47,7 @@
* right places.
*/
int
-main(int argc, char *argv[])
+main(void)
{
int fd1, fd2, fd3;
int sv[2];
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r281399 - head/tools/regression/sockets/unix_bindconnect
Author: ngie
Date: Sat Apr 11 03:38:49 2015
New Revision: 281399
URL: https://svnweb.freebsd.org/changeset/base/281399
Log:
Fix warnings and bump WARNS to 6
- Staticize variables as needed
- Garbage collect argc/argv
- Fix -Wsign-compare warnings by casting small sizeof to (int)
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/sockets/unix_bindconnect/Makefile
head/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
Modified: head/tools/regression/sockets/unix_bindconnect/Makefile
==
--- head/tools/regression/sockets/unix_bindconnect/Makefile Sat Apr 11
03:35:33 2015(r281398)
+++ head/tools/regression/sockets/unix_bindconnect/Makefile Sat Apr 11
03:38:49 2015(r281399)
@@ -2,6 +2,6 @@
PROG= unix_bindconnect
MAN=
-WARNS?=2
+WARNS?=6
.include bsd.prog.mk
Modified: head/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
==
--- head/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c Sat Apr
11 03:35:33 2015(r281398)
+++ head/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c Sat Apr
11 03:38:49 2015(r281399)
@@ -54,8 +54,8 @@
#defineUNWIND_MAX 1024
-int unwind_len;
-struct unwind {
+static int unwind_len;
+static struct unwind {
charu_path[PATH_MAX];
} unwind_list[UNWIND_MAX];
@@ -105,7 +105,7 @@ bind_test(const char *directory_path)
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
if (snprintf(sun.sun_path, sizeof(sun.sun_path), %s, socket_path)
- = sizeof(sun.sun_path)) {
+ = (int)sizeof(sun.sun_path)) {
warn(bind_test: snprintf(sun.sun_path));
close(sock1);
return (-1);
@@ -216,7 +216,7 @@ connect_test(const char *directory_path)
sun.sun_len = sizeof(sun);
sun.sun_family = AF_UNIX;
if (snprintf(sun.sun_path, sizeof(sun.sun_path), %s, socket_path)
- = sizeof(sun.sun_path)) {
+ = (int)sizeof(sun.sun_path)) {
warn(connect_test: snprintf(sun.sun_path));
close(sock1);
return (-1);
@@ -298,7 +298,7 @@ connect_test(const char *directory_path)
return (0);
}
int
-main(int argc, char *argv[])
+main(void)
{
char directory_path[PATH_MAX];
int error;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
