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

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 6830bfb..1d21bd3 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -113,7 +113,7 @@ static char *myprompt = "\nWhat now? ";
  * static prototypes
  */
 static int editfile (char **, char **, char *, int, struct msgs *,
-	char *, char *, int);
+	char *, char *, int, int);
 static int sendfile (char **, char *, int);
 static void sendit (char *, char **, char *, int);
 static int buildfile (char **, char *);
@@ -134,16 +134,16 @@ static int copyf (char *, char *);
 int
 WhatNow (int argc, char **argv)
 {
-    int isdf = 0, nedit = 0, use = 0;
+    int isdf = 0, nedit = 0, use = 0, atfile = 1;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;
     char buf[BUFSIZ], prompt[BUFSIZ];
     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)
@@ -235,6 +235,9 @@ WhatNow (int argc, char **argv)
 
     msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
 
+    if ((cp = getenv ("mhatfile")) && *cp)
+    	atfile = atoi(cp);
+
     if ((cp = getenv ("mhuse")) && *cp)
 	use = atoi (cp);
 
@@ -244,7 +247,8 @@ WhatNow (int argc, char **argv)
     }
 
     /* start editing the draft, unless -noedit was given */
-    if (!nedit && editfile (&ed, NULL, drft, use, NULL, msgnam, NULL, 1) < 0)
+    if (!nedit && editfile (&ed, NULL, drft, use, NULL, msgnam,
+    			    NULL, 1, atfile) < 0)
 	done (1);
 
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
@@ -275,7 +279,8 @@ WhatNow (int argc, char **argv)
 	    /* Call an editor on the draft file */
 	    if (*++argp)
 		ed = *argp++;
-	    if (editfile (&ed, argp, drft, NOUSE, NULL, msgnam, NULL, 1) == NOTOK)
+	    if (editfile (&ed, argp, drft, NOUSE, NULL, msgnam,
+	    		  NULL, 1, atfile) == NOTOK)
 		done (1);
 	    break;
 
@@ -637,7 +642,7 @@ static char *edsave = NULL;	/* the editor we used previously */
 
 static int
 editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
-	  char *altmsg, char *cwd, int save_editor)
+	  char *altmsg, char *cwd, int save_editor, int atfile)
 {
     int pid, status, vecp;
     char altpath[BUFSIZ], linkpath[BUFSIZ];
@@ -666,7 +671,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 	    *ed = defaulteditor;
     }
 
-    if (altmsg) {
+    if (altmsg && atfile) {
 	if (mp == NULL || *altmsg == '/' || cwd == NULL)
 	    strncpy (altpath, altmsg, sizeof(altpath));
 	else
@@ -766,7 +771,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 	edsave = getcpy (*ed);
 
     *ed = NULL;
-    if (altmsg)
+    if (altmsg && atfile)
 	unlink (linkpath);
 
     return status;
@@ -816,16 +821,14 @@ 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)))
+	    && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0)))
 	return 0;
 
     /*
@@ -904,7 +907,7 @@ buildfile (char **argp, char *file)
 	args[i++] = *argp++;
     args[i] = NULL;
 
-    i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0);
+    i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0, 0);
     free (args);
 
     return (i ? NOTOK : OK);
@@ -1070,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 }
 };
 
@@ -1246,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]);