From 6deb6e077fa85a83d5bd4f54f1f416508c77c126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sun, 5 Feb 2017 22:21:44 +0100 Subject: vis: add file argument to vis_pipe --- vis.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vis.c') diff --git a/vis.c b/vis.c index 1f4d9a5..8a26415 100644 --- a/vis.c +++ b/vis.c @@ -1481,13 +1481,13 @@ Regex *vis_regex(Vis *vis, const char *pattern) { return regex; } -int vis_pipe(Vis *vis, Filerange *range, const char *argv[], +int vis_pipe(Vis *vis, File *file, 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)) { /* if an invalid range was given, stdin (i.e. key board input) is passed * through the external command. */ - Text *text = vis->win->file->text; + Text *text = file->text; int pin[2], pout[2], perr[2], status = -1; bool interactive = !text_range_valid(range); Filerange rout = interactive ? text_range_new(0, 0) : *range; @@ -1547,6 +1547,7 @@ int vis_pipe(Vis *vis, Filerange *range, const char *argv[], close(perr[0]); close(perr[1]); close(null); + if (!argv[1]) execlp(vis->shell, vis->shell, "-c", argv[0], (char*)NULL); else @@ -1666,7 +1667,7 @@ int vis_pipe_collect(Vis *vis, Filerange *range, const char *argv[], char **out, Buffer bufout, buferr; buffer_init(&bufout); buffer_init(&buferr); - int status = vis_pipe(vis, range, argv, + int status = vis_pipe(vis, vis->win->file, range, argv, &bufout, out ? read_buffer : NULL, &buferr, err ? read_buffer : NULL); buffer_terminate(&bufout); -- cgit v1.2.3