X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e2eebc77cc570f77d906bc0cc6890092068468cb..3dee7d930cb47c5aa4c8cb0d4707debd213fefb1:/uip/whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 21fb1519..303f1b86 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -233,9 +233,9 @@ WhatNow (int argc, char **argv)
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {
 #ifdef READLINE_SUPPORT
-	if (!(argp = getans_via_readline (prompt, aleqs))) {
+	if (!(argp = read_switch_multiword_via_readline (prompt, aleqs))) {
 #else /* ! READLINE_SUPPORT */
-	if (!(argp = getans (prompt, aleqs))) {
+	if (!(argp = read_switch_multiword (prompt, aleqs))) {
 #endif /* READLINE_SUPPORT */
 	    (void) m_unlink (LINK);
 	    done (1);
@@ -953,6 +953,7 @@ buildfile (char **argp, char *file)
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
+    X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 
@@ -1142,6 +1143,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SASLMECHSW:
 		case USERSW:
 		case PORTSW:
+		case MTSSM:
 		case MTSSW:
 		case MESSAGEIDSW:
 		    vec[vecp++] = --cp;
@@ -1253,10 +1255,10 @@ whomfile (char **arg, char *file)
 
 	case OK:
 	    vec = argsplit(whomproc, &program, &vecp);
-	    vec[vecp++] = file;
 	    if (arg)
 		while (*arg)
 		    vec[vecp++] = *arg++;
+	    vec[vecp++] = file;
 	    vec[vecp] = NULL;
 
 	    execvp (program, vec);
@@ -1285,7 +1287,7 @@ removefile (char *drft)
 
 
 /*
- * Return 1 if we already have a MIME-Verson header, 0 otherwise.
+ * Return 1 if we already have a MIME-Version header, 0 otherwise.
  */
 
 static int