X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=6806cc8fcc662435cf53a3c01a7b1f6b4607386f;hp=0a8f081839b97f6b0aaaac7ce3cc9e3d2bc049d1;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/gui.c b/gui.c
index 0a8f0818..6806cc8f 100644
--- a/gui.c
+++ b/gui.c
@@ -203,24 +203,6 @@ static int para_open_audiod_pipe(char *cmd)
 	return ret;
 }
 
-static int read_audiod_pipe(int fd, line_handler_t *line_handler)
-{
-	static char buf[4096];
-	const ssize_t bufsize = sizeof(buf) - 1;
-	static ssize_t loaded;
-	ssize_t ret;
-
-	if (loaded >= bufsize)
-		loaded = 0;
-	ret = read(fd, buf + loaded, bufsize - loaded);
-	if (ret > 0) {
-		loaded += ret;
-		buf[loaded] = '\0';
-		loaded = for_each_line(buf, loaded, line_handler, NULL);
-	}
-	return ret;
-}
-
 static int find_cmd_byname(char *name)
 {
 	int i;
@@ -521,13 +503,12 @@ static void setup_signal_handling(void)
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGWINCH);
 	para_install_sighandler(SIGUSR1);
-//	signal(SIGPIPE, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
+	para_sigaction(SIGHUP, SIG_IGN);
 }
 
 __noreturn static void do_exit(int ret)
 {
-	signal(SIGTERM, SIG_IGN);
+	para_sigaction(SIGTERM, SIG_IGN);
 	kill(0, SIGTERM);
 	exit(ret);
 }
@@ -688,6 +669,36 @@ static void print_stat_item(int i)
 	wrefresh(top.win);
 }
 
+/*
+ * print status line if line starts with known command.
+ */
+static int update_item(int item_num, char *buf)
+{
+	free(stat_content[item_num]);
+	stat_content[item_num] = para_strdup(buf);
+	print_stat_item(item_num);
+	return 1;
+}
+
+static int read_audiod_pipe(int fd)
+{
+	static char buf[8192];
+	static int loaded;
+	int ret;
+
+	if (loaded >= sizeof(buf)) /* overflow */
+		return 0;
+	ret = read(fd, buf + loaded, sizeof(buf) - loaded);
+	if (ret <= 0)
+		return ret;
+	loaded += ret;
+	ret = for_each_stat_item(buf, loaded, update_item);
+	if (ret < 0)
+		return ret;
+	loaded = ret;
+	return 1;
+}
+
 static void print_all_items(void)
 {
 	int i;
@@ -770,26 +781,6 @@ reap_next_child:
 	goto reap_next_child;
 }
 
-/*
- * print status line if line starts with known command.
- */
-static int check_stat_line(char *line, __a_unused void *data)
-{
-	int i;
-
-//	PARA_INFO_LOG("%s: checking: %s\n", __func__, line);
-	i = stat_line_valid(line);
-	if (i >= 0) {
-		line += strlen(status_item_list[i]) + 1;
-		if (*line == ' ')
-			line++;
-		free(stat_content[i]);
-		stat_content[i] = para_strdup(line);
-		print_stat_item(i);
-	}
-	return 1;
-}
-
 /*
  * This sucker modifies its first argument. *handler and *arg are
  * pointers to 0-terminated strings (inside line). Crap.
@@ -860,8 +851,8 @@ static void handle_signal(int sig)
 		return;
 	case SIGINT:
 		PARA_WARNING_LOG("caught SIGINT, reset");
-		/* Nothing to do. SIGINT killed our child, para_client stat.
-		 * This get noticed by do_select which resets everything
+		/* Nothing to do. SIGINT killed our child which gets noticed
+		 * by do_select and resets everything.
 		 */
 		return;
 	case SIGUSR1:
@@ -896,7 +887,7 @@ static int open_audiod_pipe(void)
  * when any key is pressed.
  *
  * EXTERNAL_MODE: Check only signal pipe. Used when an external command
- * is running. During that thime curses is disabled.  Returns when
+ * is running. During that time curses is disabled.  Returns when
  * cmd_pid == 0.
  */
 static int do_select(int mode)
@@ -947,7 +938,7 @@ repeat:
 		}
 	}
 	if (audiod_pipe >= 0 && FD_ISSET(audiod_pipe, &rfds))
-		if (read_audiod_pipe(audiod_pipe, check_stat_line) <= 0) {
+		if (read_audiod_pipe(audiod_pipe) <= 0) {
 			close(audiod_pipe);
 			audiod_pipe = -1;
 			clear_all_items();
@@ -1092,13 +1083,14 @@ static void com_page_up(void)
 {
 	unsigned lines;
 	int fvr = first_visible_rbe(&lines);
+
 	if (fvr < 0 || fvr + 1 >= ringbuffer_filled(bot_win_rb)) {
 		print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
 		return;
 	}
 	scroll_position = fvr + 1;
 	for (; scroll_position > 0; scroll_position--) {
-		fvr = first_visible_rbe(&lines);
+		first_visible_rbe(&lines);
 		if (lines == bot.lines)
 			break;
 	}