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

diff --git a/gui.c b/gui.c
index 7588f2b2..d8e20034 100644
--- a/gui.c
+++ b/gui.c
@@ -1,30 +1,24 @@
 /*
  * 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 <sys/types.h>
+#include <dirent.h>
+
 #include "gui.cmdline.h"
 #include "para.h"
+#include "gui.h"
 #include <curses.h>
 #include "ringbuffer.h"
-#include "string.h"
+#include "gui_common.h"
 #include "fd.h"
 #include "error.h"
+#include "list.h"
+#include "sched.h"
 #include "signal.h"
 
 /** define the array of error lists needed by para_gui */
@@ -458,11 +452,12 @@ __printf_2_3 static void outputf(int color, const char* fmt,...)
 	wrefresh(bot.win);
 }
 
-static void add_output_line(char *line)
+static int add_output_line(char *line, __a_unused void *data)
 {
 	if (!curses_active)
-		return;
+		return 1;
 	rb_add_entry(COLOR_OUTPUT, para_strdup(line));
+	return 1;
 }
 
 void para_log(int ll, const char *fmt,...)
@@ -746,7 +741,7 @@ reap_next_child:
 /*
  * print status line if line starts with known command.
  */
-static void check_stat_line(char *line)
+static int check_stat_line(char *line, __a_unused void *data)
 {
 	int i;
 
@@ -758,7 +753,7 @@ static void check_stat_line(char *line)
 		stat_content[i] = para_strdup(line);
 		print_stat_item(i);
 	}
-	return;
+	return 1;
 }
 
 /*
@@ -875,7 +870,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:
@@ -907,7 +902,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 {
@@ -933,7 +928,8 @@ check_return:
 		if (cp_numread <= 0 && !cbo) /* command complete */
 			return 0;
 		if (cbo)
-			cbo = for_each_line(command_buf, cbo, &add_output_line);
+			cbo = for_each_line(command_buf, cbo,
+				&add_output_line, NULL);
 		if (cp_numread <= 0)
 			cbo = 0;
 		wrefresh(bot.win);
@@ -1160,6 +1156,12 @@ static void com_ll_incr(void)
 static void com_reread_conf(void)
 {
 	char *cf =configfile_exists();
+	struct gui_cmdline_parser_params params = {
+		.override = 1,
+		.initialize = 1,
+		.check_required = 0,
+		.check_ambiguity = 0
+	};
 
 	if (!cf) {
 		PARA_WARNING_LOG("%s", "there is no configuration to read");
@@ -1167,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);
+	gui_cmdline_parser_config_file(cf, &conf, &params);
 	PARA_NOTICE_LOG("%s", "config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1342,8 +1344,15 @@ int main(int argc, char *argv[])
 			conf.config_file_arg);
 		exit(EXIT_FAILURE);
 	}
-	if (cf)
-		gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+	if (cf) {
+		struct gui_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		gui_cmdline_parser_config_file(cf, &conf, &params);
+	}
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);