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.

diff --git a/man/dist.man1 b/man/dist.man1
index 59bcd19bc5868a4304e99fe053251ebc97e39119..a1eeab42d807aed01657f8965f82a139d5b68ca2 100644 (file)
--- 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 4ed1f423997cd31085e99587cf992772cceb7dc7..2f3fa6e0a57798cbf82a1af9b67557ed0561e73f 100644 (file)
--- 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 48378d74f1f98022c732ddf90f59f5f58787ce8e..ed020c23481634ede604a7ad3fc25b90bcb36310 100644 (file)
--- 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 b2a298cd04fc87a20762d890b9aa1b8a302750e0..8eb67cc8eae016e19d74f3f0688dc93aa1998edb 100644 (file)
--- 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 947904e83036bb16f1bf00ff3d5208e854b7ebc5..f2552dc9836dedb9ce4f88b0371dac3469e444a2 100644 (file)
--- 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)