X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=43f4c0223de8178415429889a6eb0627dc408f67;hp=3e2dc60522518a04e750fb9a0bc9b18d29968a80;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90

diff --git a/uip/send.c b/uip/send.c
index 3e2dc60..43f4c02 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -3,6 +3,10 @@
  * send.c -- send a composed message
  *
  * $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.
  */
 
 #include <h/mh.h>
@@ -11,6 +15,12 @@
 #include <signal.h>
 
 
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* CYRUS_SASL */
+# define SASLminc(a)  0
+#endif /* CYRUS_SASL */
+
 static struct swit switches[] = {
 #define	ALIASW                 0
     { "alias aliasfile", 0 },
@@ -83,9 +93,21 @@ static struct swit switches[] = {
 #define	CLIESW                34
     { "client host", -6 },
 #define	SERVSW                35
-    { "server host", -6 },
+    { "server host", 6 },
 #define	SNOOPSW               36
-    { "snoop", -5 },
+    { "snoop", 5 },
+#define SASLSW                37
+    { "sasl", SASLminc(4) },
+#define SASLMECHSW            38
+    { "saslmech mechanism", SASLminc(-5) },
+#define USERSW                39
+    { "user username", SASLminc(-4) },
+#define ATTACHSW              40
+    { "attach", 6 },
+#define ATTACHFORMATSW        41
+    { "attachformat", 7 },
+#define PORTSW		      42
+    { "port server-port-name/number" , 4 },
     { NULL, 0 }
 };
 
@@ -111,7 +133,6 @@ extern char *altmsg;		/*  .. */
 extern char *annotext;
 extern char *distfile;
 
-extern int   errno;
 
 int
 main (int argc, char **argv)
@@ -124,6 +145,8 @@ main (int argc, char **argv)
     char *msgs[MAXARGS], *vec[MAXARGS];
     struct msgs *mp;
     struct stat st;
+    char	*attach = (char *)0;	/* header field name for attachments */
+    int attachformat = 0; /* mhbuild format specifier for attachments */
 #ifdef UCI
     FILE *fp;
 #endif /* UCI */
@@ -241,6 +264,7 @@ main (int argc, char **argv)
 		case SENDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -249,11 +273,34 @@ main (int argc, char **argv)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
+		case SASLMECHSW:
+		case USERSW:
+		case PORTSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    vec[vecp++] = cp;
 		    continue;
+		
+		case ATTACHSW:
+		    if (!(attach = *argp++) || *attach == '-')
+			adios (NULL, "missing argument to %s", argp[-2]);
+		    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;
+		    continue;
 	    }
 	} else {
 	    msgs[msgp++] = cp;
@@ -417,7 +464,8 @@ go_to_it:
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {
-	switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1)) {
+	switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1, attach,
+			 attachformat)) {
 	    case DONE: 
 		done (++status);
 	    case NOTOK: 
@@ -428,5 +476,6 @@ go_to_it:
     }
 
     context_save ();	/* save the context file */
-    return done (status);
+    done (status);
+    return 1;
 }