diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 29 |
1 files changed, 18 insertions, 11 deletions
@@ -12,14 +12,15 @@ #define GREY "\x1b[90m" #define RESET "\x1b[0m" -void run(FILE *fp, char *filename) { - int tty = isatty(STDOUT_FILENO); - +void run(FILE *fp, char *filename, int tty) { struct filedata f; f = readfile(fp); - if (tty) - fprintf(stderr, "\r%s%s%s\r\n", INVERT_T, basename(filename), UINVERT_T); + if (tty) { + char *addon = f.binary ? " <binary>" : ""; + fprintf(stderr, "\n%s%s%s%s\r\n", INVERT_T, basename(filename), addon, + UINVERT_T); + } int lcpad = intlen(f.lc); @@ -29,12 +30,14 @@ void run(FILE *fp, char *filename) { for (size_t i = 0; i < f.len; i++) { c = f.buf[i]; - if (tty && (pc == '\n' || i == 0)) { + if (tty && !f.binary && (pc == '\n' || i == 0)) { f.lc++; int padlen = lcpad - intlen(f.lc); char padding[padlen]; - memset(padding, ' ', padlen); + + if (padlen) + memset(padding, ' ', padlen); fprintf(stderr, "\r%s%s%d:%s ", GREY, padlen > 0 ? padding : "", f.lc, RESET); // padlen < 1 causes undefined @@ -44,11 +47,13 @@ void run(FILE *fp, char *filename) { printf("%c", c); } + fflush(stdout); // prevent timing inconsistencies between stdout and stderr + if (tty) { float rounded; - char *format = formatBytes(f.len, &rounded); + char *format = formatbytes(f.len, &rounded); - fprintf(stderr, "\r%s%.2f %s%s\r\n", INVERT_T, rounded, format, UINVERT_T); + fprintf(stderr, "\n%s%.2f %s%s\r\n", INVERT_T, rounded, format, UINVERT_T); } } @@ -58,7 +63,9 @@ int main(int argc, char *argv[]) { FILE *fp = fopen(argv[i], "rb"); if (fp == NULL) die(argv[i]); - run(fp, argv[i]); + + int tty = isatty(STDOUT_FILENO); + run(fp, argv[i], tty); fclose(fp); if (i + 1 != argc) { @@ -66,7 +73,7 @@ int main(int argc, char *argv[]) { } } } else { - run(stdin, "stdin"); // for piped-input or repl-like behavior + run(stdin, "stdin", 1); // for piped-input or repl-like behavior } return 0; |