From 2f409eebba9e085c202ef7f15553821d3bc40478 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Sun, 10 Mar 2024 00:42:17 -0500 Subject: Tweak autofmt behavior --- tomo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tomo.c b/tomo.c index c7cbd3fc..465c37e1 100644 --- a/tomo.c +++ b/tomo.c @@ -41,6 +41,7 @@ int main(int argc, char *argv[]) const char *autofmt = getenv("AUTOFMT"); if (!autofmt) autofmt = "indent -kr -l100 -nbbo -nut -sob"; + if (!autofmt[0]) autofmt = "cat"; file_t *f = load_file(filename); if (!f) @@ -94,7 +95,7 @@ int main(int argc, char *argv[]) switch (mode) { case MODE_COMPILE: { - const char *run = heap_strf("%s -x c %s -c - -o %s.o", cc, cflags, f->filename); + const char *run = heap_strf("%s | %s -x c %s -c - -o %s.o", autofmt, cc, cflags, f->filename); FILE *runner = popen(run, "w"); CORD program = CORD_all( @@ -110,8 +111,8 @@ int main(int argc, char *argv[]) return WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE; } case MODE_RUN: { - const char *run = streq(cc, "tcc") ? heap_strf("tcc -run %s %s %s -", cflags, ldflags, ldlibs) - : heap_strf("gcc -x c %s %s %s - -o program && ./program", cflags, ldflags, ldlibs); + const char *run = streq(cc, "tcc") ? heap_strf("%s | tcc -run %s %s %s -", autofmt, cflags, ldflags, ldlibs) + : heap_strf("%s | gcc -x c %s %s %s - -o program && ./program", autofmt, cflags, ldflags, ldlibs); FILE *runner = popen(run, "w"); CORD program = CORD_all( -- cgit v1.2.3