Merge pull request #794 from erkin/current

T3354: Handle user break and prematurely closed stdin in strip-private

1 files changed, 12 insertions, 7 deletions

diff --git a/src/helpers/strip-private.py b/src/helpers/strip-private.py
index 023298eec..420a039eb 100755
--- a/src/helpers/strip-private.py
+++ b/src/helpers/strip-private.py
@@ -79,13 +79,18 @@ def strip_lines(rules: tuple) -> None:
     """
     Read stdin line by line and apply the given stripping rules.
     """
-    for line in sys.stdin:
-        if not args.keep_address:
-            line = strip_address(line)
-        for (condition, regexp, subst) in rules:
-            if condition:
-                line = regexp.sub(subst, line)
-        print(line, end='')
+    try:
+        for line in sys.stdin:
+            if not args.keep_address:
+                line = strip_address(line)
+            for (condition, regexp, subst) in rules:
+                if condition:
+                    line = regexp.sub(subst, line)
+            print(line, end='')
+    # stdin can be cut for any reason, such as user interrupt or the pager terminating before the text can be read.
+    # All we can do is gracefully exit.
+    except (BrokenPipeError, EOFError, KeyboardInterrupt):
+        sys.exit(1)
 
 if __name__ == "__main__":
     args = parser.parse_args()