From 7999b44de8cbec405d2e2b2965eb031e1761db5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Jan 2018 23:50:54 +0100
Subject: mverify: properly quote the sed mess

---
 contrib/mverify | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib')

diff --git a/contrib/mverify b/contrib/mverify
index 4ba0213..d5b21e7 100755
--- a/contrib/mverify
+++ b/contrib/mverify
@@ -5,7 +5,7 @@
 
 [ "$#" -eq 0 ] && set -- .
 
-mshow -t "$1" | awk -v "msg=$1" '
+mshow -t "$1" | DOS2UNIX='/
$/!s/$/
/' awk -v "msg=$1" '
 { match($0, "^ *"); indent = RLENGTH }
 $2 == "text/plain" { plain++ }
 $2 == "multipart/signed" { signed = 0+$1; si = indent; next }
@@ -20,7 +20,7 @@ END {
 		exit(100)
 	} else if (type == "application/pgp-signature") {
 		exit(system("mshow -r -O " q(msg) " " q(content) \
-			" | sed \"/
$/!s/$/
/\" | " \
+			" | sed $DOS2UNIX | " \
 			" { mshow -O " q(msg) " " q(signature) \
 			" | gpg --verify - /dev/fd/3; } 3<&0"))
 	} else if (type == "application/pkcs7-signature") {
-- 
cgit 1.4.1