X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=e4bd6ba20338cfc951613c4e4dca12160f4da068;hp=44db6c58fda6b4080c0874725c7a9bd4b9f6fbe4;hb=56d75bd90d78cf44cd3984ce2a45627ef5646d38;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7

diff --git a/interactive.c b/interactive.c
index 44db6c58..e4bd6ba2 100644
--- a/interactive.c
+++ b/interactive.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,12 +7,10 @@
 /** \file interactive.c Readline abstraction for interactive sessions. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <curses.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <sys/ioctl.h>
-#include <assert.h>
 #include <signal.h>
 
 #include "para.h"
@@ -29,7 +27,7 @@ struct i9e_private {
 	FILE *stderr_stream;
 	int num_columns;
 	char empty_line[1000];
-	struct task task;
+	struct task *task;
 	struct btr_node *stdout_btrn;
 	bool last_write_was_status;
 	bool line_handler_running;
@@ -52,7 +50,7 @@ static struct i9e_private i9e_private, *i9ep = &i9e_private;
  */
 int i9e_get_error(void)
 {
-	return i9ep->task.error;
+	return task_status(i9ep->task);
 }
 
 static bool is_prefix(const char *partial, const char *full, size_t len)
@@ -227,6 +225,7 @@ static void wipe_bottom_line(void)
 	fprintf(i9ep->stderr_stream, "\r");
 }
 
+#ifndef RL_FREE_KEYMAP_DECLARED
 /**
  * Free all storage associated with a keymap.
  *
@@ -237,6 +236,7 @@ static void wipe_bottom_line(void)
  * \param keymap The keymap to deallocate.
  */
 void rl_free_keymap(Keymap keymap);
+#endif
 
 /**
  * Reset the terminal and save the in-memory command line history.
@@ -272,6 +272,7 @@ static void clear_bottom_line(void)
 	rl_redisplay();
 	wipe_bottom_line(); /* wipe out the prompt */
 	rl_insert_text(text);
+	free(text);
 	rl_point = point;
 }
 
@@ -290,24 +291,28 @@ static bool input_available(void)
 static void i9e_line_handler(char *line)
 {
 	int ret;
+	struct btr_node *dummy;
 
+	if (!line) {
+		i9ep->input_eof = true;
+		return;
+	}
+	if (!*line)
+		goto free_line;
+	rl_set_prompt("");
+	dummy = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "dummy line handler"));
+	i9e_attach_to_stdout(dummy);
 	ret = i9ep->ici->line_handler(line);
 	if (ret < 0)
 		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
-	rl_set_prompt("");
-	if (line) {
-		if (!*line)
-			rl_set_prompt(i9ep->ici->prompt);
-		else
-			add_history(line);
-		free(line);
-	} else {
-		rl_set_prompt("");
-		i9ep->input_eof = true;
-	}
+	add_history(line);
+	btr_remove_node(&dummy);
+free_line:
+	free(line);
 }
 
-static void i9e_post_select(__a_unused struct sched *s, struct task *t)
+static int i9e_post_select(__a_unused struct sched *s, __a_unused void *context)
 {
 	int ret;
 	struct i9e_client_info *ici = i9ep->ici;
@@ -361,10 +366,10 @@ rm_btrn:
 		wipe_bottom_line();
 out:
 	i9ep->caught_sigint = false;
-	t->error = ret;
+	return ret;
 }
 
-static void i9e_pre_select(struct sched *s, __a_unused struct task *t)
+static void i9e_pre_select(struct sched *s, __a_unused void *context)
 {
 	int ret;
 
@@ -432,7 +437,6 @@ static int dispatch_key(__a_unused int count, int key)
  * The caller must allocate and initialize the structure \a ici points to.
  *
  * \return Standard.
- * \sa \ref register_task().
  */
 int i9e_open(struct i9e_client_info *ici, struct sched *s)
 {
@@ -446,10 +450,13 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 	ret = mark_fd_nonblocking(ici->fds[1]);
 	if (ret < 0)
 		return ret;
-	i9ep->task.pre_select = i9e_pre_select;
-	i9ep->task.post_select = i9e_post_select;
-	sprintf(i9ep->task.status, "i9e");
-	register_task(s, &i9ep->task);
+	i9ep->task = task_register(&(struct task_info) {
+		.name = "i9e",
+		.pre_select = i9e_pre_select,
+		.post_select = i9e_post_select,
+		.context = i9ep,
+	}, s);
+
 	rl_readline_name = "para_i9e";
 	rl_basic_word_break_characters = " ";
 	rl_attempted_completion_function = i9e_completer;