index 08ef0b4e14e5e964b46b2ece681720249eab8d4c..f842de567b03108f63dbfe44f3ec7af3bed82a9d 100644 (file)
--- a/tig.c
+++ b/tig.c
for (argc = 0; argv[argc]; argc++)
free((void *) argv[argc]);
+ argv[0] = NULL;
+}
+
+static void
+argv_copy(const char *dst[], const char *src[])
+{
+ int argc;
+
+ for (argc = 0; src[argc]; argc++)
+ dst[argc] = src[argc];
}
io->dir = dir;
}
+static void
+io_prepare(struct io *io, const char *dir, enum io_type type, const char *argv[])
+{
+ io_init(io, dir, type);
+ argv_copy(io->argv, argv);
+}
+
static bool
io_format(struct io *io, const char *dir, enum io_type type,
const char *argv[], enum format_flags flags)
static bool
io_run(struct io *io, const char **argv, const char *dir, enum io_type type)
{
- io_init(io, dir, type);
- if (!format_argv(io->argv, argv, FORMAT_NONE))
- return FALSE;
+ io_prepare(io, dir, type, argv);
return io_start(io);
}
-static int
-io_complete(struct io *io)
+static bool
+io_complete(enum io_type type, const char **argv, const char *dir, int fd)
{
- return io_start(io) && io_done(io);
+ struct io io = {};
+
+ io_prepare(&io, dir, type, argv);
+ io.pipe = fd;
+ return io_start(&io) && io_done(&io);
}
-static int
+static bool
io_run_bg(const char **argv)
{
- struct io io = {};
-
- if (!io_format(&io, NULL, IO_BG, argv, FORMAT_NONE))
- return FALSE;
- return io_complete(&io);
+ return io_complete(IO_BG, argv, NULL, -1);
}
static bool
io_run_fg(const char **argv, const char *dir)
{
- struct io io = {};
-
- if (!io_format(&io, dir, IO_FG, argv, FORMAT_NONE))
- return FALSE;
- return io_complete(&io);
+ return io_complete(IO_FG, argv, dir, -1);
}
static bool
-io_run_append(const char **argv, enum format_flags flags, int fd)
+io_run_append(const char **argv, int fd)
{
- struct io io = {};
-
- if (!io_format(&io, NULL, IO_AP, argv, flags)) {
- close(fd);
- return FALSE;
- }
-
- io.pipe = fd;
- return io_complete(&io);
+ return io_complete(IO_AP, argv, NULL, -1);
}
static bool
-io_run_rd(struct io *io, const char **argv, const char *dir, enum format_flags flags)
+io_run_rd(struct io *io, const char **argv, const char *dir)
{
- return io_format(io, dir, IO_RD, argv, flags) && io_start(io);
+ return io_format(io, dir, IO_RD, argv, FORMAT_NONE) && io_start(io);
}
static bool
{
struct io io = {};
- return io_run_rd(&io, argv, NULL, FORMAT_NONE)
- && io_read_buf(&io, buf, bufsize);
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_start(&io) && io_read_buf(&io, buf, bufsize);
}
static int
{
struct io io = {};
- return io_format(&io, NULL, IO_RD, argv, FORMAT_NONE)
- ? io_load(&io, separators, read_property) : ERR;
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_load(&io, separators, read_property);
}
return TRUE;
}
- if (!io_run_rd(&io, log_file, opt_cdup, FORMAT_NONE)) {
+ if (!io_run_rd(&io, log_file, opt_cdup)) {
report("Failed to load tree data");
return TRUE;
}
if (fd == -1)
report("Failed to create temporary file");
- else if (!io_run_append(blob_argv, FORMAT_NONE, fd))
+ else if (!io_run_append(blob_argv, fd))
report("Failed to save blob data to file");
else
open_editor(file);
};
if (!string_format(path, "%s:%s", opt_ref, opt_file) ||
- !io_run_rd(&view->io, blame_cat_file_argv, opt_cdup, FORMAT_NONE))
+ !io_run_rd(&view->io, blame_cat_file_argv, opt_cdup))
return FALSE;
}
if (view->lines == 0 && !view->prev)
die("No blame exist for %s", view->vid);
- if (view->lines == 0 || !io_run_rd(&io, blame_argv, opt_cdup, FORMAT_NONE)) {
+ if (view->lines == 0 || !io_run_rd(&io, blame_argv, opt_cdup)) {
report("Failed to load blame data");
return TRUE;
}
"--simplify-by-decoration", "--all", NULL
};
- if (!io_run_rd(&view->io, branch_log, NULL, FORMAT_NONE)) {
+ if (!io_run_rd(&view->io, branch_log, NULL)) {
report("Failed to load branch data");
return TRUE;
}