ui-tree: escape ascii-text properly in hexdump view

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2009-02-12 11:26:14 +01:00
parent 8cc0287123
commit 6063e7b553

View File

@ -37,21 +37,26 @@ static void print_text_buffer(char *buf, unsigned long size)
html("</code></pre></td></tr></table>\n"); html("</code></pre></td></tr></table>\n");
} }
#define ROWLEN 32
static void print_binary_buffer(char *buf, unsigned long size) static void print_binary_buffer(char *buf, unsigned long size)
{ {
unsigned long ofs, idx; unsigned long ofs, idx;
static char ascii[ROWLEN + 1];
html("<table summary='blob content' class='bin-blob'>\n"); html("<table summary='blob content' class='bin-blob'>\n");
html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); 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); 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", htmlf("%*s%02x",
idx == 16 ? 4 : 1, "", idx == 16 ? 4 : 1, "",
buf[idx] & 0xff); buf[idx] & 0xff);
html(" </td><td class='hex'>"); html(" </td><td class='hex'>");
for (idx = 0; idx < 32 && ofs + idx < size; idx++) for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.'); ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
ascii[idx] = '\0';
html_txt(ascii);
html("</td></tr>\n"); html("</td></tr>\n");
} }
html("</table>\n"); html("</table>\n");