X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=8c0da59e704a4408322b7729a2042a7f8cc0613b;hp=2513db6d4ad17746af1ece48e2b9b4a21a1efbac;hb=f0cb2c2e49b4353a998d6fdf823972d2516c5dcf;hpb=8ed782af8c51c4f79b81825f7a049b12baf93cb1

diff --git a/gui.c b/gui.c
index 2513db6d..8c0da59e 100644
--- a/gui.c
+++ b/gui.c
@@ -1,30 +1,20 @@
 /*
- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file gui.c ncurses-based interface for paraslash */
 
 #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 +864,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 +896,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 +978,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 +994,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 +1157,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 +1318,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) {