/*
* 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 *);
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;
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.
{
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)
{
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)
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 },
{ "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
- { "user", SASLminc(4) },
-#define SNDATTACHSW 39
+#define USERSW 40
+ { "user", SASLminc(-4) },
+#define SNDATTACHSW 41
{ "attach file", 6 },
-#define SNDATTACHFORMAT 40
+#define SNDNOATTACHSW 42
+ { "noattach", 0 },
+#define SNDATTACHFORMAT 43
{ "attachformat", 7 },
-#define PORTSW 41
+#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;
projects / mmh / blobdiff