Removed unneeded options from send.

Most of them were supported by post but are not by spost.
We don't need them. (More about dashstuffing soon.)

diff --git a/man/send.man1 b/man/send.man1
index 6e7b19e..3cb64ab 100644 (file)
--- a/man/send.man1
+++ b/man/send.man1
@@ -15,15 +15,9 @@ send \- send a message
 .RB [ \-nofilter ]
 .RB [ \-format " | " \-noformat ]
 .RB [ \-forward " | " \-noforward ]
-.RB [ \-mime " | " \-nomime ]
-.RB [ \-msgid " | " \-nomsgid ]
 .RB [ \-push " | " \-nopush ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-watch " | " \-nowatch ]
-.RB [ \-server
-.IR servername ]
-.RB [ \-port
-.IR port-name/number ]
 .RB [ \-width
 .IR columns ]
 .RB [ msg
@@ -166,12 +160,6 @@ is specified, then this copy is filtered
 (re\-formatted) by
 .B mhl
 prior to being sent to the blind recipients.
-Alternately, if you specify the
-.B -mime
-switch, then
-.B send
-will
-use the MIME rules for encapsulation.
 .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.
@@ -183,10 +171,6 @@ line of the message.  If this environment variable is not set, then
 .B send
 will consult the profile entry \*(lqSignature\*(rq for
 this information.
-If
-.B \-msgid
-is specified, then a \*(lqMessage\-ID:\*(rq field will also
-be added to the message.
 .PP
 If
 .B send
@@ -222,16 +206,6 @@ switch, the user can direct
 .B send
 as to how long it should make header lines containing addresses.
 .PP
-If nmh is using the SMTP MTA, the
-.B \-server
-and the
-.B \-port
-switches can be used to override the default mail server (defined by the
-.RI servers
-entry in
-.I %etcdir%/mts.conf
-).
-.PP
 The files specified by the profile entry \*(lqAliasfile:\*(rq and any
 additional alias files given by the
 .B \-alias
@@ -275,8 +249,6 @@ comp(1), dist(1), forw(1), repl(1), mh\-alias(5), post(8)
 .RB ` \-nofilter '
 .RB ` \-format '
 .RB ` \-forward '
-.RB ` \-nomime '
-.RB ` \-nomsgid '
 .RB ` \-nopush '
 .RB ` \-noverbose '
 .RB ` \-nowatch '

diff --git a/uip/send.c b/uip/send.c
index 2092c37..e77f2b1 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -29,56 +29,28 @@ static struct swit switches[] = {
        { "forward", 0 },
 #define NFORWSW  7
        { "noforward", 0 },
-#define MIMESW  8
-       { "mime", 0 },
-#define NMIMESW  9
-       { "nomime", 0 },
-#define MSGDSW  10
-       { "msgid", 0 },
-#define NMSGDSW  11
-       { "nomsgid", 0 },
-#define PUSHSW  12
+#define PUSHSW  8
        { "push", 0 },
-#define NPUSHSW  13
+#define NPUSHSW  9
        { "nopush", 0 },
-#define UNIQSW  14
+#define UNIQSW  10
        { "unique", -6 },
-#define NUNIQSW  15
+#define NUNIQSW  11
        { "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  12
        { "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  13
        { "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  14
        { "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  15
        { "nowatch", 0 },
-#define WIDTHSW  20
+#define WIDTHSW  16
        { "width columns", 0 },
-#define VERSIONSW  21
+#define VERSIONSW  17
        { "version", 0 },
-#define HELPSW  22
+#define HELPSW  18
        { "help", 0 },
-#define BITSTUFFSW  23
-       { "dashstuffing", -12 },
-#define NBITSTUFFSW  24
-       { "nodashstuffing", -14 },
-#define MAILSW  25
-       { "mail", -4 },
-#define SAMLSW  26
-       { "saml", -4 },
-#define SENDSW  27
-       { "send", -4 },
-#define SOMLSW  28
-       { "soml", -4 },
-#define CLIESW  29
-       { "client host", -6 },
-#define SERVSW  30
-       { "server host", 6 },
-#define SNOOPSW  31
-       { "snoop", 5 },
-#define PORTSW  32
-       { "port server-port-name/number" , 4 },
        { NULL, 0 }
 };
 
@@ -98,7 +70,6 @@ int
 main(int argc, char **argv)
 {
        int msgp = 0, distsw = 0, vecp = 1;
-       int mime = 0;
        int msgnum, status;
        char *cp, *maildir = NULL;
        char buf[BUFSIZ], **ap, **argp, **arguments;
@@ -169,40 +140,19 @@ main(int argc, char **argv)
                                vec[vecp++] = --cp;
                                continue;
 
-                       case MIMESW:
-                               mime++;
-                               vec[vecp++] = --cp;
-                               continue;
-                       case NMIMESW:
-                               mime = 0;
-                               vec[vecp++] = --cp;
-                               continue;
-
                        case DEBUGSW:
                                debugsw++;  /* fall */
                        case NFILTSW:
                        case FRMTSW:
                        case NFRMTSW:
-                       case BITSTUFFSW:
-                       case NBITSTUFFSW:
-                       case MSGDSW:
-                       case NMSGDSW:
                        case WATCSW:
                        case NWATCSW:
-                       case MAILSW:
-                       case SAMLSW:
-                       case SENDSW:
-                       case SOMLSW:
-                       case SNOOPSW:
                                vec[vecp++] = --cp;
                                continue;
 
                        case ALIASW:
                        case FILTSW:
                        case WIDTHSW:
-                       case CLIESW:
-                       case SERVSW:
-                       case PORTSW:
                                vec[vecp++] = --cp;
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 45f33c7..79f7c6f 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -842,56 +842,28 @@ static struct swit  sendswitches[] = {
        { "forward", 0 },
 #define NFORWSW  7
        { "noforward", 0 },
-#define MIMESW  8
-       { "mime", 0 },
-#define NMIMESW  9
-       { "nomime", 0 },
-#define MSGDSW  10
-       { "msgid", 0 },
-#define NMSGDSW  11
-       { "nomsgid", 0 },
-#define SPSHSW  12
+#define SPSHSW  8
        { "push", 0 },
-#define NSPSHSW  13
+#define NSPSHSW  9
        { "nopush", 0 },
-#define UNIQSW  14
+#define UNIQSW  10
        { "unique", -6 },
-#define NUNIQSW  15
+#define NUNIQSW  11
        { "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  12
        { "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  13
        { "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  14
        { "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  15
        { "nowatch", 0 },
-#define WIDTHSW  20
+#define WIDTHSW  16
        { "width columns", 0 },
-#define SVERSIONSW  21
+#define SVERSIONSW  17
        { "version", 0 },
-#define SHELPSW  22
+#define SHELPSW  18
        { "help", 0 },
-#define BITSTUFFSW  23
-       { "dashstuffing", -12 },
-#define NBITSTUFFSW  24
-       { "nodashstuffing", -14 },
-#define MAILSW  25
-       { "mail", -4 },
-#define SAMLSW  26
-       { "saml", -4 },
-#define SSNDSW  27
-       { "send", -4 },
-#define SOMLSW  28
-       { "soml", -4 },
-#define CLIESW  29
-       { "client host", -6 },
-#define SERVSW  30
-       { "server host", 6 },
-#define SNOOPSW  31
-       { "snoop", -5 },
-#define PORTSW  32
-       { "port server-port-name/number", 4 },
        { NULL, 0 }
 };
 
@@ -1019,28 +991,14 @@ sendit(char *sp, char **arg, char *file, int pushed)
                        case NFILTSW:
                        case FRMTSW:
                        case NFRMTSW:
-                       case BITSTUFFSW:
-                       case NBITSTUFFSW:
-                       case MIMESW:
-                       case NMIMESW:
-                       case MSGDSW:
-                       case NMSGDSW:
                        case WATCSW:
                        case NWATCSW:
-                       case MAILSW:
-                       case SAMLSW:
-                       case SSNDSW:
-                       case SOMLSW:
-                       case SNOOPSW:
                                vec[vecp++] = --cp;
                                continue;
 
                        case ALIASW:
                        case FILTSW:
                        case WIDTHSW:
-                       case CLIESW:
-                       case SERVSW:
-                       case PORTSW:
                                vec[vecp++] = --cp;
                                if (!(cp = *argp++) || *cp == '-') {
                                        advise(NULL, "missing argument to %s",