X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=ad7570a532f3c4e8eee748be38d84915855e9f92;hb=0d56141609e3b3f3834bce689e093ae4a8413944;hp=da2debde06cde0c683fe10e81f25684d94d2f8a2;hpb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index da2debd..ad7570a 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -2,8 +2,6 @@
 /*
  * whatnowsbr.c -- the WhatNow shell
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -411,6 +409,11 @@ WhatNow (int argc, char **argv)
 		break;
 	    }
 
+	    if (*(argp+1) == (char *)0) {
+		advise((char *)0, "attach command requires file argument(s).");
+		break;
+	    }
+
 	    /*
 	     *	Build a command line that causes the user's shell to list the file name
 	     *	arguments.  This handles and wildcard expansion, tilde expansion, etc.
@@ -980,6 +983,12 @@ check_draft (char *msgnam)
 # define SASLminc(a)  0
 #endif /* CYRUS_SASL */
 
+#ifndef TLS_SUPPORT
+# define TLSminc(a)  (a)
+#else /* TLS_SUPPORT */
+# define TLSminc(a)   0
+#endif /* TLS_SUPPORT */
+
 static struct swit  sendswitches[] = {
 #define	ALIASW            0
     { "alias aliasfile", 0 },
@@ -1058,13 +1067,15 @@ static struct swit  sendswitches[] = {
 #define SASLMECHSW       37
     { "saslmech", SASLminc(-5) },
 #define USERSW           38
-    { "user", SASLminc(4) },
+    { "user", SASLminc(-4) },
 #define SNDATTACHSW       39
     { "attach file", 6 },
 #define SNDATTACHFORMAT   40
     { "attachformat", 7 },
 #define PORTSW		  41
     { "port server-port-name/number", 4 },
+#define TLSSW		  42
+    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -1146,6 +1157,16 @@ sendit (char *sp, char **arg, char *file, int pushed)
     vec[vecp++] = "-library";
     vec[vecp++] = getcpy (m_maildir (""));
 
+    if ((cp = context_find ("fileproc"))) {
+      vec[vecp++] = "-fileproc";
+      vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("mhlproc"))) {
+      vec[vecp++] = "-mhlproc";
+      vec[vecp++] = cp;
+    }
+
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, sendswitches)) {
@@ -1219,6 +1240,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SOMLSW:
 		case SNOOPSW:
 		case SASLSW:
+		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;