X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/f88a5319d887b41b2bcceca6cfb2b6310ff2669d..d42c8a35f25564c6c95500db3a6b0aebcd0a8f22:/tig.c

diff --git a/tig.c b/tig.c
index bd86899..bcff66f 100644
--- a/tig.c
+++ b/tig.c
@@ -145,16 +145,22 @@ set_from_int_map(struct int_map *map, size_t map_size,
  */
 
 static inline void
-string_ncopy(char *dst, const char *src, size_t dstlen)
+string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen)
 {
-	strncpy(dst, src, dstlen - 1);
-	dst[dstlen - 1] = 0;
+	if (srclen > dstlen - 1)
+		srclen = dstlen - 1;
 
+	strncpy(dst, src, srclen);
+	dst[srclen] = 0;
 }
 
-/* Shorthand for safely copying into a fixed buffer. */
+/* Shorthands for safely copying into a fixed buffer. */
+
 #define string_copy(dst, src) \
-	string_ncopy(dst, src, sizeof(dst))
+	string_ncopy_do(dst, sizeof(dst), src, sizeof(dst))
+
+#define string_ncopy(dst, src, srclen) \
+	string_ncopy_do(dst, sizeof(dst), src, srclen)
 
 static char *
 chomp_string(char *name)
@@ -675,7 +681,7 @@ static struct keybinding default_keybindings[] = {
 	{ 'd',		REQ_VIEW_DIFF },
 	{ 'l',		REQ_VIEW_LOG },
 	{ 't',		REQ_VIEW_TREE },
-	{ 'b',		REQ_VIEW_BLOB },
+	{ 'f',		REQ_VIEW_BLOB },
 	{ 'p',		REQ_VIEW_PAGER },
 	{ 'h',		REQ_VIEW_HELP },
 
@@ -1731,8 +1737,7 @@ begin_update(struct view *view)
 		if (strcmp(view->vid, view->id))
 			opt_path[0] = 0;
 
-		if (snprintf(view->cmd, sizeof(view->cmd), format, id, opt_path)
-		    >= sizeof(view->cmd))
+		if (!string_format(view->cmd, format, id, opt_path))
 			return FALSE;
 
 	} else {
@@ -2205,8 +2210,7 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno)
 			string_copy(ref_commit, view->ref);
 
 		} else if (type == LINE_TREE_DIR || type == LINE_TREE_FILE) {
-			strncpy(view->ref, text + STRING_SIZE("100644 blob "), 41);
-			view->ref[40] = 0;
+			string_ncopy(view->ref, text + STRING_SIZE("100644 blob "), 40);
 			string_copy(ref_blob, view->ref);
 		}
 
@@ -2329,10 +2333,14 @@ add_pager_refs(struct view *view, struct line *line)
 
 	if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) {
 try_add_describe_ref:
+		/* Add <tag>-g<commit_id> "fake" reference. */
 		if (!add_describe_ref(buf, &bufpos, commit_id, sep))
 			return;
 	}
 
+	if (bufpos == 0)
+		return;
+
 	if (!realloc_lines(view, view->line_size + 1))
 		return;
 
@@ -2462,7 +2470,7 @@ tree_read(struct view *view, char *text)
 
 	if (first_read) {
 		/* Add path info line */
-		if (snprintf(buf, sizeof(buf), "Directory path /%s", opt_path) < sizeof(buf) &&
+		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;
@@ -2471,7 +2479,7 @@ tree_read(struct view *view, char *text)
 
 		/* Insert "link" to parent directory. */
 		if (*opt_path &&
-		    snprintf(buf, sizeof(buf), TREE_UP_FORMAT, view->ref) < sizeof(buf) &&
+		    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;
@@ -2548,9 +2556,13 @@ tree_enter(struct view *view, struct line *line)
 
 		} else {
 			size_t pathlen = strlen(opt_path);
+			size_t origlen = pathlen;
 			char *basename = data + SIZEOF_TREE_ATTR;
 
-			string_format_from(opt_path, &pathlen, "%s/", basename);
+			if (string_format_from(opt_path, &pathlen, "%s/", basename)) {
+				opt_path[origlen] = 0;
+				return TRUE;
+			}
 		}
 
 		/* Trees and subtrees share the same ID, so they are not not