X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/f3c99cf1cee25ae95ffea6188b40734e877bce20..681fdc45473143de3f3c5f69fbc7b94f5d6b0b75:/ui-tree.c diff --git a/ui-tree.c b/ui-tree.c index 4bf372a..553dbaa 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -6,6 +6,7 @@ * (see COPYING for full license text) */ +#include #include "cgit.h" #include "html.h" #include "ui-shared.h" @@ -14,12 +15,61 @@ char *curr_rev; char *match_path; int header = 0; +static void print_text_buffer(char *buf, unsigned long size) +{ + unsigned long lineno, idx; + const char *numberfmt = + "%1$d\n"; + + html("\n"); + html("\n"); + html("
");
+	idx = 0;
+	lineno = 0;
+
+	if (size) {
+		htmlf(numberfmt, ++lineno);
+		while(idx < size - 1) { // skip absolute last newline
+			if (buf[idx] == '\n')
+				htmlf(numberfmt, ++lineno);
+			idx++;
+		}
+	}
+	html("
");
+	html_txt(buf);
+	html("
\n"); +} + +#define ROWLEN 32 + +static void print_binary_buffer(char *buf, unsigned long size) +{ + unsigned long ofs, idx; + static char ascii[ROWLEN + 1]; + + html("\n"); + html(""); + for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) { + htmlf("\n"); + } + html("
ofshex dumpascii
%04x", ofs); + for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) + htmlf("%*s%02x", + idx == 16 ? 4 : 1, "", + buf[idx] & 0xff); + html(" "); + for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) + ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; + ascii[idx] = '\0'; + html_txt(ascii); + html("
\n"); +} + static void print_object(const unsigned char *sha1, char *path) { enum object_type type; char *buf; - unsigned long size, lineno, start, idx; - const char *linefmt = "%1$d"; + unsigned long size; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -38,28 +88,12 @@ static void print_object(const unsigned char *sha1, char *path) html(" ("); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, curr_rev, path); - htmlf(")
blob: %s", sha1_to_hex(sha1)); + htmlf(")
blob: %s\n", sha1_to_hex(sha1)); - html("\n"); - idx = 0; - start = 0; - lineno = 0; - while(idx < size) { - if (buf[idx] == '\n') { - buf[idx] = '\0'; - htmlf(linefmt, ++lineno); - html_txt(buf + start); - html("\n"); - start = idx + 1; - } - idx++; - } - if (start < idx) { - htmlf(linefmt, ++lineno); - html_txt(buf + start); - } - html("\n"); - html("
\n"); + if (buffer_is_binary(buf, size)) + print_binary_buffer(buf, size); + else + print_text_buffer(buf, size); } @@ -108,7 +142,10 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, html(""); cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, - fullpath, 0, NULL, NULL); + fullpath, 0, NULL, NULL, ctx.qry.showmsg); + if (ctx.repo->max_stats) + cgit_stats_link("stats", NULL, "button", ctx.qry.head, + fullpath); html("\n"); free(name); return 0;