small changes

[c11tester.git] / common.cc

diff --git a/common.cc b/common.cc
index f327d27ed9e122a68ab1c8a1a831c9f62a928ef6..8bef5194201c59f3ee3ff16bf87e1dbaa18a3319 100644 (file)
--- a/common.cc
+++ b/common.cc
@@ -37,7 +37,7 @@ void print_trace(void)
                model_print("\t%s\n", strings[i]);
 
        free(strings);
-#endif/* CONFIG_STACKTRACE */
+#endif /* CONFIG_STACKTRACE */
 }
 
 void assert_hook(void)
@@ -79,6 +79,8 @@ static int fd_user_out;       /**< @brief File descriptor from which to read user prog
  *
  * This function should only be called once.
  */
+char filename[256];
+
 void redirect_output()
 {
        /* Save stdout for later use */
@@ -87,25 +89,13 @@ void redirect_output()
                perror("dup");
                exit(EXIT_FAILURE);
        }
-
-       /* Redirect program output to a pipe */
-       int pipefd[2];
-       if (pipe(pipefd) < 0) {
-               perror("pipe");
-               exit(EXIT_FAILURE);
-       }
-       if (dup2(pipefd[1], STDOUT_FILENO) < 0) {
+       snprintf_(filename, sizeof(filename), "C11FuzzerTmp%d", getpid());
+       fd_user_out = open(filename, O_CREAT | O_TRUNC| O_RDWR, S_IRWXU);
+       if (dup2(fd_user_out, STDOUT_FILENO) < 0) {
                perror("dup2");
                exit(EXIT_FAILURE);
        }
-       close(pipefd[1]);
 
-       /* Save the "read" side of the pipe for use later */
-       if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) < 0) {
-               perror("fcntl");
-               exit(EXIT_FAILURE);
-       }
-       fd_user_out = pipefd[0];
 }
 
 /**
@@ -138,8 +128,8 @@ static ssize_t read_to_buf(int fd, char *buf, size_t maxlen)
 void clear_program_output()
 {
        fflush(stdout);
-       char buf[200];
-       while (read_to_buf(fd_user_out, buf, sizeof(buf))) ;
+       close(fd_user_out);
+       unlink(filename);
 }
 
 /** @brief Print out any pending program output */
@@ -152,6 +142,7 @@ void print_program_output()
        /* Gather all program output */
        fflush(stdout);
 
+       lseek(fd_user_out, 0, SEEK_SET);
        /* Read program output pipe and write to (real) stdout */
        ssize_t ret;
        while (1) {
@@ -168,6 +159,9 @@ void print_program_output()
                }
        }
 
+       close(fd_user_out);
+       unlink(filename);
+
        model_print("---- END PROGRAM OUTPUT   ----\n");
 }
-#endif/* ! CONFIG_DEBUG */
+#endif /* ! CONFIG_DEBUG */