X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=7f0529e7ea95411fb7894f676553ebf11bbf87f4;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=5034121e806d29c92f3c17dc0528e8fefa153e90;hpb=a66c30d557c09799db7cd166ba5fa2a97dbafbb3;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 5034121..7f0529e 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -122,6 +122,10 @@ static struct swit switches[] = {
     { "tls", TLSminc(-3) },
 #define NTLSSW                47
     { "notls", TLSminc(-5) },
+#define MTSSW		      48
+    { "mts smtp|sendmail/smtp|sendmail/pipe", 2 },
+#define MESSAGEIDSW	      49
+    { "messageid localname|random", 2 },
     { NULL, 0 }
 };
 
@@ -198,10 +202,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [file] [switches]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DRAFTSW: 
 		    msgs[msgp++] = draft;
@@ -301,6 +305,8 @@ main (int argc, char **argv)
 		case SASLMXSSFSW:
 		case USERSW:
 		case PORTSW:
+		case MTSSW:
+		case MESSAGEIDSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -442,7 +448,8 @@ go_to_it:
 	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 */