X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=061d6e9e3fc911c12c88fe7b122a417287441133;hp=3f64bc91b512e35cb05a812979118ee06b9b1280;hb=156e5eb92f1d986957cb081b58320579c6e366dd;hpb=b7dedf4344c7e573c048a36e7b456f2a4bdbebb7

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 3f64bc91..061d6e9e 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -12,6 +12,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <signal.h>
 #include <assert.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/failtest/failtest_proto.h>
@@ -84,8 +85,9 @@ static struct failtest_call *add_history_(enum failtest_call_type type,
 #define add_history(type, file, line, elem) \
 	add_history_((type), (file), (line), (elem), sizeof(*(elem)))
 
+/* We do a fake call inside a sizeof(), to check types. */
 #define set_cleanup(call, clean, type)			\
-	(call)->cleanup = (void *)((void)sizeof(clean((type *)NULL)), (clean))
+	(call)->cleanup = (void *)((void)sizeof(clean((type *)NULL),1), (clean))
 
 static bool read_write_info(int fd)
 {
@@ -247,7 +249,8 @@ static struct saved_file *save_file(struct saved_file *next, int fd)
 	s->len = lseek(fd, 0, SEEK_END);
 	lseek(fd, 0, SEEK_SET);
 	s->contents = malloc(s->len);
-	read(fd, s->contents, s->len);
+	if (read(fd, s->contents, s->len) != s->len)
+		err(1, "Failed to save %zu bytes", (size_t)s->len);
 	lseek(fd, s->off, SEEK_SET);
 	return s;
 }
@@ -292,8 +295,11 @@ static void restore_files(struct saved_file *s)
 		struct saved_file *next = s->next;
 
 		lseek(s->fd, 0, SEEK_SET);
-		write(s->fd, s->contents, s->len);
-		ftruncate(s->fd, s->len);
+		if (write(s->fd, s->contents, s->len) != s->len)
+			err(1, "Failed to restore %zu bytes", (size_t)s->len);
+		if (ftruncate(s->fd, s->len) != 0)
+			err(1, "Failed to trim file to length %zu",
+			    (size_t)s->len);
 		free(s->contents);
 		lseek(s->fd, s->off, SEEK_SET);
 		free(s);
@@ -330,8 +336,9 @@ static NORETURN void failtest_cleanup(bool forced_cleanup, int status)
 		if (!history[i].cleanup)
 			continue;
 		if (!forced_cleanup) {
-			printf("Leak at %s:%u\n",
-			       history[i].file, history[i].line);
+			printf("Leak at %s:%u: --failpath=%s\n",
+			       history[i].file, history[i].line,
+			       failpath_string());
 			status = 1;
 		}
 		history[i].cleanup(&history[i].u);
@@ -362,7 +369,10 @@ static bool should_fail(struct failtest_call *call)
 		/* + means continue after end, like normal. */
 		if (*failpath == '+')
 			failpath = NULL;
-		else {
+		else if (*failpath == '\0') {
+			/* Continue, but don't inject errors. */
+			return call->fail = false;
+		} else {
 			if (tolower((unsigned char)*failpath)
 			    != info_to_arg[call->type])
 				errx(1, "Failpath expected '%c' got '%c'\n",
@@ -390,8 +400,8 @@ static bool should_fail(struct failtest_call *call)
 			signal(SIGUSR1, SIG_IGN);
 			sprintf(str, "xterm -e gdb /proc/%d/exe %d &",
 				getpid(), getpid());
-			system(str);
-			sleep(5);
+			if (system(str) == 0)
+				sleep(5);
 		}
 	}
 
@@ -481,8 +491,13 @@ static bool should_fail(struct failtest_call *call)
 		else
 			ret = poll(pfd, 2, failtest_timeout_ms);
 
-		if (ret <= 0)
+		if (ret == 0)
 			hand_down(SIGUSR1);
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			err(1, "Poll returned %i", ret);
+		}
 
 		if (pfd[0].revents & POLLIN) {
 			ssize_t len;
@@ -662,7 +677,7 @@ int failtest_open(const char *pathname,
 	va_start(ap, line);
 	call.flags = va_arg(ap, int);
 	if (call.flags & O_CREAT) {
-		call.mode = va_arg(ap, mode_t);
+		call.mode = va_arg(ap, int);
 		va_end(ap);
 	}
 	p = add_history(FAILTEST_OPEN, file, line, &call);