summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-02-12 10:26:14 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-12 10:26:14 (UTC)
commit6063e7b5532481ffaa7a6f080de28547983bbeb7 (patch) (side-by-side diff)
treebd99ed1e42982e2c7ead156918b3c0e03ef54d1f
parent8cc02871230aef457006ac775dd1cca5623516a9 (diff)
downloadcgit-6063e7b5532481ffaa7a6f080de28547983bbeb7.zip
cgit-6063e7b5532481ffaa7a6f080de28547983bbeb7.tar.gz
cgit-6063e7b5532481ffaa7a6f080de28547983bbeb7.tar.bz2
ui-tree: escape ascii-text properly in hexdump view
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-tree.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/ui-tree.c b/ui-tree.c
index a37a4e5..c6159ec 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -37,21 +37,26 @@ static void print_text_buffer(char *buf, unsigned long size)
html("</code></pre></td></tr></table>\n");
}
+#define ROWLEN 32
+
static void print_binary_buffer(char *buf, unsigned long size)
{
unsigned long ofs, idx;
+ static char ascii[ROWLEN + 1];
html("<table summary='blob content' class='bin-blob'>\n");
html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
- for (ofs = 0; ofs < size; ofs += 32, buf += 32) {
+ for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
- for (idx = 0; idx < 32 && ofs + idx < size; idx++)
+ for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
htmlf("%*s%02x",
idx == 16 ? 4 : 1, "",
buf[idx] & 0xff);
html(" </td><td class='hex'>");
- for (idx = 0; idx < 32 && ofs + idx < size; idx++)
- htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.');
+ for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
+ ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
+ ascii[idx] = '\0';
+ html_txt(ascii);
html("</td></tr>\n");
}
html("</table>\n");