X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=5403b9a607d2f8780017b2ca6306019c509ebcb7;hp=2513db6d4ad17746af1ece48e2b9b4a21a1efbac;hb=095fc31c48324112a71602ba6975d9d33cf4378e;hpb=c5fa571f434b45ab8f786cf20e8c22d197a00da2;ds=sidebyside

diff --git a/gui.c b/gui.c
index 2513db6d..5403b9a6 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
@@ -20,11 +20,13 @@
 
 #include "gui.cmdline.h"
 #include "para.h"
+#include "gui.h"
 #include <curses.h>
 #include "ringbuffer.h"
 #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;
@@ -874,7 +876,7 @@ static int do_select(int mode)
 	fd_set rfds;
 	int ret;
 	int max_fileno, cp_numread = 1;
-	char command_buf[STRINGSIZE] = "";
+	char command_buf[4096] = "";
 	int cbo = 0; /* command buf offset */
 	struct timeval tv;
 repeat:
@@ -906,7 +908,7 @@ repeat:
 	if (command_pipe >= 0 && mode == COMMAND_MODE &&
 			FD_ISSET(command_pipe, &rfds)) {
 		cp_numread = read(command_pipe, command_buf + cbo,
-			STRINGSIZE - 1 - cbo);
+			sizeof(command_buf) - 1 - cbo);
 		if (cp_numread >= 0)
 			cbo += cp_numread;
 		else {
@@ -988,6 +990,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 +1006,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();
 }
 
@@ -1165,7 +1169,7 @@ static void com_reread_conf(void)
 	PARA_INFO_LOG("%s", "rereading command line options and config file");
 	gui_cmdline_parser(_argc, _argv, &conf);
 	gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
-	PARA_NOTICE_LOG("%s", "configuration read");
+	PARA_NOTICE_LOG("%s", "config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
 }
@@ -1326,6 +1330,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) {