X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=b25b049edac1d162c663ae58218c75dc3815e0dd;hp=4f7542f5b16b44f6c8a794cb66033f1f45030c16;hb=3ad57bc902f31ba347df59de04168f00c626d924;hpb=1ac26f37368b33e0952e19df05184776c80159c8;ds=sidebyside

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 4f7542f5..b25b049e 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -84,8 +84,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)
 {
@@ -330,8 +331,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,11 +364,15 @@ static bool should_fail(struct failtest_call *call)
 		/* + means continue after end, like normal. */
 		if (*failpath == '+')
 			failpath = NULL;
-		else {
-			if (tolower(*failpath) != info_to_arg[call->type])
+		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",
 				     info_to_arg[call->type], *failpath);
-			call->fail = isupper(*(failpath++));
+			call->fail = isupper((unsigned char)*(failpath++));
 			return call->fail;
 		}
 	}
@@ -376,7 +382,7 @@ static bool should_fail(struct failtest_call *call)
 		unsigned int i;
 
 		for (i = 0; i < history_num; i++) {
-			char c = info_to_arg[history[i].type];
+			unsigned char c = info_to_arg[history[i].type];
 			if (history[i].fail)
 				c = toupper(c);
 			if (c != debugpath[i])
@@ -430,7 +436,7 @@ static bool should_fail(struct failtest_call *call)
 	if (child == 0) {
 		if (tracefd != -1) {
 			struct timeval now;
-			char *p;
+			const char *p;
 			gettimeofday(&now, NULL);
 			if (now.tv_usec < start.tv_usec) {
 				now.tv_sec--;
@@ -441,7 +447,7 @@ static bool should_fail(struct failtest_call *call)
 			p = failpath_string();
 			trace("%u->%u (%u.%02u): %s (", getppid(), getpid(),
 			      (int)now.tv_sec, (int)now.tv_usec / 10000, p);
-			free(p);
+			free((char *)p);
 			p = strrchr(history[history_num-1].file, '/');
 			if (p)
 				trace("%s", p+1);
@@ -480,8 +486,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;