Removed the undocumented -unique switches. Seems they were JLR-only stuff.

[mmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 4e93a1a..3ed0ea4 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -842,56 +842,24 @@ 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
-       { "unique", -6 },
-#define NUNIQSW  15
-       { "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  10
        { "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  11
        { "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  12
        { "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  13
        { "nowatch", 0 },
-#define WIDTHSW  20
+#define WIDTHSW  14
        { "width columns", 0 },
-#define SVERSIONSW  21
+#define SVERSIONSW  15
        { "version", 0 },
-#define SHELPSW  22
+#define SHELPSW  16
        { "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 }
 };
 
@@ -900,7 +868,6 @@ extern int debugsw;  /* from sendsbr.c */
 extern int forwsw;
 extern int inplace;
 extern int pushsw;
-extern int unique;
 extern int verbsw;
 
 extern char *altmsg;  /*  .. */
@@ -919,9 +886,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 #ifndef lint
        int distsw = 0;
 #endif
-#ifdef UCI
-       FILE *fp;
-#endif
 
        /*
        ** Make sure these are defined.  In particular, we need
@@ -959,7 +923,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
        debugsw = 0;
        forwsw = 1;
        inplace = 1;
-       unique = 0;
 
        altmsg = NULL;
        annotext = NULL;
@@ -995,12 +958,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
                                pushed = 0;
                                continue;
 
-                       case UNIQSW:
-                               unique++;
-                               continue;
-                       case NUNIQSW:
-                               unique = 0;
-                               continue;
                        case FORWSW:
                                forwsw++;
                                continue;
@@ -1022,28 +979,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",
@@ -1070,21 +1013,9 @@ sendit(char *sp, char **arg, char *file, int pushed)
                }
        }
 
-       if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0)
+       if (!(cp = getenv("SIGNATURE")) || !*cp)
                if ((cp = context_find("signature")) && *cp)
                        m_putenv("SIGNATURE", cp);
-#ifdef UCI
-               else {
-                       snprintf(buf, sizeof(buf), "%s/.signature", mypath);
-                       if ((fp = fopen(buf, "r")) != NULL &&
-                                       fgets(buf, sizeof(buf), fp) != NULL) {
-                               fclose(fp);
-                               if (cp = strchr(buf, '\n'))
-                                       *cp = 0;
-                               m_putenv("SIGNATURE", buf);
-                       }
-               }
-#endif /* UCI */
 
        if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
                annotext = NULL;