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 --- register.c | 8 +++++--- sam.c | 4 ++-- vis-cmds.c | 3 ++- vis.c | 7 ++++--- vis.h | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/register.c b/register.c index 4e65403..2b188b2 100644 --- a/register.c +++ b/register.c @@ -1,7 +1,7 @@ #include #include -#include "vis.h" +#include "vis-core.h" #include "text.h" #include "util.h" #include "register.h" @@ -29,7 +29,8 @@ const char *register_get(Vis *vis, Register *reg, size_t *len) { buffer_init(&buferr); buffer_clear(®->buf); - int status = vis_pipe(vis, &(Filerange){ .start = 0, .end = 0 }, + int status = vis_pipe(vis, vis->win->file, + &(Filerange){ .start = 0, .end = 0 }, (const char*[]){ VIS_CLIPBOARD, "--paste", NULL }, ®->buf, read_buffer, &buferr, read_buffer); @@ -70,7 +71,8 @@ bool register_put_range(Vis *vis, Register *reg, Text *txt, Filerange *range) { Buffer buferr; buffer_init(&buferr); - int status = vis_pipe(vis, range, (const char*[]){ VIS_CLIPBOARD, "--copy", NULL }, + int status = vis_pipe(vis, vis->win->file, range, + (const char*[]){ VIS_CLIPBOARD, "--copy", NULL }, NULL, NULL, &buferr, read_buffer); if (status != 0) diff --git a/sam.c b/sam.c index 21e56b2..7a762f3 100644 --- a/sam.c +++ b/sam.c @@ -1580,7 +1580,7 @@ static bool cmd_filter(Vis *vis, Win *win, Command *cmd, const char *argv[], Cur buffer_init(&bufout); buffer_init(&buferr); - int status = vis_pipe(vis, range, &argv[1], &bufout, read_buffer, &buferr, read_buffer); + int status = vis_pipe(vis, win->file, range, &argv[1], &bufout, read_buffer, &buferr, read_buffer); if (vis->cancel_filter) { vis_info_show(vis, "Command cancelled"); @@ -1618,7 +1618,7 @@ static bool cmd_pipeout(Vis *vis, Win *win, Command *cmd, const char *argv[], Cu Buffer buferr; buffer_init(&buferr); - int status = vis_pipe(vis, range, (const char*[]){ argv[1], NULL }, NULL, NULL, &buferr, read_buffer); + int status = vis_pipe(vis, win->file, range, (const char*[]){ argv[1], NULL }, NULL, NULL, &buferr, read_buffer); if (status == 0 && cur) view_cursors_to(cur, range->start); diff --git a/vis-cmds.c b/vis-cmds.c index fc823c8..5f410fe 100644 --- a/vis-cmds.c +++ b/vis-cmds.c @@ -330,7 +330,8 @@ static const char *file_open_dialog(Vis *vis, const char *pattern) { return NULL; Filerange empty = text_range_new(0,0); - int status = vis_pipe(vis, &empty, (const char*[]){ buffer_content0(&bufcmd), NULL }, + int status = vis_pipe(vis, vis->win->file, &empty, + (const char*[]){ buffer_content0(&bufcmd), NULL }, &bufout, read_buffer, &buferr, read_buffer); if (status == 0) 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); diff --git a/vis.h b/vis.h index 6ea3d1d..5f5ad94 100644 --- a/vis.h +++ b/vis.h @@ -488,7 +488,7 @@ 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, const char *argv[], +int vis_pipe(Vis*, File*, Filerange*, 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)); -- cgit v1.2.3