sbr/mf.c: Rename path to routepath to avoid h/mh.h clash.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index e2e0ceb64546ab41a72bc3b63253d0aee05d5f73..6c82e24dd1c445c52248d715f4199b6a9d42d85e 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * whatnowsbr.c -- the WhatNow shell
+/* whatnowsbr.c -- the WhatNow shell
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -57,8 +55,6 @@
     X("prompt string", 4, PRMPTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
-    X("attach header-field-name", -6, ATTACHSW) \
-    X("noattach", -8, NOATTACHSW) \
 
 
 #define X(sw, minchars, id) id,
@@ -197,14 +193,6 @@ WhatNow (int argc, char **argv)
                if (!(myprompt = *argp++) || *myprompt == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
-
-           case ATTACHSW:
-               inform("The -attach switch is deprecated");
-               continue;
-
-           case NOATTACHSW:
-               inform("The -noattach switch is deprecated");
-               continue;
            }
        }
        if (drft)
@@ -948,9 +936,6 @@ buildfile (char **argp, char *file)
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(4), USERSW) \
-    X("attach fieldname", 6, SNDATTACHSW) \
-    X("noattach", 0, SNDNOATTACHSW) \
-    X("attachformat", 7, SNDATTACHFORMAT) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
@@ -1190,17 +1175,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    /* FALLTHRU */
                case SNDRFSW:
                    continue;
-
-               case SNDATTACHSW:
-                   inform("The -attach switch is deprecated");
-                   continue;
-               case SNDNOATTACHSW:
-                   inform("The -noattach switch is deprecated");
-                   continue;
-
-               case SNDATTACHFORMAT:
-                   inform("The -attachformat switch is deprecated");
-                   continue;
            }
        }
        inform("usage: %s [switches]", sp);
@@ -1337,7 +1311,7 @@ checkmimeheader (char *drft)
 {
     FILE *f;
     m_getfld_state_t gstate = 0;
-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];
     int state, retval = 0;
 
     if ((f = fopen(drft, "r")) == NULL) {