Handle closed standard input gracefully

.github/workflows/lint.yml

@@ -46,5 +46,5 @@ jobs:
         run: |
           set -o xtrace
           ./run-tests
-          git clone https://github.com/nickboucher/trojan-source
+          git clone https://github.com/nickboucher/trojan-source ~/trojan-source
           ./unicode-testscript

run-tests

@@ -17,10 +17,21 @@ NO_COLOR="" COLORTERM="" TERM="xterm-direct" "${pytest[@]}" "${@}"
 find . -type f -name "*.py" -print0 | xargs -0 "${pylint[@]}"
 "${mypy[@]}" .
 
-utils=(stprint stecho stcat stcatn sttee stsponge)
+stdin_utils_to_stdout=(stcat stcatn)
+stdin_utils_to_file=(sttee stsponge)
+stdin_utils=("${stdin_utils_to_stdout[@]}" "${stdin_utils_to_file[@]}")
+utils=(stprint stecho "${stdin_utils[@]}")
 cd "${git_toplevel}/usr/bin"
 "${black[@]}" -- "${utils[@]}"
 "${pylint[@]}" -- "${utils[@]}"
 for file in "${utils[@]}"; do
   "${mypy[@]}" -- "${file}"
 done
+
+for util in "${stdin_utils_to_stdout[@]}"; do
+  ./"${util}" <&-
+  ./"${util}" - <&-
+done
+for util in "${stdin_utils_to_file[@]}"; do
+  ./"${util}" <&-
+done

usr/lib/python3/dist-packages/stdisplay/stcat.py

@@ -7,19 +7,31 @@
 
 """Safely print stdin or file to stdout."""
 
-from fileinput import input as file_input
-from sys import stdin, stdout, modules
+from pathlib import Path
+from sys import argv, stdin, stdout, modules
 from stdisplay.stdisplay import stdisplay
 
 
 def main() -> None:
     """Safely print stdin or file to stdout."""
     # https://github.com/pytest-dev/pytest/issues/4843
-    if "pytest" not in modules:
+    if "pytest" not in modules and stdin is not None:
         stdin.reconfigure(errors="ignore")  # type: ignore
-    ## File input reads stdin when no file is provided or file is '-'.
-    for untrusted_text in file_input(encoding="ascii", errors="replace"):
-        stdout.write(stdisplay(untrusted_text))
+    if len(argv) == 1:
+        if stdin is not None:
+            for untrusted_line in stdin:
+                stdout.write(stdisplay(untrusted_line))
+            stdout.flush()
+        return
+    for untrusted_arg in argv[1:]:
+        if untrusted_arg == "-":
+            if stdin is not None:
+                for untrusted_line in stdin:
+                    stdout.write(stdisplay(untrusted_line))
+        else:
+            path = Path(untrusted_arg)
+            untrusted_text = path.read_text(encoding="ascii", errors="replace")
+            stdout.write(stdisplay(untrusted_text))
     stdout.flush()
 
 

usr/lib/python3/dist-packages/stdisplay/stcatn.py

@@ -10,22 +10,34 @@
 (trim trailing whitespace, ensure final newline).
 """
 
-from fileinput import input as file_input
-from sys import stdin, stdout, modules
+from pathlib import Path
+from sys import argv, stdin, stdout, modules
 from stdisplay.stdisplay import stdisplay
 
 
 def main() -> None:
     """
-    main
+    Safely print stdin or file to stdout with tweaks
+    (trim trailing whitespace, ensure final newline).
     """
     # https://github.com/pytest-dev/pytest/issues/4843
-    if "pytest" not in modules:
+    if "pytest" not in modules and stdin is not None:
         stdin.reconfigure(errors="ignore")  # type: ignore
-
-    for line in file_input(encoding="ascii", errors="replace"):
-        stdout.write(stdisplay(line).rstrip() + "\n")
-
+    if len(argv) == 1:
+        if stdin is not None:
+            for untrusted_line in stdin:
+                stdout.write(stdisplay(untrusted_line).rstrip() + "\n")
+            stdout.flush()
+        return
+    for untrusted_arg in argv[1:]:
+        if untrusted_arg == "-":
+            if stdin is not None:
+                for untrusted_line in stdin:
+                    stdout.write(stdisplay(untrusted_line).rstrip() + "\n")
+        else:
+            path = Path(untrusted_arg)
+            untrusted_text = path.read_text(encoding="ascii", errors="replace")
+            stdout.write(stdisplay(untrusted_text).rstrip() + "\n")
     stdout.flush()
 
 

usr/lib/python3/dist-packages/stdisplay/stsponge.py

@@ -16,11 +16,12 @@
 def main() -> None:
     """Safely print stdin to stdout or file."""
     # https://github.com/pytest-dev/pytest/issues/4843
-    if "pytest" not in modules:
+    if "pytest" not in modules and stdin is not None:
         stdin.reconfigure(errors="ignore")  # type: ignore
     untrusted_text_list = []
-    for untrusted_text in stdin:
-        untrusted_text_list.append(untrusted_text)
+    if stdin is not None:
+        for untrusted_text in stdin:
+            untrusted_text_list.append(untrusted_text)
     if len(argv) == 1:
         stdout.write(stdisplay("".join(untrusted_text_list)))
         stdout.flush()

usr/lib/python3/dist-packages/stdisplay/sttee.py

@@ -13,13 +13,14 @@
 def main() -> None:
     """Safely print stdin to stdout and file."""
     # https://github.com/pytest-dev/pytest/issues/4843
-    if "pytest" not in modules:
+    if "pytest" not in modules and stdin is not None:
         stdin.reconfigure(errors="ignore")  # type: ignore
     untrusted_text_list = []
-    for untrusted_text in stdin:
-        untrusted_text_list.append(untrusted_text)
-        stdout.write(stdisplay(untrusted_text))
-    stdout.flush()
+    if stdin is not None:
+        for untrusted_text in stdin:
+            untrusted_text_list.append(untrusted_text)
+            stdout.write(stdisplay(untrusted_text))
+        stdout.flush()
     if len(argv) > 1:
         for file_arg in argv[1:]:
             with open(file_arg, mode="w", encoding="ascii") as file: