util: add hexdump() call to create pretty hexdumps of data

This is very useful when debugging sd-bus to look at messages.
This commit is contained in:
Lennart Poettering
2014-03-14 21:17:14 +01:00
parent edb2935c5c
commit 29bfbcd675
3 changed files with 65 additions and 0 deletions
+43
View File
@@ -6347,3 +6347,46 @@ char* mount_test_option(const char *haystack, const char *needle) {
return hasmntopt(&me, needle);
}
void hexdump(FILE *f, const void *p, size_t s) {
const uint8_t *b = p;
unsigned n = 0;
assert(s == 0 || b);
while (s > 0) {
size_t i;
fprintf(f, "%04x ", n);
for (i = 0; i < 16; i++) {
if (i >= s)
fputs(" ", f);
else
fprintf(f, "%02x ", b[i]);
if (i == 7)
fputc(' ', f);
}
fputc(' ', f);
for (i = 0; i < 16; i++) {
if (i >= s)
fputc(' ', f);
else
fputc(isprint(b[i]) ? (char) b[i] : '.', f);
}
fputc('\n', f);
if (s < 16)
break;
n += 16;
b += 16;
s -= 16;
}
}
+2
View File
@@ -914,3 +914,5 @@ const char *personality_to_string(unsigned long);
uint64_t physical_memory(void);
char* mount_test_option(const char *haystack, const char *needle);
void hexdump(FILE *f, const void *p, size_t s);
+20
View File
@@ -626,6 +626,25 @@ static void test_writing_tmpfile(void) {
assert(streq(contents, "abc\n" ALPHANUMERICAL "\n"));
}
static void test_hexdump(void) {
uint8_t data[146];
unsigned i;
hexdump(stdout, NULL, 0);
hexdump(stdout, "", 0);
hexdump(stdout, "", 1);
hexdump(stdout, "x", 1);
hexdump(stdout, "x", 2);
hexdump(stdout, "foobar", 7);
hexdump(stdout, "f\nobar", 7);
hexdump(stdout, "xxxxxxxxxxxxxxxxxxxxyz", 23);
for (i = 0; i < ELEMENTSOF(data); i++)
data[i] = i*2;
hexdump(stdout, data, sizeof(data));
}
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
@@ -667,6 +686,7 @@ int main(int argc, char *argv[]) {
test_get_files_in_directory();
test_in_set();
test_writing_tmpfile();
test_hexdump();
return 0;
}