author | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 22:00:06 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 22:05:59 (UTC) |
commit | ff7a39488adbee9cb57bf4549efd60e6b7d4fc1a (patch) (side-by-side diff) | |
tree | 20dd27ce96d8b7b84e0da84b0cca94a7e17ea11c | |
parent | 63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3 (diff) | |
download | cgit-ff7a39488adbee9cb57bf4549efd60e6b7d4fc1a.zip cgit-ff7a39488adbee9cb57bf4549efd60e6b7d4fc1a.tar.gz cgit-ff7a39488adbee9cb57bf4549efd60e6b7d4fc1a.tar.bz2 |
ui-tree: show last line of blob
The last line in a blob was never printed by ui-tree::print_object(), which
was particularly annoying when the blob missed a final newline. This fixes
the issue.
Noticed-by: <mkraai@beckman.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,77 +1,80 @@ /* ui-tree.c: functions for tree output * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" char *curr_rev; char *match_path; int header = 0; static void print_object(const unsigned char *sha1, char *path) { enum object_type type; unsigned char *buf; unsigned long size, lineno, start, idx; + const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha1))); return; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { cgit_print_error(fmt("Error reading object %s", sha1_to_hex(sha1))); return; } html(" blob: <a href='"); html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); htmlf("'>%s</a>",sha1_to_hex(sha1)); html("<table class='blob'>\n"); idx = 0; start = 0; lineno = 0; while(idx < size) { if (buf[idx] == '\n') { buf[idx] = '\0'; - htmlf("<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>", - ++lineno); + htmlf(linefmt, ++lineno); html_txt(buf + start); html("</td></tr>\n"); start = idx + 1; } idx++; } + htmlf(linefmt, ++lineno); + html_txt(buf + start); + html("</td></tr>\n"); html("</table>\n"); } static int ls_item(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned int mode, int stage) { char *name; char *fullpath; enum object_type type; unsigned long size = 0; name = xstrdup(pathname); fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", cgit_query_path ? "/" : "", name); type = sha1_object_info(sha1, &size); if (type == OBJ_BAD && !S_ISGITLINK(mode)) { htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", name, sha1_to_hex(sha1)); return 0; } |