X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=7588f2b2ec7f7136962c4d5b4b7b086ff1648b17;hb=da1a145bf2f9d1a57c3359372695894247fef704;hp=b94a6472468a1c8fb6c1f590aa82d4b1d8a8431f;hpb=8eda9bd0b67fd6128b52b6fb3309d4b3ab4feeed;p=paraslash.git

diff --git a/gui.c b/gui.c
index b94a6472..7588f2b2 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include "string.h"
 #include "fd.h"
 #include "error.h"
+#include "signal.h"
 
 /** define the array of error lists needed by para_gui */
 INIT_GUI_ERRLISTS;
@@ -988,6 +989,7 @@ static int client_cmd_cmdline(char *cmd)
 	if (ret < 0)
 		return -1;
 	command_pipe = fds[1];
+	mark_fd_nonblock(command_pipe);
 	return send_output();
 }
 
@@ -1003,6 +1005,7 @@ static int display_cmd(char *cmd)
 	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
 		return -1;
 	command_pipe = fds[1];
+	mark_fd_nonblock(command_pipe);
 	return send_output();
 }
 
@@ -1326,6 +1329,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "parse error while reading command line\n");
 		exit(EXIT_FAILURE);
 	}
+	HANDLE_VERSION_FLAG("gui", conf);
 	init_theme(0, &theme);
 	top.lines = theme.top_lines_default;
 	if (check_key_map_args() < 0) {