Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 3 Oct 2017 07:01:24 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r324231 - user/pho/stress2/misc
Message-ID:  <201710030701.v9371OrC086535@repo.freebsd.org>
index | next in thread | raw e-mail 

Author: pho
Date: Tue Oct  3 07:01:24 2017
New Revision: 324231
URL: https://svnweb.freebsd.org/changeset/base/324231

Log:
  Return error status. Style fix.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/sendfile11.sh

Modified: user/pho/stress2/misc/sendfile11.sh
==============================================================================
--- user/pho/stress2/misc/sendfile11.sh	Tue Oct  3 07:00:26 2017	(r324230)
+++ user/pho/stress2/misc/sendfile11.sh	Tue Oct  3 07:01:24 2017	(r324231)
@@ -129,10 +129,11 @@ reader(void) {
 
 	t = 0;
 	if ((buf = malloc(BUFSIZE)) == NULL)
-			err(1, "malloc(%d), %s:%d", BUFSIZE, __FILE__, __LINE__);
+		err(1, "malloc(%d), %s:%d", BUFSIZE, __FILE__, __LINE__);
 
-	if ((fd = open(outputFile, O_RDWR | O_CREAT | O_TRUNC, 0640)) == -1)
-			err(1, "open(%s)", outputFile);
+	if ((fd = open(outputFile, O_RDWR | O_CREAT | O_TRUNC, 0640)) ==
+	    -1)
+		err(1, "open(%s)", outputFile);
 
 	for (;;) {
 		if ((n = read(msgsock, buf, BUFSIZE)) < 0)
@@ -169,7 +170,8 @@ writer(void) {
 		size = getpagesize() -4;
 		if (setsockopt(tcpsock,
 		    SOL_SOCKET, SO_SNDBUF, (void *)&size, sizeof(size)) < 0)
-			err(1, "setsockopt(SO_SNDBUF), %s:%d", __FILE__, __LINE__);
+			err(1, "setsockopt(SO_SNDBUF), %s:%d", __FILE__,
+			    __LINE__);
 
 		hostent = gethostbyname ("localhost");
 		memcpy (&inetaddr.sin_addr.s_addr, hostent->h_addr,
@@ -206,11 +208,14 @@ int
 main(int argc, char **argv)
 {
 	pid_t pid;
+	int e, s;
 
 	if (argc != 4) {
-		fprintf(stderr, "Usage: %s <inputFile outputFile portNumber\n", argv[0]);
+		fprintf(stderr,
+		    "Usage: %s <inputFile outputFile portNumber\n", argv[0]);
 			return (1);
 	}
+	e = 0;
 	inputFile = argv[1];
 	outputFile = argv[2];
 	port = atoi(argv[3]);
@@ -222,8 +227,11 @@ main(int argc, char **argv)
 	} else if (pid > 0) {
 		reader();
 		kill(pid, SIGINT);
+		waitpid(pid, &s, 0);
+		if (s != 0)
+			e = 1;
 	} else
 		err(1, "fork(), %s:%d",  __FILE__, __LINE__);
 
-	return (0);
+	return (e);
 }
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710030701.v9371OrC086535>