From ea4fe713607e40cf19df37cdd0699cacba7313a3 Mon Sep 17 00:00:00 2001 From: Daniel Xu Date: Mon, 19 Aug 2019 19:06:52 -0700 Subject: Strip carriage returns (^M) when filtering emails Presumably some email servers will transform newlines into carriage return new lines to better support windows users. I can't prove this but that's the best explanation I have for my hosted email provider (fastmail). Without this patch, I was seeing annoying `^M`s at the end of every filtered line. Signed-off-by: Daniel Xu --- filters/hldiff | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'filters/hldiff') diff --git a/filters/hldiff b/filters/hldiff index a17f17b..64e95d2 100755 --- a/filters/hldiff +++ b/filters/hldiff @@ -10,6 +10,9 @@ BEGIN { } { if (hit_diff == 0) { + # Strip carriage returns from line + gsub(/\r/, "", $0) + if ($0 ~ /^diff /) { hit_diff = 1; print bright $0 reset @@ -23,6 +26,9 @@ BEGIN { print $0 } } else { + # Strip carriage returns from line + gsub(/\r/, "", $0) + if ($0 ~ /^-/) { print red $0 reset } else if ($0 ~ /^\+/) { -- cgit v1.2.3