From f3cb7cde0e6f10451b6848678d95860d512224b9 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Thu, 9 Feb 2012 17:38:27 +0100
Subject: [PATCH] Removed -format and -filter from send(1); they were just
 passed to (s)post(8). -(no)format switches normalization of
 addresses on/off. If spost would support address
 normalization, then it should be always enabled or
 disabled. But as spost doesn't support it it's a no-op in
 mmh anyway. -filter is for generating non-MIME messages for
 Bcc recipients. We'll use MIME in this case ... as soon as
 this code is written. Note: spost is still lagging behind
 the current development.

---
 man/mh-chart.man1 |    4 ----
 man/send.man1     |   25 -------------------------
 uip/send.c        |   32 ++++++++++----------------------
 3 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/man/mh-chart.man1 b/man/mh-chart.man1
index 59263a3..a945ab2 100644
--- a/man/mh-chart.man1
+++ b/man/mh-chart.man1
@@ -587,10 +587,6 @@ all/to/cc/me]
 .B send
 .RB [ \-alias
 .IR aliasfile ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-nofilter ]
-.RB [ \-format " | " \-noformat ]
 .RB [ \-forward " | " \-noforward ]
 .RB [ \-push " | " \-nopush ]
 .RB [ \-verbose " | " \-noverbose ]
diff --git a/man/send.man1 b/man/send.man1
index e4ee40c..bb81ddb 100644
--- a/man/send.man1
+++ b/man/send.man1
@@ -10,10 +10,6 @@ send \- send a message
 .B send
 .RB [ \-alias
 .IR aliasfile ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-nofilter ]
-.RB [ \-format " | " \-noformat ]
 .RB [ \-forward " | " \-noforward ]
 .RB [ \-push " | " \-nopush ]
 .RB [ \-verbose " | " \-noverbose ]
@@ -151,14 +147,6 @@ it takes extra effort in most mailers to reply to the included
 message, and so would usually only be done deliberately, rather
 than by accident.
 .PP
-If
-.B \-filter
-.I filterfile
-is specified, then this copy is filtered
-(re\-formatted) by
-.B mhl
-prior to being sent to the blind recipients.
-.PP
 Prior to sending the message, the fields \*(lqFrom:\ user@local\*(rq,
 and \*(lqDate:\ now\*(rq will be appended to the headers in the message.
 If the environment variable
@@ -180,17 +168,6 @@ If the message already contains a \*(lqFrom:\*(rq field, then a
 \*(lqSender: user@local\*(rq field will be added as well.  (An already
 existing \*(lqSender:\*(rq field is an error!)
 .PP
-By using the
-.B \-format
-switch, each of the entries in the \*(lqTo:\*(rq
-and \*(lqCc:\*(rq fields will be replaced with \*(lqstandard\*(rq
-format entries.  This standard format is designed to be usable by all
-of the message handlers on the various systems around the Internet.
-If
-.B \-noformat
-is given, then headers are output exactly as they appear
-in the message draft.
-.PP
 If an \*(lqFcc:\ folder\*(rq is encountered, the message will be copied
 to the specified folder for the sender in the format in which it will
 appear to any non\-Bcc receivers of the message.  That is, it will have
@@ -237,8 +214,6 @@ comp(1), dist(1), forw(1), repl(1), mh\-alias(5), post(8)
 .SH DEFAULTS
 .nf
 .RB ` msg "' defaults to the current message in the draft folder"
-.RB ` \-nofilter '
-.RB ` \-format '
 .RB ` \-forward '
 .RB ` \-nopush '
 .RB ` \-noverbose '
diff --git a/uip/send.c b/uip/send.c
index c85ac8e..1529c0f 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -67,33 +67,25 @@ static struct swit switches[] = {
 	{ "alias aliasfile", 0 },
 #define DEBUGSW  1
 	{ "debug", -5 },
-#define FILTSW  2
-	{ "filter filterfile", 0 },
-#define NFILTSW  3
-	{ "nofilter", 0 },
-#define FRMTSW  4
-	{ "format", 0 },
-#define NFRMTSW  5
-	{ "noformat", 0 },
-#define FORWSW  6
+#define FORWSW  2
 	{ "forward", 0 },
-#define NFORWSW  7
+#define NFORWSW  3
 	{ "noforward", 0 },
-#define PUSHSW  8
+#define PUSHSW  4
 	{ "push", 0 },
-#define NPUSHSW  9
+#define NPUSHSW  5
 	{ "nopush", 0 },
-#define VERBSW  10
+#define VERBSW  6
 	{ "verbose", 0 },
-#define NVERBSW  11
+#define NVERBSW  7
 	{ "noverbose", 0 },
-#define WATCSW  12
+#define WATCSW  8
 	{ "watch", 0 },
-#define NWATCSW  13
+#define NWATCSW  9
 	{ "nowatch", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  10
 	{ "version", 0 },
-#define HELPSW  15
+#define HELPSW  11
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -172,16 +164,12 @@ main(int argc, char **argv)
 
 			case DEBUGSW:
 				debugsw++;  /* fall */
-			case NFILTSW:
-			case FRMTSW:
-			case NFRMTSW:
 			case WATCSW:
 			case NWATCSW:
 				vec[vecp++] = --cp;
 				continue;
 
 			case ALIASW:
-			case FILTSW:
 				vec[vecp++] = --cp;
 				if (!(cp = *argp++) || *cp == '-') {
 					adios(NULL, "missing argument to %s",
-- 
1.7.10.4