Changed ; to && in shell command, per Ralph's suggestion. There

[mmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 7b63762..4aaf921 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -97,7 +97,7 @@ static struct swit aleqs[] = {
 #define        PWDCMDSW                      11
     { "pwd", 0 },
 #define        LSCMDSW                       12
-    { "ls", 0 },
+    { "ls", 2 },
 #define        ATTACHCMDSW                   13
     { "attach", 0 },
 #define        DETACHCMDSW                   14
@@ -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,12 +247,17 @@ 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);
     for (;;) {
+#ifdef READLINE_SUPPORT
+       if (!(argp = getans_via_readline (prompt, aleqs))) {
+#else /* ! READLINE_SUPPORT */
        if (!(argp = getans (prompt, aleqs))) {
+#endif /* READLINE_SUPPORT */
            unlink (LINK);
            done (1);
        }
@@ -271,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;
 
@@ -327,7 +336,7 @@ WhatNow (int argc, char **argv)
             */
 
            if (*(argp+1) == (char *)0) {
-               (void)sprintf(buf, "$SHELL -c \"cd;pwd\"");
+               (void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");
            }
            else {
                writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
@@ -552,9 +561,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
      * new C99 mandated 'number of chars that would have been written'
      */
     /* length checks here and inside the loop allow for the
-     * trailing ';', trailcmd, '"' and NUL
+     * trailing "&&", trailcmd, '"' and NUL
      */
-    int trailln = strlen(trailcmd) + 3;
+    int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)
        adios((char *)0, "arguments too long");
     
@@ -570,9 +579,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
        cp += ln;
     }
     if (*trailcmd) {
-       *cp++ = ';';
+       *cp++ = '&'; *cp++ = '&';
        strcpy(cp, trailcmd);
-       cp += trailln - 3;
+       cp += trailln - 4;
     }
     *cp++ = '"';
     *cp = 0;
@@ -596,6 +605,11 @@ system_in_dir(const char *dir, const char *cmd)
 {
     char olddir[BUFSIZ];
     int r;
+
+    /* ensure that $SHELL exists, as the cmd was written relying on
+       a non-blank $SHELL... */
+    setenv("SHELL","/bin/sh",0); /* don't overwrite */
+
     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)
@@ -612,6 +626,11 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
 {
     char olddir[BUFSIZ];
     FILE *f;
+
+    /* ensure that $SHELL exists, as the cmd was written relying on
+       a non-blank $SHELL... */
+    setenv("SHELL","/bin/sh",0); /* don't overwrite */
+    
     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)
@@ -633,7 +652,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];
@@ -662,7 +681,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
@@ -762,7 +781,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;
@@ -812,16 +831,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;
 
     /*
@@ -900,7 +917,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);
@@ -1066,6 +1083,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 }
 };
 
@@ -1242,6 +1263,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]);