From a02b196b2152930db6ef486b4fc1a6e1290d5302 Mon Sep 17 00:00:00 2001 From: Emil Date: Tue, 10 Oct 2023 03:37:26 +0000 Subject: [PATCH] Reduced bloat around how mmap is handled, fixes to nobloat --- baked-nobloat.c | 112 +++++++++++++++++++++++++++----------------------------- baked.c | 88 ++++++++++++++++++++++---------------------- 2 files changed, 98 insertions(+), 102 deletions(-) diff --git a/baked-nobloat.c b/baked-nobloat.c index ac7740e..da671c5 100644 --- a/baked-nobloat.c +++ b/baked-nobloat.c @@ -27,7 +27,7 @@ "\t$@ returns target-file (abc.x.txt)\n" \ "\t$* returns target-file without suffix (^-> abc.x)\n" -static char * g_filename, * g_short; +char * g_filename, * g_short; static char * map(const char * fn, size_t * len) @@ -65,60 +65,42 @@ find(const char * x, const char * buf, const size_t max, const size_t min) } static char * -find_region(char * addr, size_t len) +find_region(const char * fn, const char * start, const char * stop) { - char * buf = NULL; - const char * start, * stop; - if ((start = find(START, addr, len, strlen(START)))) + size_t len = 0; + char * buf = NULL, * addr; + const char * pb, * pe; + addr = map(fn, &len); + if (addr != MAP_FAILED) { - start += strlen(START); - stop = find(STOP, start, len - (start - addr), strlen(STOP)); - if (!stop) + if ((pb = find(start, addr, len, strlen(start)))) { - stop = start; - while (*stop && *stop != '\n') + pb += strlen(start); + pe = find(stop, pb, len - (pb - addr), strlen(stop)); + if (!pe) { - if (stop[0] == '\\' && stop[1] == '\n') - { stop += 2; } - ++stop; + pe = pb; + while (*pe && *pe != '\n') + { + if (pe[0] == '\\' && pe[1] == '\n') + { pe += 2; } + ++pe; + } } + if (pe) + { buf = strndup(pb, (pe - addr) - (pb - addr)); } } - if (stop) - { buf = strndup(start, (stop - addr) - (start - addr)); } + munmap(addr, len); } return buf; } -static void -swap(char * a, char * b) -{ - *a ^= *b; - *b ^= *a; - *a ^= *b; -} - -static int -root(char * root) -{ - int ret; - char x[1] = "\0"; - size_t len = strlen(root); - while (len && root[len] != '/') - { --len; } - if (!len) - { return 0; } - swap(root + len, x); - ret = chdir(root); - swap(root + len, x); - return ret; -} static char * insert(const char * new, char * str, size_t offset, size_t shift) { size_t len, max; - if (!new) { return str; } - if (!str) { return NULL; } + if (!new || !str) { return NULL; } len = strlen(new); max = (strlen(str) + 1 - offset - shift); memmove(str + offset + len, str + offset + shift, max); @@ -202,29 +184,38 @@ expand(char * buf) return buf; } -static int -run(const char * buf) +static void +swap(char * a, char * b) { - fputs("Output:\n", stderr); - root(g_filename); - return system(buf); + *a ^= *b; + *b ^= *a; + *a ^= *b; +} + +static int +root(char * root) +{ + int ret; + char x[1] = "\0"; + size_t len = strlen(root); + while (len && root[len] != '/') + { --len; } + if (!len) + { return 0; } + swap(root + len, x); + ret = chdir(root); + swap(root + len, x); + return ret; } int main(int argc, char ** argv) { - int ret = 0; - char * buf = NULL, * addr; - size_t len; + char * buf; setlocale(LC_ALL, "C"); - if (argc < 2) - { goto help; } + if (argc < 2) { goto help; } g_filename = argv[1]; - if ((addr = map(g_filename, &len))) - { - buf = find_region(addr, len); - munmap(addr, len); - } + buf = find_region(g_filename, START, STOP); if (!buf) { if (errno) @@ -234,11 +225,14 @@ main(int argc, char ** argv) return 1; } buf = expand(buf); - fprintf(stderr, "Exec: %s\n", buf ? buf + 1 : buf); - if ((ret = ret ? 0 : run(buf))) - { fprintf(stderr, "Result: %d\n", ret); } + root(argv[0]); + fprintf(stderr, "Exec: %s\n", buf); + if (!buf) { return 1; } + fputs("Output:\n", stderr); + fflush(stderr); + system(buf); free(buf); - return ret; + return 0; help: fprintf(stderr, "%s: %s", argv[0], HELP DESC); return 1; diff --git a/baked.c b/baked.c index 64e3479..d2f93bb 100644 --- a/baked.c +++ b/baked.c @@ -83,57 +83,63 @@ find(const char * x, const char * buf, const size_t max, const size_t min) } static char * -find_region(char * addr, size_t len) +find_region(const char * fn) { - char * buf = NULL; + size_t len = 0; + char * buf = NULL, * addr; const char * start, * stop; - start = find(START, addr, len, strlen(START)); + addr = map(fn, &len); + if (addr != MAP_FAILED) + { + start = find(START, addr, len, strlen(START)); #ifdef OTHER_START - if (!start) - { - start = find(OTHER_START, addr, len, strlen(OTHER_START)); - start = (const char *) /* DON'T QUESTION IT */ - ((ptrdiff_t) (start - strlen(START) + strlen(OTHER_START)) * (start != 0)); - } + if (!start) + { + start = find(OTHER_START, addr, len, strlen(OTHER_START)); + start = (const char *) /* DON'T QUESTION IT */ + ((ptrdiff_t) (start - strlen(START) + strlen(OTHER_START)) * (start != 0)); + } #endif /* OTHER_START */ - if (start) - { - start += strlen(START); + if (start) + { + start += strlen(START); #ifdef REQUIRE_SPACE - if (!isspace(*start)) - { - fprintf(stderr, "ERROR: Found start without suffix spacing.\n"); - return NULL; - } -#endif - stop = find(STOP, start, len - (start - addr), strlen(STOP)); - if (!stop) - { - stop = start; - while (*stop && *stop != '\n') + if (!isspace(*start)) { - if (stop[0] == '\\' && stop[1] == '\n') - { stop += 2; } - ++stop; + fprintf(stderr, "ERROR: Found start without suffix spacing.\n"); + goto stop; + } +#endif + stop = find(STOP, start, len - (start - addr), strlen(STOP)); + if (!stop) + { + stop = start; + while (*stop && *stop != '\n') + { + if (stop[0] == '\\' && stop[1] == '\n') + { stop += 2; } + ++stop; + } } - } #ifdef REQUIRE_SPACE - else - { - if (!isspace(*(stop - 1))) + else { - fprintf(stderr, "ERROR: Found stop without prefixing spacing.\n"); - return NULL; + if (!isspace(*(stop - 1))) + { + fprintf(stderr, "ERROR: Found stop without prefixing spacing.\n"); + goto stop; + } } - } #endif - if (stop) - { buf = strndup(start, (stop - addr) - (start - addr)); } + if (stop) + { buf = strndup(start, (stop - addr) - (start - addr)); } + } + stop: + munmap(addr, len); } return buf; } - static void swap(char * a, char * b) { @@ -303,8 +309,8 @@ int main(int argc, char ** argv) { int ret = 0; - char * buf = NULL, * addr; - size_t len; + char * buf; + assert(setlocale(LC_ALL, "C")); if (argc < 2 @@ -323,11 +329,7 @@ main(int argc, char ** argv) { goto help; } } - if ((addr = map(g_filename, &len))) - { - buf = find_region(addr, len); - munmap(addr, len); - } + buf = find_region(g_filename); if (!buf) {