[netfilter-cvslog] r4118 - trunk/nfsim/core

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-07-17 22:34:07 +0200 (Sun, 17 Jul 2005)
New Revision: 4118

Modified:
   trunk/nfsim/core/core.c
   trunk/nfsim/core/tui.c
   trunk/nfsim/core/tui.h
Log:
Don't use stdin unless actually interactive: valgrind --db-attach uses stdin, and I want to use that with --failpath

Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2005-07-17 20:32:43 UTC (rev 4117)
+++ trunk/nfsim/core/core.c	2005-07-17 20:34:07 UTC (rev 4118)
@@ -413,7 +413,7 @@
 
 int main(int argc, char **argv)
 {
-	int c;
+	int c, input_fd = STDIN_FILENO;
 	char *p, *optstr;
 	struct option *options;
 
@@ -431,12 +431,10 @@
 	}
 
 	if (optind < argc) {
-		int input = open(argv[optind], O_RDONLY);
-		if (input < 0)
+		input_fd = open(argv[optind], O_RDONLY);
+		if (input_fd < 0)
 			barf_perror("Opening %s", argv[optind]);
 		nfsim_testname = argv[optind];
-		dup2(input, STDIN_FILENO);
-		close(input);
 	}
 
 	/* Hack to make users' lives easier: set LD_LIBRARY_PATH for
@@ -493,7 +491,7 @@
 	message_init();
 	suppress_failtest--;
 
-	tui_run(!get_failtest(), STDIN_FILENO);
+	tui_run(input_fd);
 
 	/* Everyone loves a good error haiku! */
 	if (expects_remaining())

Modified: trunk/nfsim/core/tui.c
===================================================================
--- trunk/nfsim/core/tui.c	2005-07-17 20:32:43 UTC (rev 4117)
+++ trunk/nfsim/core/tui.c	2005-07-17 20:34:07 UTC (rev 4118)
@@ -281,7 +281,7 @@
 	}
 }
 
-void tui_run(bool interactive, int fd)
+void tui_run(int fd)
 {
 	tui_register_command("exit", tui_exit, tui_exit_help);
 	tui_register_command("quit", tui_exit, tui_exit_help);
@@ -289,7 +289,7 @@
 	tui_register_command("test", tui_argtest, NULL);
 	tui_register_command("help", tui_help, tui_help_help);
 
-	if (interactive) {
+	if (fd == STDIN_FILENO) {
 		stop = false;
 		rl_callback_handler_install(tui_quiet ? "" : "> ",
 					    readline_process_line);

Modified: trunk/nfsim/core/tui.h
===================================================================
--- trunk/nfsim/core/tui.h	2005-07-17 20:32:43 UTC (rev 4117)
+++ trunk/nfsim/core/tui.h	2005-07-17 20:34:07 UTC (rev 4118)
@@ -34,7 +34,7 @@
 int tui_register_pre_post_hook(void (*pre)(const char *),
 			       bool (*post)(const char *));
 
-void tui_run(bool interactive, int fd);
+void tui_run(int fd);
 
 bool tui_do_command(int argc, char *argv[], bool abort);