index 5318fdd81f932e3f98c78402c3b3acb60a120f51..5e75b5acd83a6cb1c3c3c2a00c31c6428962cd76 100644 (file)
--- a/tig.c
+++ b/tig.c
}
BUFPUT('\'');
}
BUFPUT('\'');
+ if (bufsize < SIZEOF_STR)
+ buf[bufsize] = 0;
+
return bufsize;
}
return bufsize;
}
}
if (!view_is_displayed(view)) {
}
if (!view_is_displayed(view)) {
- view->offset += steps;
+ view->offset += scroll_steps;
+ assert(0 <= view->offset && view->offset < view->lines);
view->ops->select(view, &view->line[view->lineno]);
return;
}
view->ops->select(view, &view->line[view->lineno]);
return;
}
} else if (view == VIEW(REQ_VIEW_TREE)) {
const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
} else if (view == VIEW(REQ_VIEW_TREE)) {
const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+ char path[SIZEOF_STR];
if (strcmp(view->vid, view->id))
if (strcmp(view->vid, view->id))
- opt_path[0] = 0;
+ opt_path[0] = path[0] = 0;
+ else if (sq_quote(path, 0, opt_path) >= sizeof(path))
+ return FALSE;
- if (!string_format(view->cmd, format, id, opt_path))
+ if (!string_format(view->cmd, format, id, path))
return FALSE;
} else {
return FALSE;
} else {
return FALSE;
}
return FALSE;
}
+static struct line *
+add_line_text(struct view *view, char *data, enum line_type type)
+{
+ struct line *line = &view->line[view->lines];
+
+ if (!data)
+ return NULL;
+
+ line->data = strdup(data);
+ if (!line->data)
+ return NULL;
+
+ line->type = type;
+ view->lines++;
+
+ return line;
+}
+
/*
* View opening
/*
* View opening
return;
}
return;
}
- view->ops->read(view, "Quick reference for tig keybindings:");
+ add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
for (i = 0; i < ARRAY_SIZE(req_info); i++) {
char *key;
if (!req_info[i].request) {
for (i = 0; i < ARRAY_SIZE(req_info); i++) {
char *key;
if (!req_info[i].request) {
- view->ops->read(view, "");
- view->ops->read(view, req_info[i].help);
+ add_line_text(view, "", LINE_DEFAULT);
+ add_line_text(view, req_info[i].help, LINE_DEFAULT);
continue;
}
continue;
}
if (!string_format(buf, "%-25s %s", key, req_info[i].help))
continue;
if (!string_format(buf, "%-25s %s", key, req_info[i].help))
continue;
- view->ops->read(view, buf);
+ add_line_text(view, buf, LINE_DEFAULT);
}
}
}
}
if (!realloc_lines(view, view->line_size + 1))
return;
if (!realloc_lines(view, view->line_size + 1))
return;
- line = &view->line[view->lines];
- line->data = strdup(buf);
- if (!line->data)
- return;
-
- line->type = LINE_PP_REFS;
- view->lines++;
+ add_line_text(view, buf, LINE_PP_REFS);
}
static bool
pager_read(struct view *view, char *data)
{
}
static bool
pager_read(struct view *view, char *data)
{
- struct line *line = &view->line[view->lines];
+ struct line *line;
if (!data)
return TRUE;
if (!data)
return TRUE;
- line->data = strdup(data);
- if (!line->data)
+ line = add_line_text(view, data, get_line_type(data));
+ if (!line)
return FALSE;
return FALSE;
- line->type = get_line_type(line->data);
- view->lines++;
-
if (line->type == LINE_COMMIT &&
(view == VIEW(REQ_VIEW_DIFF) ||
view == VIEW(REQ_VIEW_LOG)))
if (line->type == LINE_COMMIT &&
(view == VIEW(REQ_VIEW_DIFF) ||
view == VIEW(REQ_VIEW_LOG)))
if (first_read) {
/* Add path info line */
if (first_read) {
/* Add path info line */
- if (string_format(buf, "Directory path /%s", opt_path) &&
- realloc_lines(view, view->line_size + 1) &&
- pager_read(view, buf))
- view->line[view->lines - 1].type = LINE_DEFAULT;
- else
+ if (!string_format(buf, "Directory path /%s", opt_path) ||
+ !realloc_lines(view, view->line_size + 1) ||
+ !add_line_text(view, buf, LINE_DEFAULT))
return FALSE;
/* Insert "link" to parent directory. */
return FALSE;
/* Insert "link" to parent directory. */
- if (*opt_path &&
- string_format(buf, TREE_UP_FORMAT, view->ref) &&
- realloc_lines(view, view->line_size + 1) &&
- pager_read(view, buf))
- view->line[view->lines - 1].type = LINE_TREE_DIR;
- else if (*opt_path)
- return FALSE;
+ if (*opt_path) {
+ if (!string_format(buf, TREE_UP_FORMAT, view->ref) ||
+ !realloc_lines(view, view->line_size + 1) ||
+ !add_line_text(view, buf, LINE_TREE_DIR))
+ return FALSE;
+ }
}
/* Strip the path part ... */
}
/* Strip the path part ... */
return TRUE;
}
return TRUE;
}
- if (!pager_read(view, text))
+ if (!add_line_text(view, text, type))
return FALSE;
/* Move the current line to the first tree entry. */
if (first_read)
view->lineno++;
return FALSE;
/* Move the current line to the first tree entry. */
if (first_read)
view->lineno++;
- view->line[view->lines - 1].type = type;
return TRUE;
}
return TRUE;
}
static bool
blob_read(struct view *view, char *line)
{
static bool
blob_read(struct view *view, char *line)
{
- bool state = pager_read(view, line);
-
- if (state == TRUE)
- view->line[view->lines - 1].type = LINE_DEFAULT;
-
- return state;
+ return add_line_text(view, line, LINE_DEFAULT);
}
static struct view_ops blob_ops = {
}
static struct view_ops blob_ops = {