diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/libreboot-utils/lib/num.c | 18 | ||||
| -rw-r--r-- | util/libreboot-utils/lib/string.c | 5 | ||||
| -rw-r--r-- | util/libreboot-utils/lottery.c | 7 |
3 files changed, 24 insertions, 6 deletions
diff --git a/util/libreboot-utils/lib/num.c b/util/libreboot-utils/lib/num.c index e4d0ce6b..bf4afaef 100644 --- a/util/libreboot-utils/lib/num.c +++ b/util/libreboot-utils/lib/num.c @@ -50,6 +50,22 @@ hextonum(char ch_s) } /* basically hexdump -C */ +/* + TODO: optimise this + write a full util for hexdump + how to optimise: + don't call print tens of thousands of times! + convert the numbers manually, and cache everything + in a BUFSIZ sized buffer, with everything properly + aligned. i worked out that i could fit 79 rows + in a 8KB buffer (1264 bytes of numbers represented + as strings in hex) + this depends on the OS, and would be calculated at + runtime. + then: + don't use printf. just write it to stdout (basically + a simple cat implementation) +*/ void spew_hex(const void *data, size_t len) { @@ -64,7 +80,7 @@ spew_hex(const void *data, size_t len) for (i = 0; i < len; i += 16) { - printf("%08zx ", i); + printf("%0*zx ", sizeof(size_t) * 2, i); for (j = 0; j < 16; j++) { diff --git a/util/libreboot-utils/lib/string.c b/util/libreboot-utils/lib/string.c index 9adbb120..39b31cb0 100644 --- a/util/libreboot-utils/lib/string.c +++ b/util/libreboot-utils/lib/string.c @@ -179,7 +179,6 @@ scatn(ssize_t sc, const char **sv, size_t max, char **rval) { int saved_errno = errno; - char *final = NULL; char *rcur = NULL; char *rtmp = NULL; @@ -192,7 +191,9 @@ scatn(ssize_t sc, const char **sv, for (i = 0; i < sc; i++) { - if (i == 0) { + if (if_err(sv[i] == NULL, EFAULT)) + goto err; + else if (i == 0) { if (sdup(sv[0], max, &final) < 0) goto err; continue; diff --git a/util/libreboot-utils/lottery.c b/util/libreboot-utils/lottery.c index 4c7c145a..fd39c68c 100644 --- a/util/libreboot-utils/lottery.c +++ b/util/libreboot-utils/lottery.c @@ -18,6 +18,7 @@ main(int argc, char **argv) { int same = 0; char *buf; + size_t size = 8589934592; (void) argc, (void) argv; (void) errhook(exit_cleanup); @@ -26,12 +27,12 @@ main(int argc, char **argv) /* https://man.openbsd.org/pledge.2 */ xpledgex("stdio", NULL); - buf = rmalloc(BUFSIZ); - if (!memcmp(buf, buf + (BUFSIZ >> 1), BUFSIZ >> 1)) + buf = rmalloc(size); + if (!memcmp(buf, buf + (size >> 1), size >> 1)) same = 1; if (argc < 2) /* no spew */ - spew_hex(buf, BUFSIZ); + spew_hex(buf, size); free_and_set_null(&buf); fprintf(stderr, "\n%s\n", same ? "You win!" : "You lose!"); |