X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/55f65ae2d3baf60396d3359db952460939de03ca..5b969d483185fb44407a99fbfbb1da2f5b3456ed:/uip/send.c?ds=sidebyside

diff --git a/uip/send.c b/uip/send.c
index c5c3f91a..3ba82fb5 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -62,8 +62,8 @@
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
-    X("attach", 6, ATTACHSW) \
-    X("noattach", 0, NOATTACHSW) \
+    X("attach", -6, ATTACHSW) \
+    X("noattach", -8, NOATTACHSW) \
     X("attachformat", 7, ATTACHFORMATSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
@@ -117,8 +117,6 @@ main (int argc, char **argv)
     char *msgs[MAXARGS], **vec;
     struct msgs *mp;
     struct stat st;
-    char *attach = NMH_ATTACH_HEADER;	/* header field name for attachments */
-    int attachformat = 1; /* mhbuild format specifier for attachments */
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -137,13 +135,19 @@ main (int argc, char **argv)
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {
-      vec[vecp++] = "-fileproc";
-      vec[vecp++] = cp;
+	vec[vecp++] = "-fileproc";
+	vec[vecp++] = cp;
     }
 
     if ((cp = context_find ("mhlproc"))) {
-      vec[vecp++] = "-mhlproc";
-      vec[vecp++] = cp;
+	vec[vecp++] = "-mhlproc";
+	vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("credentials"))) {
+	/* post doesn't read context so need to pass credentials. */
+	vec[vecp++] = "-credentials";
+	vec[vecp++] = cp;
     }
 
     while ((cp = *argp++)) {
@@ -267,26 +271,14 @@ main (int argc, char **argv)
 		    continue;
 		
 		case ATTACHSW:
-		    if (!(attach = *argp++) || *attach == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+		    advise(NULL, "The -attach switch is deprecated");
 		    continue;
 		case NOATTACHSW:
-		    attach = NULL;
+		    advise(NULL, "The -noattach switch is deprecated");
 		    continue;
 
 		case ATTACHFORMATSW:
-		    if (! *argp || **argp == '-')
-			adios (NULL, "missing argument to %s", argp[-1]);
-		    else {
-			attachformat = atoi (*argp);
-			if (attachformat < 0 ||
-			    attachformat > ATTACHFORMATS - 1) {
-			    advise (NULL, "unsupported attachformat %d",
-				    attachformat);
-			    continue;
-			}
-		    }
-		    ++argp;
+		    advise(NULL, "The -attachformat switch is deprecated");
 		    continue;
 	    }
 	} else {
@@ -308,12 +300,6 @@ main (int argc, char **argv)
 
     if (dfolder == NULL) {
 	if (msgp == 0) {
-#ifdef WHATNOW
-	    if ((cp = getenv ("mhdraft")) && *cp) {
-		msgs[msgp++] = cp;
-		goto go_to_it;
-	    }
-#endif /* WHATNOW */
 	    msgs[msgp++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
 	    if (stat (msgs[0], &st) == NOTOK)
 		adios (msgs[0], "unable to stat draft file");
@@ -440,8 +426,7 @@ go_to_it:
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {
-	switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, attach,
-			 attachformat)) {
+	switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1)) {
 	    case DONE: 
 		done (++status);
 	    case NOTOK: