![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1bf95cda407dbcc43715223558e0c38fa20cdda3..77e1d8183372669bc1fed7fda0cbb97ada649417 100644 (file)
--- a/tig.c
+++ b/tig.c
static void foreach_ref(bool (*visitor)(void *data, const struct ref *ref), void *data);
static int load_refs(void);
-enum format_flags {
- FORMAT_ALL, /* Perform replacement in all arguments. */
- FORMAT_NONE /* No replacement should be performed. */
-};
-
-static bool format_argv(const char *dst[], const char *src[], enum format_flags flags);
-
enum input_status {
INPUT_OK,
INPUT_SKIP,
}
static bool
-argv_copy(const char *dst[], const char *src[], bool allocate)
+argv_copy(const char *dst[], const char *src[])
{
int argc;
for (argc = 0; src[argc]; argc++)
- if (!(dst[argc] = allocate ? strdup(src[argc]) : src[argc]))
+ if (!(dst[argc] = strdup(src[argc])))
return FALSE;
return TRUE;
}
};
struct io {
- enum io_type type; /* The requested type of pipe. */
- const char *dir; /* Directory from which to execute. */
- pid_t pid; /* PID of spawned process. */
int pipe; /* Pipe end for reading or writing. */
+ pid_t pid; /* PID of spawned process. */
int error; /* Error status. */
- const char *argv[SIZEOF_ARG]; /* Shell command arguments. */
char *buf; /* Read buffer. */
size_t bufalloc; /* Allocated buffer size. */
size_t bufsize; /* Buffer content size. */
};
static void
-io_reset(struct io *io)
+io_init(struct io *io)
{
+ memset(io, 0, sizeof(*io));
io->pipe = -1;
- io->pid = 0;
- io->buf = io->bufpos = NULL;
- io->bufalloc = io->bufsize = 0;
- io->error = 0;
- io->eof = 0;
-}
-
-static void
-io_init(struct io *io, const char *dir, enum io_type type)
-{
- io_reset(io);
- io->type = type;
- 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, FALSE);
-}
-
-static bool
-io_format(struct io *io, const char *dir, enum io_type type,
- const char *argv[], enum format_flags flags)
-{
- io_init(io, dir, type);
- return format_argv(io->argv, argv, flags);
}
static bool
bool fits;
va_list args;
- io_init(io, NULL, IO_FD);
+ io_init(io);
va_start(args, fmt);
fits = vsnprintf(name, sizeof(name), fmt, args) < sizeof(name);
if (io->pipe != -1)
close(io->pipe);
free(io->buf);
- io_reset(io);
+ io_init(io);
while (pid > 0) {
int status;
}
static bool
-io_start(struct io *io)
+io_run(struct io *io, enum io_type type, const char *dir, const char *argv[], ...)
{
int pipefds[2] = { -1, -1 };
+ va_list args;
- if (io->type == IO_FD)
- return TRUE;
+ io_init(io);
- if ((io->type == IO_RD || io->type == IO_WR) && pipe(pipefds) < 0) {
+ if ((type == IO_RD || type == IO_WR) && pipe(pipefds) < 0) {
io->error = errno;
return FALSE;
- } else if (io->type == IO_AP) {
- pipefds[1] = io->pipe;
+ } else if (type == IO_AP) {
+ va_start(args, argv);
+ pipefds[1] = va_arg(args, int);
+ va_end(args);
}
if ((io->pid = fork())) {
if (io->pid == -1)
io->error = errno;
- if (pipefds[!(io->type == IO_WR)] != -1)
- close(pipefds[!(io->type == IO_WR)]);
+ if (pipefds[!(type == IO_WR)] != -1)
+ close(pipefds[!(type == IO_WR)]);
if (io->pid != -1) {
- io->pipe = pipefds[!!(io->type == IO_WR)];
+ io->pipe = pipefds[!!(type == IO_WR)];
return TRUE;
}
} else {
- if (io->type != IO_FG) {
+ if (type != IO_FG) {
int devnull = open("/dev/null", O_RDWR);
- int readfd = io->type == IO_WR ? pipefds[0] : devnull;
- int writefd = (io->type == IO_RD || io->type == IO_AP)
+ int readfd = type == IO_WR ? pipefds[0] : devnull;
+ int writefd = (type == IO_RD || type == IO_AP)
? pipefds[1] : devnull;
dup2(readfd, STDIN_FILENO);
close(pipefds[1]);
}
- if (io->dir && *io->dir && chdir(io->dir) == -1)
+ if (dir && *dir && chdir(dir) == -1)
exit(errno);
- execvp(io->argv[0], (char *const*) io->argv);
+ execvp(argv[0], (char *const*) argv);
exit(errno);
}
- if (pipefds[!!(io->type == IO_WR)] != -1)
- close(pipefds[!!(io->type == IO_WR)]);
+ if (pipefds[!!(type == IO_WR)] != -1)
+ close(pipefds[!!(type == IO_WR)]);
return FALSE;
}
-static bool
-io_run(struct io *io, const char **argv, const char *dir, enum io_type type)
-{
- io_prepare(io, dir, type, argv);
- return io_start(io);
-}
-
static bool
io_complete(enum io_type type, const char **argv, const char *dir, int fd)
{
- struct io io = {};
+ struct io io;
- io_prepare(&io, dir, type, argv);
- io.pipe = fd;
- return io_start(&io) && io_done(&io);
+ return io_run(&io, type, dir, argv, fd) && io_done(&io);
}
static bool
static bool
io_run_append(const char **argv, int fd)
{
- return io_complete(IO_AP, argv, NULL, -1);
+ return io_complete(IO_AP, argv, NULL, fd);
}
static bool
static bool
io_run_buf(const char **argv, char buf[], size_t bufsize)
{
- struct io io = {};
+ struct io io;
- io_prepare(&io, NULL, IO_RD, argv);
- return io_start(&io) && io_read_buf(&io, buf, bufsize);
+ return io_run(&io, IO_RD, NULL, argv) && io_read_buf(&io, buf, bufsize);
}
static int
char *name;
int state = OK;
- if (!io_start(io))
- return ERR;
-
while (state == OK && (name = io_get(io, '\n', TRUE))) {
char *value;
size_t namelen;
io_run_load(const char **argv, const char *separators,
int (*read_property)(char *, size_t, char *, size_t))
{
- struct io io = {};
+ struct io io;
- io_prepare(&io, NULL, IO_RD, argv);
+ if (!io_run(&io, IO_RD, NULL, argv))
+ return ERR;
return io_load(&io, separators, read_property);
}
req->key = key;
req->argv[0] = NULL;
- if (!argv_copy(req->argv, argv, TRUE))
+ if (!argv_copy(req->argv, argv))
return REQ_NONE;
return REQ_NONE + ++run_requests;
static void
load_option_file(const char *path)
{
- struct io io = {};
+ struct io io;
/* It's OK that the file doesn't exist. */
if (!io_open(&io, "%s", path))
bool has_scrolled; /* View was scrolled. */
/* Loading */
+ const char *argv[SIZEOF_ARG]; /* Shell command arguments. */
+ const char *dir; /* Directory from which to execute. */
struct io io;
struct io *pipe;
time_t start_time;
}
static bool
-format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags flags)
+format_argv(const char *dst_argv[], const char *src_argv[], bool replace)
{
char buf[SIZEOF_STR];
int argc;
- bool noreplace = flags == FORMAT_NONE;
argv_free(dst_argv);
@@ -3204,7 +3158,7 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
int len = next - arg;
const char *value;
- if (!next || noreplace) {
+ if (!next || !replace) {
len = strlen(arg);
value = "";
@@ -3219,7 +3173,7 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
if (!string_format_from(buf, &bufpos, "%.*s%s", len, arg, value))
return FALSE;
- arg = next && !noreplace ? strchr(next, ')') + 1 : NULL;
+ arg = next && replace ? strchr(next, ')') + 1 : NULL;
}
dst_argv[argc] = strdup(buf);
view->start_time = time(NULL);
}
+static bool
+prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
+{
+ view->dir = dir;
+ return format_argv(view->argv, argv, replace);
+}
+
static bool
prepare_update(struct view *view, const char *argv[], const char *dir)
{
if (view->pipe)
end_update(view, TRUE);
- return io_format(&view->io, dir, IO_RD, argv, FORMAT_NONE);
+ return prepare_io(view, dir, argv, FALSE);
}
static bool
{
if (view->pipe)
io_done(view->pipe);
- return io_format(&view->io, dir, IO_RD, argv, FORMAT_NONE) &&
- io_start(&view->io);
+ return prepare_io(view, dir, argv, FALSE) &&
+ io_run(&view->io, IO_RD, dir, view->argv);
}
static bool
{
if (view->pipe)
end_update(view, TRUE);
+ argv_free(view->argv);
return io_open(&view->io, "%s/%s", opt_cdup[0] ? opt_cdup : ".", name);
}
if (view->ops->prepare) {
if (!view->ops->prepare(view))
return FALSE;
- } else if (!io_format(&view->io, NULL, IO_RD, view->ops->argv, FORMAT_ALL)) {
+ } else if (!prepare_io(view, NULL, view->ops->argv, TRUE)) {
return FALSE;
}
string_copy_rev(view->ref, view->id);
}
- if (!io_start(&view->io))
+ if (view->argv[0] && !io_run(&view->io, IO_RD, view->dir, view->argv))
return FALSE;
setup_update(view, view->id);
return;
}
- if (format_argv(argv, req->argv, FORMAT_ALL))
+ if (format_argv(argv, req->argv, TRUE))
open_external_viewer(argv, NULL);
argv_free(argv);
}
opt_path[0] = 0;
}
- return io_format(&view->io, opt_cdup, IO_RD, view->ops->argv, FORMAT_ALL);
+ return prepare_io(view, opt_cdup, view->ops->argv, TRUE);
}
static const char *tree_argv[SIZEOF_ARG] = {
"git", "diff-tree", "-U0", blame->commit->id,
"--", blame->commit->filename, NULL
};
- struct io io = {};
+ struct io io;
int parent_lineno = -1;
int blamed_lineno = -1;
char *line;
- if (!io_run(&io, diff_tree_argv, NULL, IO_RD))
+ if (!io_run(&io, IO_RD, NULL, diff_tree_argv))
return;
while ((line = io_get(&io, '\n', TRUE))) {
@@ -5568,9 +5530,9 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty
{
struct status *unmerged = NULL;
char *buf;
- struct io io = {};
+ struct io io;
- if (!io_run(&io, argv, opt_cdup, IO_RD))
+ if (!io_run(&io, IO_RD, opt_cdup, argv))
return FALSE;
add_line_data(view, NULL, type);
continue;
if (!*opt_head) {
- struct io io = {};
+ struct io io;
if (io_open(&io, "%s/rebase-merge/head-name", opt_git_dir) &&
io_read_buf(&io, buf, sizeof(buf))) {
switch (type) {
case LINE_STAT_STAGED:
- return io_run(io, staged_argv, opt_cdup, IO_WR);
+ return io_run(io, IO_WR, opt_cdup, staged_argv);
case LINE_STAT_UNSTAGED:
case LINE_STAT_UNTRACKED:
- return io_run(io, others_argv, opt_cdup, IO_WR);
+ return io_run(io, IO_WR, opt_cdup, others_argv);
default:
die("line type %d not handled in switch", type);
@@ -6008,7 +5970,7 @@ status_update_write(struct io *io, struct status *status, enum line_type type)
static bool
status_update_file(struct status *status, enum line_type type)
{
- struct io io = {};
+ struct io io;
bool result;
if (!status_update_prepare(&io, type))
status_update_files(struct view *view, struct line *line)
{
char buf[sizeof(view->ref)];
- struct io io = {};
+ struct io io;
bool result = TRUE;
struct line *pos = view->line + view->lines;
int files = 0;
"git", "apply", "--whitespace=nowarn", NULL
};
struct line *diff_hdr;
- struct io io = {};
+ struct io io;
int argc = 3;
diff_hdr = stage_diff_find(view, chunk, LINE_DIFF_HEADER);
apply_argv[argc++] = "-R";
apply_argv[argc++] = "-";
apply_argv[argc++] = NULL;
- if (!io_run(&io, apply_argv, opt_cdup, IO_WR))
+ if (!io_run(&io, IO_WR, opt_cdup, apply_argv))
return FALSE;
if (!stage_diff_write(&io, diff_hdr, chunk) ||