X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=d23d141d88f967a722a06284023ab68558127268;hb=a66c30d557c09799db7cd166ba5fa2a97dbafbb3;hp=ac9dc3a516790d7d565a2dc967a5b1b0573169eb;hpb=3bede3fae77775088b8b66e7a26a5e2ee1f61fff;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ac9dc3a..d23d141 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -63,6 +63,8 @@ static struct swit whatnowswitches[] = {
     { "help", 0 },
 #define	ATTACHSW                8
     { "attach header-field-name", 0 },
+#define NOATTACHSW              9
+    { "noattach", 0 },
     { NULL, 0 }
 };
 
@@ -138,7 +140,7 @@ WhatNow (int argc, char **argv)
     char buf[BUFSIZ], prompt[BUFSIZ];
     char **argp, **arguments;
     struct stat st;
-    char	*attach = (char *)0;	/* attachment header field name */
+    char	*attach = NMH_ATTACH_HEADER;/* attachment header field name */
     char	cwd[MAXPATHLEN + 1];	/* current working directory */
     char	file[MAXPATHLEN + 1];	/* file name buffer */
     char	shell[MAXPATHLEN + 1];	/* shell response buffer */
@@ -213,11 +215,13 @@ WhatNow (int argc, char **argv)
 		continue;
 
 	    case ATTACHSW:
-		if (attach != (char *)0)
-		    adios(NULL, "only one attachment header field name at a time!");
 		if (!(attach = *argp++) || *attach == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
 		continue;
+
+	    case NOATTACHSW:
+	    	attach = NULL;
+		continue;
 	    }
 	}
 	if (drft)
@@ -1064,12 +1068,16 @@ static struct swit  sendswitches[] = {
     { "user", SASLminc(-4) },
 #define SNDATTACHSW       41
     { "attach file", 6 },
-#define SNDATTACHFORMAT   42
+#define SNDNOATTACHSW     42
+    { "noattach", 0 },
+#define SNDATTACHFORMAT   43
     { "attachformat", 7 },
-#define PORTSW		  43
+#define PORTSW		  44
     { "port server-port-name/number", 4 },
-#define TLSSW		  44
+#define TLSSW		  45
     { "tls", TLSminc(-3) },
+#define NTLSSW            46
+    { "notls", TLSminc(-5) },
     { NULL, 0 }
 };
 
@@ -1094,8 +1102,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *vec[MAXARGS];
     struct stat st;
-    char	*attach = (char *)0;	/* attachment header field name */
-    int		attachformat = 0;	/* mhbuild format specifier for
+    char	*attach = NMH_ATTACH_HEADER;/* attachment header field name */
+    int		attachformat = 1;	/* mhbuild format specifier for
 					   attachments */
 
 #ifndef	lint
@@ -1233,6 +1241,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SASLSW:
 		case NOSASLSW:
 		case TLSSW:
+		case NTLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -1268,6 +1277,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
 			return;
 		    }
 		    continue;
+		case SNDNOATTACHSW:
+		    attach = NULL;
+		    continue;
 
 		case SNDATTACHFORMAT:
 		    if (! *argp || **argp == '-')