From ae1d4d75b2a2eb3534ff4b3685cc5c0b80007ef7 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 31 Jan 2009 17:45:48 +0100 Subject: ui-tree: show hexdump of binary blobs This teaches ui-tree to detect binary blobs and display them similar to `hexdump -C` (only wider). Signed-off-by: Lars Hjemli --- cgit.css | 19 +++++++++++++++++ ui-tree.c | 71 ++++++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/cgit.css b/cgit.css index 957d5aa..adfc8ae 100644 --- a/cgit.css +++ b/cgit.css @@ -263,6 +263,25 @@ table.blob a.no a:hover { color: black; } +table.bin-blob { + margin-top: 0.5em; + border: solid 1px black; +} + +table.bin-blob th { + font-family: monospace; + white-space: pre; + border: solid 1px #777; + padding: 0.5em 1em; +} + +table.bin-blob td { + font-family: monospace; + white-space: pre; + border-left: solid 1px #777; + padding: 0em 1em; +} + table.nowrap td { white-space: nowrap; } diff --git a/ui-tree.c b/ui-tree.c index c26ba4c..a37a4e5 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,53 @@ 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;
+	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"); +} + +static void print_binary_buffer(char *buf, unsigned long size) +{ + unsigned long ofs, idx; + + html("\n"); + html(""); + for (ofs = 0; ofs < size; ofs += 32, buf += 32) { + htmlf("\n"); + } + html("
ofshex dumpascii
%04x", ofs); + for (idx = 0; idx < 32 && ofs + idx < size; idx++) + htmlf("%*s%02x", + idx == 16 ? 4 : 1, "", + buf[idx] & 0xff); + html(" "); + for (idx = 0; idx < 32 && ofs + idx < size; idx++) + htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.'); + html("
\n"); +} + static void print_object(const unsigned char *sha1, char *path) { enum object_type type; char *buf; - unsigned long size, lineno, idx; - const char *numberfmt = "%1$d\n"; + unsigned long size; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -40,27 +82,10 @@ static void print_object(const unsigned char *sha1, char *path) curr_rev, path); htmlf(")
blob: %s\n", sha1_to_hex(sha1)); - html("\n"); - html("\n"); - - html("\n"); - - html("\n"); - - html("\n"); - html("
");
-	idx = 0;
-	lineno = 0;
-	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"); + if (buffer_is_binary(buf, size)) + print_binary_buffer(buf, size); + else + print_text_buffer(buf, size); } -- cgit