From f1789cfcef342342246af95d355fca8515f92198 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Sep 2017 15:37:36 +0200
Subject: [PATCH] mshow: add -F to disable MIME filters

---
 man/mshow.1 | 4 +++-
 mshow.c     | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/man/mshow.1 b/man/mshow.1
index ef439ed..dbb0d9d 100644
--- a/man/mshow.1
+++ b/man/mshow.1
@@ -8,7 +8,7 @@
 .Nm
 .Op Fl h Ar headers
 .Op Fl A Ar mimetypes
-.Op Fl nqrHLN
+.Op Fl nqrFHLN
 .Op Ar msgs\ ...
 .Nm
 .Fl x Ar msg
@@ -62,6 +62,8 @@ Don't render the body, stop after header output.
 .It Fl r
 Don't render the body, print raw body.
 This may be dangerous to use on a tty.
+.It Fl F
+Don't apply filters to MIME parts.
 .It Fl H
 Don't decode the headers, print all raw headers.
 This may be dangerous to use on a tty.
diff --git a/mshow.c b/mshow.c
index e37e7fe..eff8c76 100644
--- a/mshow.c
+++ b/mshow.c
@@ -18,6 +18,7 @@
 static int rflag;
 static int Rflag;
 static int qflag;
+static int Fflag;
 static int Hflag;
 static int Lflag;
 static int Nflag;
@@ -727,12 +728,13 @@ main(int argc, char *argv[])
 	pid_t pid1 = -1, pid2 = -1;
 
 	int c;
-	while ((c = getopt(argc, argv, "h:A:qrtHLNx:O:Rn")) != -1)
+	while ((c = getopt(argc, argv, "h:A:qrtFHLNx:O:Rn")) != -1)
 		switch (c) {
 		case 'h': hflag = optarg; break;
 		case 'A': Aflag = optarg; break;
 		case 'q': qflag = 1; break;
 		case 'r': rflag = 1; break;
+		case 'F': Fflag = 1; break;
 		case 'H': Hflag = 1; break;
 		case 'L': Lflag = 1; break;
 		case 'N': Nflag = 1; break;
@@ -743,7 +745,7 @@ main(int argc, char *argv[])
 		case 'n': nflag = 1; break;
 		default:
 			fprintf(stderr,
-			    "Usage: mshow [-h headers] [-A mimetypes] [-nqrHLN] [msgs...]\n"
+			    "Usage: mshow [-h headers] [-A mimetypes] [-nqrFHLN] [msgs...]\n"
 			    "	    mshow -x msg parts...\n"
 			    "	    mshow -O msg parts...\n"
 			    "	    mshow -t msgs...\n"
@@ -788,7 +790,7 @@ main(int argc, char *argv[])
 	} else if (Rflag) { // render for reply
 		blaze822_loop(argc-optind, argv+optind, reply);
 	} else { // show
-		if (!(qflag || rflag)) {
+		if (!(qflag || rflag || Fflag)) {
 			char *f = getenv("MAILFILTER");
 			if (!f)
 				f = blaze822_home_file("filter");