From 3a2993ae0a411209ac7d51180c781662139f882b Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Sat, 28 Jan 2012 16:05:54 +0100
Subject: [PATCH] forw/repl/dist annotations won't add address lists anymore.
 spost does not support it and I wonder if we need it.
 Remove the undocumented -idanno switch, actually a no-op,
 from spost.

---
 man/dist.man1 |    6 ++----
 man/forw.man1 |    6 ++----
 man/repl.man1 |    4 +---
 uip/sendsbr.c |   14 ++++----------
 uip/spost.c   |    9 ---------
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/man/dist.man1 b/man/dist.man1
index 59bcd19..a1eeab4 100644
--- a/man/dist.man1
+++ b/man/dist.man1
@@ -68,13 +68,11 @@ Use care in constructing the headers for the redistribution.
 If the
 .B \-annotate
 switch is given, the  message being distributed will
-be annotated with the lines:
+be annotated with the line:
 
      Resent:\ date
-     Resent:\ addrs
 
-where each address list contains as many lines as required.  This
-annotation will be done only if the message is sent directly from
+This annotation will be done only if the message is sent directly from
 .BR dist .
 If the message is not sent immediately from
 .BR dist ,
diff --git a/man/forw.man1 b/man/forw.man1
index 4ed1f42..2f3fa6e 100644
--- a/man/forw.man1
+++ b/man/forw.man1
@@ -75,17 +75,15 @@ alternate forms file with the switch
 If the
 .B \-annotate
 switch is given, each message being forwarded will
-be annotated with the lines:
+be annotated with the line:
 .PP
 .RS 5
 .nf
 Forwarded:\ date
-Forwarded:\ addrs
 .fi
 .RE
 .PP
-where each address list contains as many lines as required.  This
-annotation will be done only if the message is sent directly from
+This annotation will be done only if the message is sent directly from
 .BR forw .
 If the message is not sent immediately from
 .BR forw ,
diff --git a/man/repl.man1 b/man/repl.man1
index 48378d7..ed020c2 100644
--- a/man/repl.man1
+++ b/man/repl.man1
@@ -288,16 +288,14 @@ will care.
 If the
 .B \-annotate
 switch is given, the message being replied\-to will
-be annotated with the lines
+be annotated with the line:
 .PP
 .RS 5
 .nf
 Replied:\ date
-Replied:\ addrs
 .fi
 .RE
 .PP
-where the address list contains one line for each addressee.
 The annotation will be done only if the message is sent directly from
 .BR repl .
 If the message is not sent immediately from
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index b2a298c..8eb67cc 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -478,20 +478,14 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
 	int i, status, fd, fd2;
-	char backup[BUFSIZ], buf[BUFSIZ];
+	char backup[BUFSIZ];
 
 	fd = pushsw ? tmp_fd() : NOTOK;
 	fd2 = NOTOK;
 
 	vec[vecp++] = drft;
-	if (annotext) {
-		if ((fd2 = tmp_fd()) != NOTOK) {
-			vec[vecp++] = "-idanno";
-			snprintf(buf, sizeof(buf), "%d", fd2);
-			vec[vecp++] = buf;
-		} else {
-			admonish(NULL, "unable to create file for annotation list");
-		}
+	if (annotext && (fd2 = tmp_fd()) == NOTOK) {
+		admonish(NULL, "unable to create file for annotation list");
 	}
 	if (distfile && distout(drft, distfile, backup) == NOTOK)
 		done(1);
@@ -768,7 +762,7 @@ annoaux(int fd)
 		if (is_selected(mp, msgnum)) {
 			if (debugsw)
 				advise(NULL, "annotate message %d", msgnum);
-			annotate(m_name (msgnum), annotext, cp, inplace,
+			annotate(m_name(msgnum), annotext, cp, inplace,
 					1, -2, 0);
 		}
 	}
diff --git a/uip/spost.c b/uip/spost.c
index 947904e..f2552dc 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -64,8 +64,6 @@ struct swit switches[] = {
 	{ "nopush", -6 },
 #define LIBSW  20
 	{ "library directory", -7 },
-#define ANNOSW  21
-	{ "idanno number", -6 },
 	{ NULL, 0 }
 };
 
@@ -300,13 +298,6 @@ main(int argc, char **argv)
 				if (context_foil(cp) == -1)
 					done(1);
 				continue;
-
-			case ANNOSW:
-				/* -idanno switch ignored */
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				continue;
 			}
 		}
 		if (msg)
-- 
1.7.10.4