From 219075499f0c7307cbf9fb3a6c3561cf6c99aeb0 Mon Sep 17 00:00:00 2001
From: Shav Kinderlehrer <shav@trinket.icu>
Date: Wed, 19 Apr 2023 12:43:54 -0400
Subject: [PATCH] Fix --help grammar

---
 include/arg.h |  2 +-
 src/lib/arg.c | 20 +++++++++++---------
 src/main.c    |  9 +++++++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/include/arg.h b/include/arg.h
index 770b9b5..3a6fe22 100644
--- a/include/arg.h
+++ b/include/arg.h
@@ -2,7 +2,7 @@
 #define ARG_H
 #include <stdbool.h>
 
-#define LAT_VERSION "0.10.0"
+#define LAT_VERSION "0.10.1"
 
 struct config {
   bool stdin;
diff --git a/src/lib/arg.c b/src/lib/arg.c
index 09acd12..bef7b49 100644
--- a/src/lib/arg.c
+++ b/src/lib/arg.c
@@ -13,14 +13,15 @@ void help(void) {
 
   printf("%s\n\n", LAT_USAGE);
   printf("options:\n"
-         "\t-c, --color\t toggle whether to print color or not\n"
-         "\t-n, --lines\t toggle whether to print line numbers or not\n"
-         "\t-t, --headers\t toggle whether to print file headers or not\n"
-         "\t-b, --binary\t toggle whether to force the data to be treated as "
-         "binary or not. see examples\n"
-         "\t-p, --pager\t print file a pager (less)\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");
+         "\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\n");
 }
@@ -28,8 +29,9 @@ void help(void) {
 void examples(void) {
   printf(
       "examples:\n"
-      "\tlat file1\n\t\t print the content of file1 witht default formatting\n"
-      "\tlat - file1\n\t\t read from stdin (the '-' character reads from "
+      "\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 "
diff --git a/src/main.c b/src/main.c
index ac92333..3758713 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,8 +42,11 @@ void run(FILE *fp, char *filename, bool tty) {
 
   if (conf.headers) {
     char *addon = f.binary ? "<binary>" : "";
-    fprintf(err, "\x1b[2K\r%s%s%s%s\r\n", invert_t, basename(filename), addon,
-            reset);
+    if (!conf.pager)
+      fprintf(err, "\x1b[2K\r%s%s%s%s\r\n", invert_t, basename(filename), addon,
+              reset);
+    else
+      fprintf(err, "%s%s%s%s\r\n", invert_t, basename(filename), addon, reset);
   }
 
   conf.process = (tty && !f.binary);
@@ -68,11 +71,13 @@ void run(FILE *fp, char *filename, bool tty) {
     }
   } else {
     fwrite(f.buf, 1, f.buflen, st);
+    fflush(st);
     fwrite("\n", 1, 1, err);
   }
   free(f.buf);
 
   fflush(st); // prevent timing inconsistencies between st and err
+  fflush(err);
 
   if (conf.headers) {
     float rounded;