X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8c69934299322c189e72259c2b31545c94697ea8..44ce2010:/uip/whatnowsbr.c?ds=inline

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 919dd901..6c82e24d 100644
--- 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:
-		advise(NULL, "The -attach switch is deprecated");
-		continue;
-
-	    case NOATTACHSW:
-		advise(NULL, "The -noattach switch is deprecated");
-		continue;
 	    }
 	}
 	if (drft)
@@ -250,7 +238,7 @@ WhatNow (int argc, char **argv)
 	    if (msgnam)
 		showfile (++argp, msgnam);
 	    else
-		advise (NULL, "no alternate message to display");
+		inform("no alternate message to display");
 	    break;
 
 	case BUILDMIMESW:
@@ -284,7 +272,7 @@ WhatNow (int argc, char **argv)
 		removefile (drft);
 	    } else {
 		if (stat (drft, &st) != NOTOK)
-		    advise (NULL, "draft left on %s", drft);
+		    inform("draft left on %s", drft);
 	    }
 	    done (1);
 
@@ -385,7 +373,7 @@ WhatNow (int argc, char **argv)
 	    }
 
 	    if (n == -1)
-		advise(NULL, "usage is alist [-ln].");
+		inform("usage is alist [-ln].");
 
 	    else
 		annolist(drft, ATTACH_FIELD, l, n);
@@ -413,7 +401,7 @@ WhatNow (int argc, char **argv)
 	    }
 
 	    if (*(argp+1) == NULL) {
-		advise(NULL, "attach command requires file argument(s).");
+		inform("attach command requires file argument(s).");
 		break;
 	    }
 
@@ -532,7 +520,7 @@ WhatNow (int argc, char **argv)
 
 	default:
 	    /* Unknown command */
-	    advise (NULL, "say what?");
+	    inform("say what?");
 	    break;
 	}
     }
@@ -741,9 +729,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		    && (!reedit || (status & 0x00ff))) {
 		    if (!use && (status & 0xff00) &&
 			    (rename (file, cp = m_backup (file)) != NOTOK)) {
-			advise (NULL, "problems with edit--draft left in %s", cp);
+			inform("problems with edit--draft left in %s", cp);
 		    } else {
-			advise (NULL, "problems with edit--%s preserved", file);
+			inform("problems with edit--%s preserved", file);
 		    }
 		}
 		status = -2;	/* maybe "reedit ? -2 : -1"? */
@@ -833,7 +821,8 @@ sendfile (char **arg, char *file, int pushsw)
 	sleep (5);
     switch (child_id) {
 	case NOTOK:
-	    advise (NULL, "unable to fork, so sending directly...");
+	    inform("unable to fork, so sending directly...");
+	    /* FALLTHRU */
 	case OK:
 	    vec = argsplit(sendproc, &program, &vecp);
 	    if (pushsw)
@@ -947,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) \
@@ -1071,7 +1057,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		    ambigsw (cp, sendswitches);
 		    return;
 		case UNKWNSW:
-		    advise (NULL, "-%s unknown\n", cp);
+		    inform("-%s unknown\n", cp);
 		    return;
 
 		case SHELPSW:
@@ -1091,7 +1077,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
 		case SPLITSW:
 		    if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1) {
-			advise (NULL, "missing argument to %s", argp[-2]);
+			inform("missing argument to %s", argp[-2]);
 			return;
 		    }
 		    continue;
@@ -1119,7 +1105,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		    continue;
 
 		case DEBUGSW:
-		    debugsw++;	/* fall */
+		    debugsw++;
+		    /* FALLTHRU */
 		case NFILTSW:
 		case FRMTSW:
 		case NFRMTSW:
@@ -1159,7 +1146,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
 		case SASLMECHSW:
                     saslmech = *argp;
-		    /* fall thru */
+		    /* FALLTHRU */
 		case ALIASW:
 		case FILTSW:
 		case WIDTHSW:
@@ -1172,7 +1159,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case MESSAGEIDSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-') {
-			advise (NULL, "missing argument to %s", argp[-2]);
+			inform("missing argument to %s", argp[-2]);
 			return;
 		    }
 		    vec[vecp++] = cp;
@@ -1182,25 +1169,15 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SDRFSW:
 		case SDRMSW:
 		    if (!(cp = *argp++) || *cp == '-') {
-			advise (NULL, "missing argument to %s", argp[-2]);
+			inform("missing argument to %s", argp[-2]);
 			return;
 		    }
+		    /* FALLTHRU */
 		case SNDRFSW:
 		    continue;
-
-		case SNDATTACHSW:
-		    advise(NULL, "The -attach switch is deprecated");
-		    continue;
-		case SNDNOATTACHSW:
-		    advise(NULL, "The -noattach switch is deprecated");
-		    continue;
-
-		case SNDATTACHFORMAT:
-		    advise(NULL, "The -attachformat switch is deprecated");
-		    continue;
 	    }
 	}
-	advise (NULL, "usage: %s [switches]", sp);
+	inform("usage: %s [switches]", sp);
 	return;
     }
 
@@ -1334,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) {
@@ -1348,7 +1325,7 @@ checkmimeheader (char *drft)
 	case FLD:
 	case FLDPLUS:
 	    if (strcasecmp(name, VRSN_FIELD) == 0) {
-		advise(NULL, "Cannot use attach commands with already-"
+		inform("Cannot use attach commands with already-"
 		       "formatted MIME message \"%s\"", drft);
 		retval = 1;
 		break;