X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=cd5fa8a81a4878aaf5c65342432a76888ff517f9;hb=c31982b09dda5aa556455e13ee5aa1adf66e9da4;hp=dda5f84e5184b398a10652bd45ddda941e3a703e;hpb=56561c08cf6cfe28bccebc513bcec057d8bb9afa;p=paraslash.git

diff --git a/interactive.c b/interactive.c
index dda5f84e..cd5fa8a8 100644
--- a/interactive.c
+++ b/interactive.c
@@ -27,6 +27,7 @@
 struct i9e_private {
 	struct i9e_client_info *ici;
 	FILE *stderr_stream;
+	int num_columns;
 	char empty_line[1000];
 	struct task task;
 	struct btr_node *stdout_btrn;
@@ -37,6 +38,20 @@ struct i9e_private {
 };
 static struct i9e_private i9e_private, *i9ep = &i9e_private;
 
+/**
+ * Return the error state of the i9e task.
+ *
+ * This is mainly useful for other tasks to tell whether the i9e task is still
+ * running.
+ *
+ * \return A negative return value of zero means the i9e task terminated. Only
+ * in this case it is safe to call ie9_close().
+ */
+int i9e_get_error(void)
+{
+	return i9ep->task.error;
+}
+
 static bool is_prefix(const char *partial, const char *full, size_t len)
 {
 	if (len == 0)
@@ -186,7 +201,26 @@ void i9e_attach_to_stdout(struct btr_node *producer)
 
 static void wipe_bottom_line(void)
 {
-	fprintf(i9ep->stderr_stream, "\r%s\r", i9ep->empty_line);
+	char x[] = "          ";
+	int n = i9ep->num_columns;
+
+	/*
+	 * For reasons beyond my understanding, writing more than 68 characters
+	 * here causes MacOS to mess up the terminal. Writing a line of spaces
+	 * in smaller chunks works fine though. Weird.
+	 */
+	fprintf(i9ep->stderr_stream, "\r");
+	while (n > 0) {
+		if (n >= sizeof(x)) {
+			fprintf(i9ep->stderr_stream, "%s", x);
+			n -= sizeof(x);
+			continue;
+		}
+		x[n] = '\0';
+		fprintf(i9ep->stderr_stream, "%s", x);
+		break;
+	}
+	fprintf(i9ep->stderr_stream, "\r");
 }
 
 /**
@@ -339,14 +373,15 @@ static void update_winsize(void)
 {
 	struct winsize w;
 	int ret = ioctl(i9ep->ici->fds[2], TIOCGWINSZ, (char *)&w);
-	int num_columns = 80;
 
 	if (ret >= 0) {
 		assert(w.ws_col < sizeof(i9ep->empty_line));
-		num_columns = w.ws_col;
-	}
-	memset(i9ep->empty_line, ' ', num_columns);
-	i9ep->empty_line[num_columns] = '\0';
+		i9ep->num_columns = w.ws_col;
+	} else
+		i9ep->num_columns = 80;
+
+	memset(i9ep->empty_line, ' ', i9ep->num_columns);
+	i9ep->empty_line[i9ep->num_columns] = '\0';
 }
 
 /**
@@ -431,6 +466,8 @@ __printf_2_3 void i9e_log(int ll, const char* fmt,...)
  */
 void i9e_signal_dispatch(int sig_num)
 {
+	if (sig_num == SIGWINCH)
+		return update_winsize();
 	if (sig_num == SIGINT) {
 		fprintf(i9ep->stderr_stream, "\n");
 		rl_replace_line ("", false /* clear_undo */);