/*
* whatnowsbr.c -- the WhatNow shell
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
{ "help", 0 },
#define ATTACHSW 8
{ "attach header-field-name", 0 },
+#define NOATTACHSW 9
+ { "noattach", 0 },
{ NULL, 0 }
};
#define PWDCMDSW 11
{ "pwd", 0 },
#define LSCMDSW 12
- { "ls", 0 },
+ { "ls", 2 },
#define ATTACHCMDSW 13
{ "attach", 0 },
#define DETACHCMDSW 14
* 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 *);
static int whomfile (char **, char *);
static int removefile (char *);
static void writelscmd(char *, int, char *, char **);
+static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
+static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
+static int system_in_dir(const char *dir, const char *cmd);
+
#ifdef HAVE_LSTAT
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 = (char *)0; /* 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 *attach = NMH_ATTACH_HEADER;/* attachment header field name */
+ 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 */
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)
continue;
case ATTACHSW:
- if (attach != (char *)0)
- adios(NULL, "only one attachment header field name at a time!");
if (!(attach = *argp++) || *attach == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
+
+ case NOATTACHSW:
+ attach = NULL;
+ continue;
}
}
if (drft)
msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
+ if ((cp = getenv ("mhatfile")) && *cp)
+ atfile = atoi(cp);
+
if ((cp = getenv ("mhuse")) && *cp)
use = atoi (cp);
}
/* 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);
}
/* 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;
* is accustomed to. Read back the absolute path.
*/
- if (*++argp == (char *)0) {
- (void)sprintf(buf, "$SHELL -c \"cd;pwd\"");
- }
- else if (strlen(*argp) >= BUFSIZ) {
- adios((char *)0, "arguments too long");
+ if (*(argp+1) == (char *)0) {
+ (void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");
}
else {
- (void)sprintf(buf, "$SHELL -c \"cd %s;cd %s;pwd\"", cwd, *argp);
+ writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
}
- if ((f = popen(buf, "r")) != (FILE *)0) {
+ if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
fgets(cwd, sizeof (cwd), f);
if (strchr(cwd, '\n') != (char *)0)
* Use the user's shell so that we can take advantage of any
* syntax that the user is accustomed to.
*/
- writelscmd(buf, sizeof(buf), cwd, argp);
- (void)system(buf);
+ writelscmd(buf, sizeof(buf), "", argp);
+ (void)system_in_dir(cwd, buf);
break;
case ALISTCMDSW:
break;
}
+ if (*(argp+1) == (char *)0) {
+ advise((char *)0, "attach command requires file argument(s).");
+ break;
+ }
+
/*
* Build a command line that causes the user's shell to list the file name
* arguments. This handles and wildcard expansion, tilde expansion, etc.
*/
- writelscmd(buf, sizeof(buf), cwd, argp);
+ writelscmd(buf, sizeof(buf), "-d", argp);
/*
* Read back the response from the shell, which contains a number of lines
* draft.
*/
- if ((f = popen(buf, "r")) != (FILE *)0) {
+ if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
while (fgets(shell, sizeof (shell), f) != (char *)0) {
*(strchr(shell, '\n')) = '\0';
* user's shell for wildcard expansion and other goodies. Do this from
* the current working directory if the argument is not an absolute path
* name (does not begin with a /).
+ *
+ * We feed all the file names to the shell at once, otherwise you can't
+ * provide a file name with a space in it.
*/
-
- else {
- for (arguments = argp + 1; *arguments != (char *)0; arguments++) {
- if (**arguments == '/') {
- if (strlen(*arguments) + sizeof ("$SHELL -c \"ls \"") >= sizeof (buf))
- adios((char *)0, "arguments too long");
-
- (void)sprintf(buf, "$SHELL -c \"ls %s\"", *arguments);
- }
- else {
- if (strlen(cwd) + strlen(*arguments) + sizeof ("$SHELL -c \" cd ; ls \"") >= sizeof (buf))
- adios((char *)0, "arguments too long");
-
- (void)sprintf(buf, "$SHELL -c \" cd %s;ls %s\"", cwd, *arguments);
- }
-
- if ((f = popen(buf, "r")) != (FILE *)0) {
- while (fgets(shell, sizeof (cwd), f) != (char *)0) {
- *(strchr(shell, '\n')) = '\0';
- (void)annotate(drft, attach, shell, 1, 0, 0, 1);
- }
-
- pclose(f);
- }
- else {
- advise("popen", "could not get file from shell");
- }
+ writelscmd(buf, sizeof(buf), "-d", argp);
+ if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
+ while (fgets(shell, sizeof (shell), f) != (char *)0) {
+ *(strchr(shell, '\n')) = '\0';
+ (void)annotate(drft, attach, shell, 1, 0, 0, 1);
}
+ pclose(f);
+ } else {
+ advise("popen", "could not get file from shell");
}
break;
}
-/*
- * Build a command line that causes the user's shell to list the file name
- * arguments. This handles and wildcard expansion, tilde expansion, etc.
- */
+
+/* Build a command line of the form $SHELL -c "cd 'cwd'; cmd argp ... ; trailcmd". */
static void
-writelscmd(char *buf, int bufsz, char *cwd, char **argp)
+writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
{
char *cp;
- int ln = snprintf(buf, bufsz, "$SHELL -c \" cd %s;ls", cwd);
+ /* Note that we do not quote -- the argp from the user
+ * is assumed to be quoted as they desire. (We can't treat
+ * it as pure literal as that would prevent them using ~,
+ * wildcards, etc.) The buffer produced by this function
+ * should be given to popen_in_dir() or system_in_dir() so
+ * that the current working directory is set correctly.
+ */
+ int ln = snprintf(buf, bufsz, "$SHELL -c \"%s", cmd);
/* NB that some snprintf() return -1 on overflow rather than the
* new C99 mandated 'number of chars that would have been written'
*/
/* length checks here and inside the loop allow for the
- * trailing " and NUL
+ * trailing "&&", trailcmd, '"' and NUL
*/
- if (ln < 0 || ln + 2 > bufsz)
+ int trailln = strlen(trailcmd) + 4;
+ if (ln < 0 || ln + trailln > bufsz)
adios((char *)0, "arguments too long");
cp = buf + ln;
while (*++argp != (char *)0) {
ln = strlen(*argp);
- /* +3 for leading space and trailing quote and NUL */
- if (ln + 3 > bufsz - (cp-buf))
+ /* +1 for leading space */
+ if (ln + trailln + 1 > bufsz - (cp-buf))
adios((char *)0, "arguments too long");
*cp++ = ' ';
memcpy(cp, *argp, ln+1);
cp += ln;
}
+ if (*trailcmd) {
+ *cp++ = '&'; *cp++ = '&';
+ strcpy(cp, trailcmd);
+ cp += trailln - 4;
+ }
*cp++ = '"';
*cp = 0;
}
/*
+ * Build a command line that causes the user's shell to list the file name
+ * arguments. This handles and wildcard expansion, tilde expansion, etc.
+ */
+static void
+writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)
+{
+ char *lscmd = concat ("ls ", lsoptions, " --", NULL);
+ writesomecmd(buf, bufsz, lscmd, "", argp);
+ free (lscmd);
+}
+
+/* Like system(), but run the command in directory dir.
+ * This assumes the program is single-threaded!
+ */
+static int
+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)
+ adios("chdir", "could not change working directory");
+ r = system(cmd);
+ if (chdir(olddir) != 0)
+ adios("chdir", "could not change working directory");
+ return r;
+}
+
+/* ditto for popen() */
+static FILE*
+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)
+ adios("chdir", "could not change working directory");
+ f = popen(cmd, type);
+ if (chdir(olddir) != 0)
+ adios("chdir", "could not change working directory");
+ return f;
+}
+
+
+/*
* EDIT
*/
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];
struct stat st;
#ifdef HAVE_LSTAT
- int slinked;
-#if 0
- int oumask; /* PJS: for setting permissions on symlinks. */
-#endif
+ int slinked = 0;
#endif /* HAVE_LSTAT */
/* Was there a previous edit session? */
*ed = defaulteditor;
}
- if (altmsg) {
+ if (altmsg && atfile) {
if (mp == NULL || *altmsg == '/' || cwd == NULL)
strncpy (altpath, altmsg, sizeof(altpath));
else
strncpy (linkpath, LINK, sizeof(linkpath));
else
snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
- }
- if (altmsg) {
unlink (linkpath);
#ifdef HAVE_LSTAT
if (link (altpath, linkpath) == NOTOK) {
-#if 0
- /* I don't think permission on symlinks matters /JLR */
- oumask = umask(0044); /* PJS: else symlinks are world 'r' */
-#endif
symlink (altpath, linkpath);
-#if 0
- umask(oumask); /* PJS: else symlinks are world 'r' */
-#endif
slinked = 1;
} else {
slinked = 0;
context_save (); /* save the context file */
fflush (stdout);
- switch (pid = vfork ()) {
+ switch (pid = vfork()) {
case NOTOK:
advise ("fork", "unable to");
status = NOTOK;
default:
if ((status = pidwait (pid, NOTOK))) {
-#ifdef ATTVIBUG
- if ((cp = r1bindex (*ed, '/'))
- && strcmp (cp, "vi") == 0
- && (status & 0x00ff) == 0)
- status = 0;
- else {
-#endif
if (((status & 0xff00) != 0xff00)
&& (!reedit || (status & 0x00ff))) {
if (!use && (status & 0xff00) &&
}
status = -2; /* maybe "reedit ? -2 : -1"? */
break;
-#ifdef ATTVIBUG
- }
-#endif
}
reedit++;
edsave = getcpy (*ed);
*ed = NULL;
- if (altmsg)
+ if (altmsg && atfile)
unlink (linkpath);
return status;
/* 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;
/*
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);
# define SASLminc(a) 0
#endif /* CYRUS_SASL */
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else /* TLS_SUPPORT */
+# define TLSminc(a) 0
+#endif /* TLS_SUPPORT */
+
static struct swit sendswitches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
#define CLIESW 30
{ "client host", -6 },
#define SERVSW 31
- { "server host", -6 },
+ { "server host", 6 },
#define SNOOPSW 32
{ "snoop", -5 },
#define SDRFSW 33
{ "nodraftfolder", -3 },
#define SASLSW 36
{ "sasl", SASLminc(-4) },
-#define SASLMECHSW 37
+#define NOSASLSW 37
+ { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW 38
+ { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW 39
{ "saslmech", SASLminc(-5) },
-#define USERSW 38
+#define USERSW 40
{ "user", SASLminc(-4) },
-#define SNDATTACHSW 39
+#define SNDATTACHSW 41
{ "attach file", 6 },
-#define SNDATTACHFORMAT 40
+#define SNDNOATTACHSW 42
+ { "noattach", 0 },
+#define SNDATTACHFORMAT 43
{ "attachformat", 7 },
+#define PORTSW 44
+ { "port server-port-name/number", 4 },
+#define TLSSW 45
+ { "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 }
};
char *cp, buf[BUFSIZ], **argp;
char **arguments, *vec[MAXARGS];
struct stat st;
- char *attach = (char *)0; /* attachment header field name */
- int attachformat = 0; /* mhbuild format specifier for
+ char *attach = NMH_ATTACH_HEADER;/* attachment header field name */
+ int attachformat = 1; /* mhbuild format specifier for
attachments */
#ifndef lint
int distsw = 0;
#endif
-#ifdef UCI
- FILE *fp;
-#endif
/*
* Make sure these are defined. In particular, we need
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
+ if ((cp = context_find ("fileproc"))) {
+ vec[vecp++] = "-fileproc";
+ vec[vecp++] = cp;
+ }
+
+ if ((cp = context_find ("mhlproc"))) {
+ vec[vecp++] = "-mhlproc";
+ vec[vecp++] = cp;
+ }
+
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, sendswitches)) {
case SOMLSW:
case SNOOPSW:
case SASLSW:
+ case NOSASLSW:
+ case TLSSW:
+ case NTLSSW:
vec[vecp++] = --cp;
continue;
case WIDTHSW:
case CLIESW:
case SERVSW:
+ case SASLMXSSFSW:
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]);
return;
}
continue;
+ case SNDNOATTACHSW:
+ attach = NULL;
+ continue;
case SNDATTACHFORMAT:
if (! *argp || **argp == '-')
if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
if ((cp = context_find ("signature")) && *cp)
m_putenv ("SIGNATURE", cp);
-#ifdef UCI
- else {
- snprintf (buf, sizeof(buf), "%s/.signature", mypath);
- if ((fp = fopen (buf, "r")) != NULL
- && fgets (buf, sizeof(buf), fp) != NULL) {
- fclose (fp);
- if (cp = strchr (buf, '\n'))
- *cp = 0;
- m_putenv ("SIGNATURE", buf);
- }
- }
-#endif /* UCI */
if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
annotext = NULL;
#endif /* not lint */
&& altmsg) {
vec[vecp++] = "-dist";
- distfile = getcpy (m_scratch (altmsg, invo_name));
+ distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
+ unlink(distfile);
if (link (altmsg, distfile) == NOTOK)
adios (distfile, "unable to link %s to", altmsg);
} else {
context_save (); /* save the context file */
fflush (stdout);
- switch (pid = vfork ()) {
+ switch (pid = vfork()) {
case NOTOK:
advise ("fork", "unable to");
return 1;