X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=12fcfe15440526b224b2f01a9f4bfe753e2edbd1;hp=64ee9202fc56309769609c3869738a3e8fd5ec65;hb=d46813b8c741782c07d6741c261d0575a8de00dd;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0 diff --git a/interactive.c b/interactive.c index 64ee9202..12fcfe15 100644 --- a/interactive.c +++ b/interactive.c @@ -292,7 +292,7 @@ static void i9e_post_select(struct sched *s, struct task *t) sz = btr_next_buffer(btrn, &buf); if (sz == 0) goto out; - ret = write_nonblock(ici->fds[1], buf, sz); + ret = xwrite(ici->fds[1], buf, sz); if (ret < 0) goto rm_btrn; btr_consume(btrn, ret); @@ -334,7 +334,6 @@ static void i9e_pre_select(struct sched *s, __a_unused struct task *t) PARA_WARNING_LOG("set to nonblock failed: (fd0 %d, %s)\n", i9ep->ici->fds[0], para_strerror(-ret)); para_fd_set(i9ep->ici->fds[0], &s->rfds, &s->max_fileno); - return; } static void update_winsize(void) @@ -382,6 +381,7 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s) rl_attempted_completion_function = i9e_completer; i9ep->ici = ici; i9ep->stderr_stream = fdopen(ici->fds[2], "w"); + setvbuf(i9ep->stderr_stream, NULL, _IONBF, 0); if (ici->history_file) read_history(ici->history_file); @@ -481,7 +481,7 @@ int i9e_select(int n, fd_set *readfds, fd_set *writefds, * This function is independent of readline and may be called before * i9e_open(). * - * return The number of possible completions. + * \return The number of possible completions. */ int i9e_extract_completions(const char *word, char **string_list, char ***result)