X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2Futil%2Fexec-alt-t.c;h=07f3d2c38b1b50decf2dcf32987c9b672093a96d;hp=69a41c01f9fb5a786f63db348cf7835bbf867f78;hb=2fe3a28c6ec0ff9d19ddec5500b3a5e69b483210;hpb=4e0bc086d6d09db66b3dd26d221ff712ff351386

diff --git a/tests/util/exec-alt-t.c b/tests/util/exec-alt-t.c
index 69a41c0..07f3d2c 100644
--- a/tests/util/exec-alt-t.c
+++ b/tests/util/exec-alt-t.c
@@ -24,6 +24,7 @@
 
 #define FAILSTR "exec test failure\n"
 #define ARGSTRING "teststring"
+#define PSTR(s) ((s) != NULL ? (s) : "(null)")
 
 static struct exec_test {
     const char *prefix; /* program prefix to run */
@@ -196,7 +197,7 @@ main(int argc, char **argv)
 	    nBytes = read(fds[0], buf, sizeof(buf)-1);
 	    is_int(result_len, nBytes,
 	           "child output size for prefix=%s, suffix=%s",
-	           t->prefix, t->suffix);
+	           PSTR(t->prefix), PSTR(t->suffix));
 
 	    if (nBytes < 0) {
 		skip("read() failed; cannot test read buffer");
@@ -206,7 +207,7 @@ main(int argc, char **argv)
 
 		is_string(result, buf,
 		          "child output for prefix=%s, suffix=%s",
-		          t->prefix, t->suffix);
+		          PSTR(t->prefix), PSTR(t->suffix));
 	    }
 
 	    if (close(fds[0])) {
@@ -225,12 +226,12 @@ main(int argc, char **argv)
 	    }
 
 	    ok(WIFEXITED(status), "child exited for prefix=%s, suffix=%s",
-	                          t->prefix, t->suffix);
+	                          PSTR(t->prefix), PSTR(t->suffix));
 
 	    if (WIFEXITED(status)) {
 		is_int(0, WEXITSTATUS(status),
 		       "child exit code for prefix=%s, suffix=%s",
-		       t->prefix, t->suffix);
+		       PSTR(t->prefix), PSTR(t->suffix));
 	    } else {
 		skip("!WIFEXITED(status) (status=%d), cannot check exit code",
 		     status);