X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=577abacd163804a47c678f76db00d93fef6ea8f5;hb=e7129bf90a1b361e07365002379d8d2874c0f771;hp=39d425f57ba9c91f3c030978fd055fec4f2c6340;hpb=03fe41ba1d68108808c966c6d7ff74bd8c1d648c;p=mmh

diff --git a/uip/send.c b/uip/send.c
old mode 100644
new mode 100755
index 39d425f..577abac
--- a/uip/send.c
+++ b/uip/send.c
@@ -102,18 +102,26 @@ static struct swit switches[] = {
     { "snoop", 5 },
 #define SASLSW                37
     { "sasl", SASLminc(4) },
-#define SASLMECHSW            38
+#define NOSASLSW              38
+    { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW           39
+    { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW            40
     { "saslmech mechanism", SASLminc(-5) },
-#define USERSW                39
+#define USERSW                41
     { "user username", SASLminc(-4) },
-#define ATTACHSW              40
+#define ATTACHSW              42
     { "attach", 6 },
-#define ATTACHFORMATSW        41
+#define NOATTACHSW            43
+    { "noattach", 0 },
+#define ATTACHFORMATSW        44
     { "attachformat", 7 },
-#define PORTSW		      42
+#define PORTSW		      45
     { "port server-port-name/number" , 4 },
-#define TLSSW		      43
+#define TLSSW		      46
     { "tls", TLSminc(-3) },
+#define NTLSSW                47
+    { "notls", TLSminc(-5) },
     { NULL, 0 }
 };
 
@@ -151,8 +159,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 */
+    char *attach = NMH_ATTACH_HEADER;	/* header field name for attachments */
+    int attachformat = 1; /* mhbuild format specifier for attachments */
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -278,7 +286,9 @@ main (int argc, char **argv)
 		case SOMLSW: 
 		case SNOOPSW: 
 		case SASLSW:
+		case NOSASLSW:
 		case TLSSW:
+		case NTLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -288,6 +298,7 @@ main (int argc, char **argv)
 		case CLIESW: 
 		case SERVSW: 
 		case SASLMECHSW:
+		case SASLMXSSFSW:
 		case USERSW:
 		case PORTSW:
 		    vec[vecp++] = --cp;
@@ -300,6 +311,9 @@ main (int argc, char **argv)
 		    if (!(attach = *argp++) || *attach == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
+		case NOATTACHSW:
+		    attach = NULL;
+		    continue;
 
 		case ATTACHFORMATSW:
 		    if (! *argp || **argp == '-')
@@ -426,8 +440,10 @@ go_to_it:
 	    && altmsg) {
 	vec[vecp++] = "-dist";
 	distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+	unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK) {
-	    if (errno != EXDEV
+	    /* Cygwin with FAT32 filesystem produces EPERM. */
+	    if (errno != EXDEV  &&  errno != EPERM
 #ifdef EISREMOTE
 		    && errno != EISREMOTE
 #endif /* EISREMOTE */