From b2dd2b0507571399723b3fe74bb469bc7e24f8a0 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 28 Dec 2019 12:13:22 +0100 Subject: another (hopefully last) change to our fs format - use C-style NULL-terminated strings instead of length-padded --- makefs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/makefs.c b/makefs.c index 24d8f6c..31831a3 100644 --- a/makefs.c +++ b/makefs.c @@ -30,12 +30,9 @@ int main(int argc, char **argv) " is too big.", argv[i]); uint32_t file_size = fileinfo.st_size; - uint32_t name_size = strlen(argv[i]); + uint32_t name_size = strlen(argv[i]) + 1; - if (fwrite(&name_size, 4, 1, stdout) != 1) - errx(-1, "error writing to stdout"); - - if (printf("%s", argv[i]) != name_size) + if (fwrite(argv[i], 1, name_size, stdout) != name_size) errx(-1, "error writing to stdout"); for (int j = 0; (j + (name_size & 0b11)) & 0b11; j++) -- cgit v1.2.3