From ab65ab5d027e97ead372264a6ecfd3ac642299ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Fri, 25 Nov 2016 16:46:38 +0100 Subject: vis: fix I/O redirection bugs, cleanup vis_pipe The `:!` command did redirect stdout to a pipe which was used by `vis-menu` to return the selected entry. However, this breaks other interactive commands such as `:!/bin/sh` where command output was never displayed. Instead we modified `vis-menu` to re-open /dev/tty for its user interface which makes it work as a regular filter `:|` This patch also obsoletes the interactive flag previously passed to the vis_pipe function. Interactive mode is instead enabled by piping an invalid range. --- vis.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vis.h') diff --git a/vis.h b/vis.h index 9d6ba4d..75c3fe0 100644 --- a/vis.h +++ b/vis.h @@ -445,9 +445,9 @@ bool vis_prompt_cmd(Vis*, const char *cmd); /* pipe a given file range to an external process * - * in interactive mode stdin and stderr are not redirected, hence they - * can be used to read keyboard input and draw a user interface on top - * of vis. Attempting to pipe an invalid range enables interactive mode. + * if the range is invalid 'interactive' mode is enabled, meaning that + * stdin and stderr are passed through the underlying command, stdout + * points to vis' stderr. * * if argv contains only one non-NULL element the command is executed using * /bin/sh -c (i.e. argument expansion is performed by the shell). In contrast @@ -457,14 +457,14 @@ bool vis_prompt_cmd(Vis*, const char *cmd); * if read_std{out,err} are non-NULL they will be called when output from * the forked process is available. */ -int vis_pipe(Vis *vis, Filerange *range, bool interactive, const char *argv[], +int vis_pipe(Vis *vis, Filerange *range, const char *argv[], void *stdout_context, ssize_t (*read_stdout)(void *stdout_context, char *data, size_t len), void *stderr_context, ssize_t (*read_stderr)(void *stderr_context, char *data, size_t len)); /* pipe a range to an external application, return its exit status and store * everything that is written to stdout/stderr in the gitven char pointers * which have to be free(3)-ed by the caller */ -int vis_pipe_collect(Vis *vis, Filerange *range, bool interactive, const char *argv[], char **out, char **err); +int vis_pipe_collect(Vis *vis, Filerange *range, const char *argv[], char **out, char **err); /* given the start of a key, returns a pointer to the start of the one immediately * following as will be processed by the input system. skips over special keys -- cgit v1.2.3