.github/workflows/c-cpp.yml

@@ -1,21 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: prep
-      run: make prep
-    - name: make
-      run: make
-    - name: test
-      run: ./build/lat -V

.gitignore

@@ -130,3 +130,4 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.toptal.com/developers/gitignore/api/c,macos,windows,linux,c
+

LICENSE

@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

Makefile

@@ -6,11 +6,7 @@ ODIR:=obj
 BINDIR:=build
 
 CC:=cc
-# OMG SO FAST (see https://www.shlomifish.org/humour/by-others/funroll-loops/Gentoo-is-Rice.html)
-# CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -Ofast -faggressive-loop-optimizations -funroll-all-loops  -march=native
-# For a stable experience
-CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -O2 -march=native
-
+CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -Ofast
 LIB:=
 
 DEPS:=$($(IDIR)/%.h)
@@ -26,6 +22,7 @@ $(ODIR)/%.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS) $(LIB)
 
 $(NAME): $(OBJ)
+	@echo "--don't forget to set $(NAME)'s version--"
 	$(CC) -o $(BINDIR)/$@ $^ $(CFLAGS) $(LIB)
 
 .PHONY: prep
@@ -34,6 +31,7 @@ prep:
 	-@mkdir -p $(IDIR)
 	-@mkdir -p $(ODIR)
 	-@mkdir -p $(BINDIR)
+	@echo $(BINDIR)/ >> .gitignore
 
 .PHONY: clean
 clean:

README.md

@@ -1,47 +0,0 @@
-# lat
-> lat | lazy cat - a cat clone with some quality-of-life embellishments
-
-## About
-
-`lat` is a solution to a problem that doesn't exist. It's the awkward middle child in-between `cat` and `bat`. It was created because the author didn't want to have to configure `bat` just to get decent file printing, but wanted a little more control than `cat` offered.
-
-`lat` does not expect to be used. `lat` expects to be forgotten and shunted into a corner because it does not belong in the slightest.
-
-## Install
-`lat` is not yet at a stable version (`v1.0.0`), so it is not on any package managers. 
-
-```bash
-git clone https://github.com/secondary-smiles/lat.git
-
-cd lat
-
-make
-
-./build/lat -V
-
-# now add lat to your $PATH/do whatever you want with the binary
-```
-
-## Helptext
-> `lat -h`
-
-```text
-lat | lazy cat - a cat clone with some quality-of-life embellishments
-
-usage: lat [-cltbrpneVh] [file...]
-
-options:
-	-c           toggle color
-	-l           toggle line numbers
-	-t           toggle file info headers
-	-b           set binary mode, -b forces binary and -bb forces NOT binary
-	-r           print everything (headers, line numbers, etc.) to stdout (or equivalent)
-	-p           print file with the pager (uses less)
-	-n <name>    manually set the name of the file shown in the title
-	-e <program> link extension to lat
-	-V           show program version
-	-h           display this help text
-
-environment:
-	NO_COLOR, see https://no-color.org/
-```

include/arg.h

@@ -2,19 +2,16 @@
 #define ARG_H
 #include <stdbool.h>
 
-#define LAT_VERSION "0.13.0"
+#define LAT_VERSION "0.10.2"
 
 struct config {
-  bool isstdin;
+  bool stdin;
   bool process;
   bool color;
   bool lines;
   bool headers;
   int force_binary;
-  bool literal;
   bool pager;
-  char *name;
-  char *extension;
   bool has_read_stdin;
 };
 

social/binary.tape

@@ -1,54 +0,0 @@
-Require lat
-Output social/render/binary.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -b src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat ./build/lat"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -bb ./build/lat"
-Sleep 2s
-Enter
-
-Sleep 5s

social/color.tape

@@ -1,31 +0,0 @@
-Require lat
-Output social/render/color.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -c src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-

social/fzf_embed.tape

@@ -1,41 +0,0 @@
-Require lat
-Output social/render/fzf_embed.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "fzf --preview 'lat -r {}'"
-Sleep 1s
-
-Enter
-Sleep 2s
-
-Type "main.c"
-Sleep 2s
-Backspace 7
-Sleep 1s
-
-Type "types.h"
-Sleep 1s
-Backspace 8
-Sleep 2s
-
-Type "file.c"
-Sleep 3s
-Backspace 7
-Sleep 2s
-
-Up@3s 15
-
-Sleep 3s
-
-Enter
-
-Sleep 2s

social/headers.tape

@@ -1,32 +0,0 @@
-Require lat
-Output social/render/headers.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -t src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-

social/lat_demo.tape

@@ -1,24 +0,0 @@
-Require lat
-Output social/render/lat_demo.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 2000
-Set TypingSpeed 0.2
-
-Type "lat Makefile"
-Sleep 2s
-Enter
-
-Sleep 4s
-
-Type "lat -h"
-Sleep 2s
-Enter
-
-Sleep 4s

social/line_numbers.tape

@@ -1,30 +0,0 @@
-Require lat
-Output social/render/line_numbers.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c"
-Sleep 2s
-Enter
-
-Sleep 4s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -n src/main.c"
-Sleep 2s
-Enter
-
-Sleep 4s

social/literal.tape

@@ -1,46 +0,0 @@
-Require lat
-Output social/render/literal.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c > example.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "cat example.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -r src/main.c > example.c"
-Sleep 2s
-Enter
-
-Sleep 3s
-
-Type "cat example.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Hide
-Type "rm example.c"
-Enter

social/name.tape

@@ -1,37 +0,0 @@
-Require lat
-Output social/render/name.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat"
-Sleep 2s
-Enter
-
-Type "hello, world!"
-Enter
-Sleep 3s
-
-Ctrl+d
-
-Sleep 3s
-
-Type "lat -n "custom name" src/main.c"
-Sleep 2s
-Enter
-
-Type "hello, world!"
-Enter
-Sleep 3s
-
-Ctrl+d
-
-Sleep 4s
-

social/pager.tape

@@ -1,40 +0,0 @@
-Require lat
-Output social/render/pager.gif
-
-Set Theme "Gruvbox Dark"
-Set WindowBar Rings
-Set BorderRadius 10
-Set Margin 10
-
-Set FontSize 32
-Set Width 2400
-Set Height 1200
-Set TypingSpeed 0.2
-
-Type "lat src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Type "clear"
-Sleep 1s
-Enter
-
-Sleep 2s
-
-Type "lat -p src/main.c"
-Sleep 2s
-Enter
-
-Sleep 5s
-
-Down 100
-
-Sleep 3s
-
-Type "q"
-Sleep 4s
-
-
-

src/lib/arg.c

@@ -1,58 +1,116 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdnoreturn.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
+#include <string.h>
 
 #include "arg.h"
 #include "util.h"
 
-#define LAT_SHORT_ARGS "cltbrpn:e:Vh"
-#define LAT_USAGE "usage: lat [-cltbrpneVh] [file...]"
-
-struct config conf;
+#define LAT_USAGE "usage: lat [-cntbpVh] [file...]"
 
 void help(void) {
   printf("lat | lazy cat - a cat clone with some quality-of-life "
-         "embellishments\n\n");
+         "embelishments\n\n");
 
   printf("%s\n\n", LAT_USAGE);
   printf("options:\n"
-         "\t-c           toggle color\n"
-         "\t-l           toggle line numbers\n"
-         "\t-t           toggle file info headers\n"
-         "\t-b           set binary mode, -b forces binary and -bb forces NOT "
-         "binary\n"
-         "\t-r           print everything (headers, line numbers, etc.) to "
-         "stdout (or equivalent)\n"
-         "\t-p           disable or enable pager (uses less)\n"
-         "\t-n <name>    manually set the name of the file shown in the title\n"
-         // "\t-e <program> NONFUNCTIONAL (will be added soon)  link extension
-         // to lat\n"
-         "\t-V           show program version\n"
-         "\t-h           display this help text\n\n");
+         "\t-c, --color\t toggle color\n"
+         "\t-n, --lines\t toggle line numbers\n"
+         "\t-t, --headers\t toggle file info headers\n"
+         "\t-b, --binary\t toggle binary mode, -b forces binary and -bb forces "
+         "NOT binary\n"
+         "\t-p, --pager\t print file with the pager (uses less)\n"
+         "\t-V, --version\t show program version\n"
+         "\t-h, --help\t display this help text (--help shows additional "
+         "info)\n\n");
   printf("environment:\n"
-         "\tNO_COLOR, see https://no-color.org/\n");
+         "\tNO_COLOR, see https://no-color.org/\n\n");
+}
+
+void examples(void) {
+  printf(
+      "examples:\n"
+      "\tlat file1\n\t\t print the contents of file1 with the default "
+      "formatting\n"
+      "\tlat - file1\n\t\t read from stdin (the '-' flag reads from "
+      "stdin) "
+      "and then print the contents of stdin and file1\n"
+      "\tlat -nc file1 file2\n\t\t print the contents of file1 and "
+      "file2 "
+      "without printing line numbers or colors\n"
+      "\tlat --binary file.txt\n\t\t force file.txt to be treated as a binary "
+      "file\n"
+      "\tlat -bb --pager file.txt\n\t\t force file.txt to NOT be treated "
+      "as a binary file and print it in the pager\n"
+      "\tcurl example.com | lat\n\t\t pipe the results of 'curl example.com' "
+      "into lat\n");
 }
 
 void version(void) {
   printf("lat - v%s built %s at %s\n", LAT_VERSION, __DATE__, __TIME__);
 }
 
-noreturn void argerr(void) {
-  printf("\n%s\n", LAT_USAGE);
-  printf("run '-h' for more information\n");
+struct config conf;
+void argerr(char *r, char *arg) {
+  printf("lat: %s '%s'\n\n", r, arg);
+
+  printf("%s\n", LAT_USAGE);
+  printf("run '--help' for more information\n");
   exit(EXIT_FAILURE);
 }
 
-int parseargs(int argc, char *argv[]) {
-  char opt;
-  while ((opt = getopt(argc, argv, LAT_SHORT_ARGS)) != -1) {
-    switch (opt) {
+void parselongarg(char *arg) {
+  if (strcmp(arg, "--color") == 0) {
+    conf.color = !conf.color;
+    return;
+  }
+
+  if (strcmp(arg, "--lines") == 0) {
+    conf.lines = !conf.lines;
+    return;
+  }
+
+  if (strcmp(arg, "--headers") == 0) {
+    conf.headers = !conf.headers;
+    return;
+  }
+
+  if (strcmp(arg, "--binary") == 0) {
+    if (conf.force_binary < 0)
+      conf.force_binary = 1;
+    else
+      conf.force_binary = !conf.force_binary;
+    return;
+  }
+
+  if (strcmp(arg, "--pager") == 0) {
+    conf.pager = !conf.pager;
+  }
+
+  if (strcmp(arg, "--help") == 0) {
+    help();
+    examples();
+    exit(EXIT_SUCCESS);
+    return;
+  }
+
+  if (strcmp(arg, "--version") == 0) {
+    version();
+    exit(EXIT_SUCCESS);
+    return;
+  }
+
+  argerr("unrecognized arg", arg);
+}
+
+void parseshortarg(char *arg) {
+  size_t i = 1;
+  while (arg[i] != '\0') {
+    char c = arg[i];
+    switch (c) {
     case 'c':
       conf.color = !conf.color;
       break;
-    case 'l':
+    case 'n':
       conf.lines = !conf.lines;
       break;
     case 't':
@@ -64,18 +122,9 @@ int parseargs(int argc, char *argv[]) {
       else
         conf.force_binary = !conf.force_binary;
       break;
-    case 'r':
-      conf.literal = !conf.literal;
-      break;
     case 'p':
       conf.pager = !conf.pager;
       break;
-    case 'n':
-      conf.name = optarg;
-      break;
-    case 'e':
-      conf.extension = optarg;
-      break;
     case 'V':
       version();
       exit(EXIT_SUCCESS);
@@ -84,10 +133,39 @@ int parseargs(int argc, char *argv[]) {
       help();
       exit(EXIT_SUCCESS);
       break;
-    default:
-      argerr();
+    default: {
+      char *str = malloc(2);
+      str[0] = c;
+      str[1] = '\0';
+      argerr("unrecognized flag", str);
+      free(str);
       break;
     }
+    }
+    i++;
   }
-  return optind;
+}
+
+int parseargs(int argc, char *argv[]) {
+  int i;
+  for (i = 1; i < argc; i++) { // offset for argv[0]
+    char *arg = argv[i];
+
+    if (arg[0] == '-' && arg[1] == '\0') {
+      return i;
+    }
+
+    if (arg[0] == '-') {
+      if (arg[1] == '-') {
+        parselongarg(arg);
+        continue;
+      }
+
+      parseshortarg(arg);
+    } else {
+      return i;
+    }
+  }
+
+  return i;
 }

src/lib/file.c

@@ -4,7 +4,6 @@
 
 #include "types.h"
 #include "util.h"
-#include "arg.h"
 
 bool isbinary(struct filedata *f) {
 
@@ -17,13 +16,13 @@ bool isbinary(struct filedata *f) {
   char *result = memchr(testbuf, 0x00, testlen);
 
   if (result) {
-    return true;
+      return true;
   } else {
-    return false;
+      return false;
   }
 }
 
-struct filedata readfile(FILE *fp) {
+struct filedata readfile(FILE *fp, bool isstdin) {
   struct filedata f;
 
   f.lc = 0;
@@ -33,7 +32,7 @@ struct filedata readfile(FILE *fp) {
   f.buf = NULL;
   f.lines = NULL;
 
-  if (conf.isstdin) {
+  if (isstdin) {
     size_t bufsize = 1024;
     f.buf = malloc(bufsize);
     if (f.buf == NULL)
@@ -43,6 +42,7 @@ struct filedata readfile(FILE *fp) {
     while (fread(&c, 1, 1, fp) > 0) {
       if (f.buflen == bufsize - 1) {
         bufsize *= 2;
+
         char *new_buf = realloc(f.buf, bufsize);
         if (new_buf == NULL)
           die("realloc");
@@ -61,7 +61,7 @@ struct filedata readfile(FILE *fp) {
     }
     f.buf[f.buflen] = '\0';
 
-    f.binary = isbinary(&f);
+    f.binary = isbinary(&f); 
 
     return f;
   }
@@ -79,7 +79,7 @@ struct filedata readfile(FILE *fp) {
     die("fread");
   }
 
-  f.binary = isbinary(&f);
+  f.binary = isbinary(&f); 
 
   return f;
 }

src/lib/process.c

@@ -1,15 +1,12 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <stdio.h>
-
 #include "types.h"
 #include "util.h"
 
 void appendline(struct filedata *f, char *data, size_t len) {
   f->lines = realloc(f->lines, sizeof(struct line) * (f->lc + 1));
-  if (f->lines == NULL)
-    die("realloc");
 
   size_t loc = f->lc;
 
@@ -23,7 +20,7 @@ void loadlines(struct filedata *f) {
   f->lc = 0;
 
   size_t offset = 0;
-  size_t linelen = 1024;
+  size_t linelen = 4096;
   char *line = malloc(linelen);
   if (line == NULL)
     die("malloc");
@@ -31,11 +28,10 @@ void loadlines(struct filedata *f) {
   for (size_t i = 0; i < f->buflen; i++) {
     char c = f->buf[i];
     if (c == '\n') {
-      if (offset >= 1 && offset < linelen) { // shrink to fit
+      if (offset < linelen) { // shrink
         char *new_line = realloc(line, offset);
         if (new_line == NULL)
           die("realloc");
-
         line = new_line;
       }
 
@@ -63,7 +59,7 @@ void loadlines(struct filedata *f) {
   }
 
   // capture last line
-  if (offset >= 1 && offset < linelen) { // shrink
+  if (offset < linelen) { // shrink
     char *new_line = realloc(line, offset);
     if (new_line == NULL)
       die("realloc");

src/lib/util.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdnoreturn.h>
+#include <sys/ioctl.h>
 
-noreturn void die(const char *message) {
+void die(const char *message) {
   perror(message);
   exit(EXIT_FAILURE);
 }

src/main.c

@@ -1,6 +1,7 @@
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/ioctl.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "arg.h"
@@ -17,60 +18,13 @@
 FILE *st;
 FILE *err;
 
-struct colors {
-  char *invert_t;
-  char *grey;
-  char *reset;
-};
-
-struct colors c;
-
-void initcolor(void) {
-  c.invert_t = conf.color ? INVERT_T : "";
-  c.grey = conf.color ? GREY : "";
-  c.reset = conf.color ? RESET : "";
-}
-
-void printheadertop(char *filename, bool binary) {
-  char *name = conf.name == NULL ? filename : conf.name;
-  char *addon = binary ? "<binary>" : "";
-  if (conf.isstdin && !conf.pager)
-    fprintf(err, "\x1b[2K\r%s%s%s%s\n", c.invert_t, name, addon, c.reset);
-  else
-    fprintf(err, "%s%s%s%s\n", c.invert_t, name, addon, c.reset);
-}
-
-void printheaderbottom(size_t buflen) {
-  float rounded;
-  char *format = formatbytes(buflen, &rounded);
-
-  fprintf(err, "%s%.2f %s%s\n", c.invert_t, rounded, format, c.reset);
-}
-
 void run(FILE *fp, char *filename, bool tty) {
-  initcolor();
+  const char *invert_t = conf.color ? INVERT_T : "";
+  const char *grey = conf.color ? GREY : "";
+  const char *reset = conf.color ? RESET : "";
 
   struct filedata f;
-  f = readfile(fp, conf.isstdin);
-
-  // any/all processing to be done
-  // TODO: maybe multithread?
-  conf.process = (tty && !f.binary);
-  if (conf.process) { // file display processing
-    loadlines(&f);
-  }
-
-  if (conf.extension != NULL) {
-    // TODO
-  }
-
-  struct winsize w;
-
-  if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1 || w.ws_col != 0) {
-    if (w.ws_row <= f.lc + 5) {
-      conf.pager = !conf.pager;
-    }
-  }
+  f = readfile(fp, conf.stdin);
 
   if (conf.pager) {
     st = popen("less", "w");
@@ -80,10 +34,6 @@ void run(FILE *fp, char *filename, bool tty) {
       die("popen 'less'");
   }
 
-  if (conf.literal) {
-    err = st;
-  }
-
   if (conf.force_binary > 0) {
     f.binary = true;
   } else if (conf.force_binary == 0) {
@@ -91,21 +41,28 @@ void run(FILE *fp, char *filename, bool tty) {
   }
 
   if (conf.headers) {
-    printheadertop(filename, f.binary);
+    char *addon = f.binary ? "<binary>" : "";
+    if (conf.pager)
+      fprintf(err, "%s%s%s%s\r\n", invert_t, basename(filename), addon, reset);
+    else
+      fprintf(err, "\x1b[2K\r%s%s%s%s\r\n", invert_t, basename(filename), addon,
+              reset);
+  }
+
+  conf.process = (tty && !f.binary);
+  if (conf.process) { // file display processing
+    loadlines(&f);
   }
 
   if (conf.process) {
     int linecount = 1;
     for (int i = 0; i < f.lc; i++) {
       if (conf.lines) {
-        { // line numbers
-          char *padding = linepad(linecount, f.lc);
-          fprintf(err, "%s%s%d│%s ", c.grey, padding, i + 1, c.reset);
-          free(padding);
-        }
-
+        char *padding = linepad(linecount, f.lc);
+        fprintf(st, "%s%s%d│%s ", grey, padding, i + 1, reset);
         fwrite(f.lines[i].buf, 1, f.lines[i].len, st);
         fprintf(st, "\n");
+        free(padding);
         linecount++;
       } else {
         fprintf(st, "%s\n", f.lines[i].buf);
@@ -115,38 +72,37 @@ void run(FILE *fp, char *filename, bool tty) {
   } else {
     fwrite(f.buf, 1, f.buflen, st);
     fflush(st);
-    if (tty)
-      fwrite("\n", 1, 1, err);
+    fwrite("\n", 1, 1, err);
   }
   free(f.buf);
-  free(f.lines);
 
   fflush(st); // prevent timing inconsistencies between st and err
   fflush(err);
 
   if (conf.headers) {
-    printheaderbottom(f.buflen);
+    float rounded;
+    char *format = formatbytes(f.buflen, &rounded);
+
+    fprintf(err, "%s%.2f %s%s\r\n", invert_t, rounded, format, reset);
   }
 
   if (conf.pager) {
     pclose(st); // err is already the same as st
+
+    st = stdout;
+    err = stderr;
   }
 }
 
 void initconf(void) {
   conf.force_binary = -1;
-  conf.isstdin = false;
+  conf.stdin = false;
   conf.has_read_stdin = false;
   conf.pager = false;
-  conf.literal = false;
-
   conf.process = true;
   conf.headers = true;
   conf.color = true;
   conf.lines = true;
-
-  conf.name = NULL;
-  conf.extension = NULL;
 }
 
 void clearstdin(void) {
@@ -169,46 +125,39 @@ int main(int argc, char *argv[]) {
   }
 
   bool tty = isatty(STDOUT_FILENO);
-
-  int offset = parseargs(argc, argv);
-
-  conf.headers = conf.headers && tty;
-
   if (argc > 1) {
-
-    tty = tty || conf.literal;
+    int offset = parseargs(argc, argv);
+    conf.headers = conf.headers && tty; // tty still overrides user
+    conf.pager = conf.pager && tty;
 
     for (int i = offset; i < argc; i++) {
       if (*argv[i] == '-') {
         if (conf.has_read_stdin)
           clearstdin();
         conf.has_read_stdin = true;
-        conf.isstdin = true;
+        conf.stdin = true;
         run(stdin, "stdin", tty);
-        if (tty && (i + 1 != argc)) {
-          fprintf(err, "\n"); // separate concurrent files in tty
-        }
-
         continue;
       }
 
-      conf.isstdin = false;
+      conf.stdin = false;
       FILE *fp = fopen(argv[i], "rb");
       if (fp == NULL)
         die(argv[i]);
       run(fp, argv[i], tty);
       fclose(fp);
       if (tty && (i + 1 != argc)) {
-        fprintf(err, "\n"); // separate concurrent files in tty
+        printf("offset: %d argc: %d\n", i, argc);
+        fprintf(err, "\r\n"); // separate concurrent files in tty
       }
     }
 
     if (offset == argc) {
-      conf.isstdin = true;
+      conf.stdin = true;
       run(stdin, "stdin", tty);
     }
   } else {
-    conf.isstdin = true;
+    conf.stdin = true;
     run(stdin, "stdin", tty); // for piped-input or repl-like behavior
   }