X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=1d21bd355af2e43b439d447ef9ff54d9e13a6e5d;hb=9f8f8b1e1d553774865f2c177191c359c3dc652c;hp=ddfc998ce3633d4d77f122ad0de845ed81887340;hpb=358131df8b64ef0c6020dbe9ec61e11cecdef356;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ddfc998..1d21bd3 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -141,9 +141,9 @@ WhatNow (int argc, char **argv)
     char **argp, **arguments;
     struct stat st;
     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 */
+    char	cwd[PATH_MAX + 1];	/* current working directory */
+    char	file[PATH_MAX + 1];	/* file name buffer */
+    char	shell[PATH_MAX + 1];	/* shell response buffer */
     FILE	*f;			/* read pointer for bgnd proc */
     char	*l;			/* set on -l to alist  command */
     int		n;			/* set on -n to alist command */
@@ -176,10 +176,10 @@ WhatNow (int argc, char **argv)
 	    case HELPSW:
 		snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 		print_help (buf, whatnowswitches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case DFOLDSW:
 		if (dfolder)
@@ -821,14 +821,12 @@ sendfile (char **arg, char *file, int pushsw)
     /* Translate MIME composition file, if necessary */
     if ((cp = context_find ("automimeproc"))
 	    && (!strcmp (cp, "1"))
-	    && !getenv ("NOMHNPROC")
 	    && check_draft (file)
 	    && (buildfile (NULL, file) == NOTOK))
 	return 0;
 
     /* For backwards compatibility */
     if ((cp = context_find ("automhnproc"))
-	    && !getenv ("NOMHNPROC")
 	    && check_draft (file)
 	    && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0)))
 	return 0;
@@ -1075,6 +1073,10 @@ static struct swit  sendswitches[] = {
     { "tls", TLSminc(-3) },
 #define NTLSSW            46
     { "notls", TLSminc(-5) },
+#define MTSSW		  47
+    { "mts smtp|sendmail/smtp|sendmail/pipe", 2 },
+#define MESSAGEIDSW	  48
+    { "messageid localname|random", 2 },
     { NULL, 0 }
 };
 
@@ -1251,6 +1253,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SASLMECHSW:
 		case USERSW:
 		case PORTSW:
+		case MTSSW:
+		case MESSAGEIDSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-') {
 			advise (NULL, "missing argument to %s", argp[-2]);