* pwd command and exists to allow the user
* to verify the directory.
*
- * attach files This option attaches the named files to
- * the draft.
+ * attach [-v] files This option attaches the named files to
+ * the draft. -v displays the mhbuild
+ * directive that send(1) will use.
*
* alist [-ln] This option lists the attachments on the
* draft. -l gets long listings, -n gets
#include <h/mh.h>
#include <fcntl.h>
-#include <signal.h>
#include <h/mime.h>
#include <h/utils.h>
+#ifdef OAUTH_SUPPORT
+# include <h/oauth.h>
+#endif
+
#define WHATNOW_SWITCHES \
X("draftfolder +folder", 0, DFOLDSW) \
X("draftmessage msg", 0, DMSGSW) \
X("prompt string", 4, PRMPTSW) \
X("version", 0, VERSIONSW) \
X("help", 0, HELPSW) \
- X("attach header-field-name", 0, ATTACHSW) \
- X("noattach", 0, NOATTACHSW) \
+ X("attach header-field-name", -6, ATTACHSW) \
+ X("noattach", -8, NOATTACHSW) \
+
#define X(sw, minchars, id) id,
DEFINE_SWITCH_ENUM(WHATNOW);
X("cd [directory]", 0, CDCMDSW) \
X("pwd", 0, PWDCMDSW) \
X("ls", 2, LSCMDSW) \
- X("attach", 0, ATTACHCMDSW) \
- X("detach [-n]", 2, DETACHCMDSW) \
+ X("attach [-v]", 0, ATTACHCMDSW) \
+ X("detach [-n]", 0, DETACHCMDSW) \
X("alist [-ln] ", 2, ALISTCMDSW) \
#define X(sw, minchars, id) id,
static int sendfile (char **, char *, int);
static void sendit (char *, char **, char *, int);
static int buildfile (char **, char *);
-static int check_draft (char *);
static int whomfile (char **, char *);
static int removefile (char *);
+static int checkmimeheader (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 *);
-#endif
int
char buf[BUFSIZ], prompt[BUFSIZ];
char **argp, **arguments;
struct stat st;
- 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 */
char *l; /* set on -l to alist command */
int n; /* set on -n to alist command */
+ /* Need this if called from what_now(). */
invo_name = r1bindex (argv[0], '/');
- /* read user profile/context */
- context_read();
-
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
* Get the initial current working directory.
*/
- if (getcwd(cwd, sizeof (cwd)) == (char *)0) {
+ if (getcwd(cwd, sizeof (cwd)) == NULL) {
adios("getcwd", "could not get working directory");
}
continue;
case ATTACHSW:
- if (!(attach = *argp++) || *attach == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ advise(NULL, "The -attach switch is deprecated");
continue;
case NOATTACHSW:
- attach = NULL;
+ advise(NULL, "The -noattach switch is deprecated");
continue;
}
}
if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)
drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
- msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
+ msgnam = (cp = getenv ("mhaltmsg")) && *cp ? mh_xstrdup(cp) : NULL;
if ((cp = getenv ("mhatfile")) && *cp)
atfile = atoi(cp);
snprintf (prompt, sizeof(prompt), myprompt, invo_name);
for (;;) {
#ifdef READLINE_SUPPORT
- if (!(argp = getans_via_readline (prompt, aleqs))) {
+ if (!(argp = read_switch_multiword_via_readline (prompt, aleqs))) {
#else /* ! READLINE_SUPPORT */
- if (!(argp = getans (prompt, aleqs))) {
+ if (!(argp = read_switch_multiword (prompt, aleqs))) {
#endif /* READLINE_SUPPORT */
- unlink (LINK);
+ (void) m_unlink (LINK);
done (1);
}
switch (smatch (*argp, aleqs)) {
* is accustomed to. Read back the absolute path.
*/
- if (*(argp+1) == (char *)0) {
- (void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");
+ if (*(argp+1) == NULL) {
+ strcpy(buf, "$SHELL -c \"cd&&pwd\"");
}
else {
writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
}
- if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
- fgets(cwd, sizeof (cwd), f);
-
- if (strchr(cwd, '\n') != (char *)0)
- *strchr(cwd, '\n') = '\0';
-
+ if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
+ if (fgets(cwd, sizeof (cwd), f) == NULL) {
+ advise (buf, "fgets");
+ }
+ TrimSuffixC(cwd, '\n');
pclose(f);
}
else {
* -n numbers listing
*/
- if (attach == (char *)0) {
- advise((char *)0, "can't list because no header field name was given.");
+ if (checkmimeheader(drft))
break;
- }
- l = (char *)0;
+ l = NULL;
n = 0;
- while (*++argp != (char *)0) {
+ while (*++argp != NULL) {
if (strcmp(*argp, "-l") == 0)
l = "/";
}
if (n == -1)
- advise((char *)0, "usage is alist [-ln].");
+ advise(NULL, "usage is alist [-ln].");
else
- annolist(drft, attach, l, n);
+ annolist(drft, ATTACH_FIELD, l, n);
break;
- case ATTACHCMDSW:
+ case ATTACHCMDSW: {
/*
* Attach files to current draft.
*/
- if (attach == (char *)0) {
- advise((char *)0, "can't attach because no header field name was given.");
+ int verbose = 0;
+ char **ap;
+
+ if (checkmimeheader(drft))
break;
+
+ for (ap = argp+1; *ap; ++ap) {
+ if (strcmp(*ap, "-v") == 0) {
+ ++argp;
+ verbose = 1;
+ } else if (*ap[0] != '-') {
+ break;
+ }
}
- if (*(argp+1) == (char *)0) {
- advise((char *)0, "attach command requires file argument(s).");
+ if (*(argp+1) == NULL) {
+ advise(NULL, "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), "-d", argp);
+ writelscmd(buf, sizeof(buf), "-d --", argp);
/*
* Read back the response from the shell, which contains a number of lines
* draft.
*/
- if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
- while (fgets(shell, sizeof (shell), f) != (char *)0) {
- *(strchr(shell, '\n')) = '\0';
+ if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
+ while (fgets(shell, sizeof (shell), f) != NULL) {
+ char *ctype;
+
+ TrimSuffixC(shell, '\n');
+
+ if (*shell == '/') {
+ strncpy(file, shell, sizeof(file));
+ file[sizeof(file) - 1] = '\0';
+ } else {
+ snprintf(file, sizeof(file), "%s/%s", cwd, shell);
+ }
- if (*shell == '/')
- (void)annotate(drft, attach, shell, 1, 0, -2, 1);
- else {
- (void)sprintf(file, "%s/%s", cwd, shell);
- (void)annotate(drft, attach, file, 1, 0, -2, 1);
+ annotate(drft, ATTACH_FIELD, file, 1, 0, -2, 1);
+ if (verbose) {
+ ctype = mime_type(file);
+ printf ("Attaching %s as a %s\n", file, ctype);
+ free (ctype);
}
}
}
break;
-
+ }
case DETACHCMDSW:
/*
* Detach files from current draft.
*/
- if (attach == (char *)0) {
- advise((char *)0, "can't detach because no header field name was given.");
- break;
- }
-
/*
* Scan the arguments for a -n. Mixed file names and numbers aren't allowed,
* so this catches a -n anywhere in the argument list.
*/
- for (n = 0, arguments = argp + 1; *arguments != (char *)0; arguments++) {
+ if (checkmimeheader(drft))
+ break;
+
+ for (n = 0, arguments = argp + 1; *arguments != NULL; arguments++) {
if (strcmp(*arguments, "-n") == 0) {
n = 1;
break;
*/
if (n == 1) {
- for (arguments = argp + 1; *arguments != (char *)0; arguments++) {
+ for (arguments = argp + 1; *arguments != NULL; arguments++) {
if (strcmp(*arguments, "-n") == 0)
continue;
if (**arguments != '\0') {
n = atoi(*arguments);
- (void)annotate(drft, attach, (char *)0, 1, 0, n, 1);
+ annotate(drft, ATTACH_FIELD, NULL, 1, 0, n, 1);
- for (argp = arguments + 1; *argp != (char *)0; argp++) {
+ for (argp = arguments + 1; *argp != NULL; argp++) {
if (atoi(*argp) > n) {
if (atoi(*argp) == 1)
*argp = "";
* We feed all the file names to the shell at once, otherwise you can't
* provide a file name with a space in it.
*/
- 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);
+ writelscmd(buf, sizeof(buf), "-d --", argp);
+ if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
+ while (fgets(shell, sizeof (shell), f) != NULL) {
+ TrimSuffixC(shell, '\n');
+ annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1);
}
pclose(f);
} else {
*/
int trailln = strlen(trailcmd) + 4;
if (ln < 0 || ln + trailln > bufsz)
- adios((char *)0, "arguments too long");
-
+ adios(NULL, "arguments too long");
+
cp = buf + ln;
-
- while (*++argp != (char *)0) {
+
+ while (*argp && *++argp) {
ln = strlen(*argp);
/* +1 for leading space */
if (ln + trailln + 1 > bufsz - (cp-buf))
- adios((char *)0, "arguments too long");
+ adios(NULL, "arguments too long");
*cp++ = ' ';
memcpy(cp, *argp, ln+1);
cp += ln;
static void
writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)
{
- char *lscmd = concat ("ls ", lsoptions, " --", NULL);
+ char *lscmd = concat ("ls ", lsoptions, NULL);
writesomecmd(buf, bufsz, lscmd, "", argp);
free (lscmd);
}
/* 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)
{
int pid, status, vecp;
char altpath[BUFSIZ], linkpath[BUFSIZ];
- char *cp, *vec[MAXARGS];
+ char *cp, *prog, **vec;
struct stat st;
-#ifdef HAVE_LSTAT
int slinked = 0;
-#endif /* HAVE_LSTAT */
/* Was there a previous edit session? */
- if (reedit) {
+ if (reedit && (*ed || edsave)) {
if (!*ed) { /* no explicit editor */
*ed = edsave; /* so use the previous one */
if ((cp = r1bindex (*ed, '/')) == NULL)
snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
if (atfile) {
- unlink (linkpath);
-#ifdef HAVE_LSTAT
+ (void) m_unlink (linkpath);
if (link (altpath, linkpath) == NOTOK) {
- symlink (altpath, linkpath);
+ if (symlink (altpath, linkpath) < 0) {
+ adios (linkpath, "symlink");
+ }
slinked = 1;
} else {
slinked = 0;
}
-#else /* not HAVE_LSTAT */
- link (altpath, linkpath);
-#endif /* not HAVE_LSTAT */
}
}
context_save (); /* save the context file */
fflush (stdout);
- switch (pid = vfork()) {
+ switch (pid = fork()) {
case NOTOK:
advise ("fork", "unable to");
status = NOTOK;
break;
case OK:
- if (cwd)
- chdir (cwd);
+ if (cwd) {
+ if (chdir (cwd) < 0) {
+ advise (cwd, "chdir");
+ }
+ }
if (altmsg) {
if (mp)
m_putenv ("mhfolder", mp->foldpath);
m_putenv ("editalt", altpath);
}
- vecp = 0;
- vec[vecp++] = r1bindex (*ed, '/');
+ vec = argsplit(*ed, &prog, &vecp);
+
if (arg)
while (*arg)
vec[vecp++] = *arg++;
vec[vecp++] = file;
vec[vecp] = NULL;
- execvp (*ed, vec);
+ execvp (prog, vec);
fprintf (stderr, "unable to exec ");
perror (*ed);
_exit (-1);
}
reedit++;
-#ifdef HAVE_LSTAT
if (altmsg
&& mp
&& !is_readonly(mp)
&& copyf (linkpath, altpath) == NOTOK
: stat (linkpath, &st) != NOTOK
&& st.st_nlink == 1
- && (unlink (altpath) == NOTOK
+ && (m_unlink (altpath) == NOTOK
|| link (linkpath, altpath) == NOTOK)))
advise (linkpath, "unable to update %s from", altmsg);
-#else /* HAVE_LSTAT */
- if (altmsg
- && mp
- && !is_readonly(mp)
- && stat (linkpath, &st) != NOTOK
- && st.st_nlink == 1
- && (unlink (altpath) == NOTOK
- || link (linkpath, altpath) == NOTOK))
- advise (linkpath, "unable to update %s from", altmsg);
-#endif /* HAVE_LSTAT */
}
/* normally, we remember which editor we used */
*ed = NULL;
if (altmsg && atfile)
- unlink (linkpath);
+ (void) m_unlink (linkpath);
return status;
}
-#ifdef HAVE_LSTAT
static int
copyf (char *ifile, char *ofile)
{
close (out);
return i;
}
-#endif /* HAVE_LSTAT */
/*
{
pid_t child_id;
int i, vecp;
- char *cp, *sp, *vec[MAXARGS];
-
- /* Translate MIME composition file, if necessary */
- if ((cp = context_find ("automimeproc"))
- && (!strcmp (cp, "1"))
- && check_draft (file)
- && (buildfile (NULL, file) == NOTOK))
- return 0;
-
- /* For backwards compatibility */
- if ((cp = context_find ("automhnproc"))
- && check_draft (file)
- && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0)))
- return 0;
+ char *cp, *sp, **vec, *program;
/*
* If the sendproc is the nmh command `send', then we call
context_save (); /* save the context file */
fflush (stdout);
- for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
sleep (5);
switch (child_id) {
case NOTOK:
advise (NULL, "unable to fork, so sending directly...");
case OK:
- vecp = 0;
- vec[vecp++] = invo_name;
+ vec = argsplit(sendproc, &program, &vecp);
if (pushsw)
vec[vecp++] = "-push";
if (arg)
vec[vecp++] = file;
vec[vecp] = NULL;
- execvp (sendproc, vec);
+ execvp (program, vec);
fprintf (stderr, "unable to exec ");
perror (sendproc);
_exit (-1);
}
-/*
- * Check if draft is a mhbuild composition file
- */
-
-static int
-check_draft (char *msgnam)
-{
- int state;
- char buf[BUFSIZ], name[NAMESZ];
- FILE *fp;
-
- if ((fp = fopen (msgnam, "r")) == NULL)
- return 0;
- for (state = FLD;;)
- switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
- case FLD:
- case FLDPLUS:
- case FLDEOF:
- /*
- * If draft already contains any of the
- * Content-XXX fields, then assume it already
- * been converted.
- */
- if (uprf (name, XXX_FIELD_PRF)) {
- fclose (fp);
- return 0;
- }
- while (state == FLDPLUS)
- state = m_getfld (state, name, buf, sizeof(buf), fp);
- break;
-
- case BODY:
- do {
- char *bp;
-
- for (bp = buf; *bp; bp++)
- if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
- fclose (fp);
- return 1;
- }
-
- state = m_getfld (state, name, buf, sizeof(buf), fp);
- } while (state == BODY);
- /* and fall... */
-
- default:
- fclose (fp);
- return 0;
- }
-}
-
-
#ifndef CYRUS_SASL
# define SASLminc(a) (a)
#else /* CYRUS_SASL */
X("help", 0, SHELPSW) \
X("dashstuffing", -12, BITSTUFFSW) \
X("nodashstuffing", -14, NBITSTUFFSW) \
- X("mail", -4, MAILSW) \
- X("saml", -4, SAMLSW) \
- X("send", -4, SSNDSW) \
- X("soml", -4, SOMLSW) \
X("client host", -6, CLIESW) \
X("server host", 6, SERVSW) \
X("snoop", -5, SNOOPSW) \
- X("draftfolder +folder", -6, SDRFSW) \
- X("draftmessage msg", -6, SDRMSW) \
- X("nodraftfolder", -3, SNDRFSW) \
- X("sasl", SASLminc(-4), SASLSW) \
- X("nosasl", SASLminc(-6), NOSASLSW) \
- X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
- X("saslmech", SASLminc(-5), SASLMECHSW) \
- X("user", SASLminc(-4), USERSW) \
- X("attach file", 6, SNDATTACHSW) \
+ X("draftfolder +folder", 0, SDRFSW) \
+ X("draftmessage msg", 0, SDRMSW) \
+ X("nodraftfolder", 0, SNDRFSW) \
+ X("sasl", SASLminc(4), SASLSW) \
+ X("nosasl", SASLminc(6), NOSASLSW) \
+ X("saslmech", SASLminc(5), SASLMECHSW) \
+ X("authservice", SASLminc(0), AUTHSERVICESW) \
+ X("user username", SASLminc(4), USERSW) \
+ X("attach fieldname", 6, SNDATTACHSW) \
X("noattach", 0, SNDNOATTACHSW) \
X("attachformat", 7, SNDATTACHFORMAT) \
X("port server-port-name/number", 4, PORTSW) \
X("tls", TLSminc(-3), TLSSW) \
+ X("initialtls", TLSminc(-10), INITTLSSW) \
X("notls", TLSminc(-5), NTLSSW) \
+ X("sendmail program", 0, MTSSM) \
X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
X("messageid localname|random", 2, MESSAGEIDSW) \
sendit (char *sp, char **arg, char *file, int pushed)
{
int vecp, n = 1;
- char *cp, buf[BUFSIZ], **argp;
- char **arguments, *vec[MAXARGS];
+ char *cp, buf[BUFSIZ], **argp, *program;
+ char **arguments, *savearg[MAXARGS], **vec;
+ const char *user = NULL, *saslmech = NULL;
+ char *auth_svc = NULL;
+ int snoop = 0;
struct stat st;
- char *attach = NMH_ATTACH_HEADER;/* attachment header field name */
- int attachformat = 1; /* mhbuild format specifier for
- attachments */
#ifndef lint
int distsw = 0;
/*
* Make sure these are defined. In particular, we need
- * vec[1] to be NULL, in case "arg" is NULL below. It
- * doesn't matter what is the value of vec[0], but we
+ * savearg[1] to be NULL, in case "arg" is NULL below. It
+ * doesn't matter what is the value of savearg[0], but we
* set it to NULL, to help catch "off-by-one" errors.
*/
- vec[0] = NULL;
- vec[1] = NULL;
+ savearg[0] = NULL;
+ savearg[1] = NULL;
/*
- * Temporarily copy arg to vec, since the brkstring() call in
+ * Temporarily copy arg to savearg, since the brkstring() call in
* getarguments() will wipe it out before it is merged in.
- * Also, we skip the first element of vec, since getarguments()
+ * Also, we skip the first element of savearg, since getarguments()
* skips it. Then we count the number of arguments
* copied. The value of "n" will be one greater than
* this in order to simulate the standard argc/argv.
if (arg) {
char **bp;
- copyip (arg, vec+1, MAXARGS-1);
- bp = vec+1;
+ copyip (arg, savearg+1, MAXARGS-1);
+ bp = savearg+1;
while (*bp++)
n++;
}
/*
- * Merge any arguments from command line (now in vec)
+ * Merge any arguments from command line (now in savearg)
* and arguments from profile.
*/
- arguments = getarguments (sp, n, vec, 1);
+ arguments = getarguments (sp, n, savearg, 1);
argp = arguments;
debugsw = 0;
annotext = NULL;
distfile = NULL;
- vecp = 1; /* we'll get the zero'th element later */
+ /*
+ * Get our initial arguments for postproc now
+ */
+
+ vec = argsplit(postproc, &program, &vecp);
+
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
if ((cp = context_find ("fileproc"))) {
- vec[vecp++] = "-fileproc";
- vec[vecp++] = cp;
+ vec[vecp++] = "-fileproc";
+ vec[vecp++] = cp;
}
if ((cp = context_find ("mhlproc"))) {
- vec[vecp++] = "-mhlproc";
- vec[vecp++] = cp;
+ vec[vecp++] = "-mhlproc";
+ vec[vecp++] = cp;
+ }
+
+ if ((cp = context_find ("credentials"))) {
+ /* post doesn't read context so need to pass credentials. */
+ vec[vecp++] = "-credentials";
+ vec[vecp++] = cp;
}
while ((cp = *argp++)) {
case NMSGDSW:
case WATCSW:
case NWATCSW:
- case MAILSW:
- case SAMLSW:
- case SSNDSW:
- case SOMLSW:
- case SNOOPSW:
case SASLSW:
case NOSASLSW:
case TLSSW:
+ case INITTLSSW:
case NTLSSW:
vec[vecp++] = --cp;
continue;
+ case SNOOPSW:
+ snoop++;
+ vec[vecp++] = --cp;
+ continue;
+
+ case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+ if (!(auth_svc = *argp++) || *auth_svc == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+#else
+ NMH_UNUSED (user);
+ NMH_UNUSED (auth_svc);
+ adios (NULL, "not built with OAuth support");
+#endif
+ continue;
+
+ case SASLMECHSW:
+ saslmech = *argp;
+ /* fall thru */
case ALIASW:
case FILTSW:
case WIDTHSW:
case CLIESW:
case SERVSW:
- case SASLMXSSFSW:
- case SASLMECHSW:
case USERSW:
case PORTSW:
+ case MTSSM:
case MTSSW:
case MESSAGEIDSW:
vec[vecp++] = --cp;
return;
}
vec[vecp++] = cp;
+ user = cp;
continue;
case SDRFSW:
continue;
case SNDATTACHSW:
- if (!(attach = *argp++) || *attach == '-') {
- advise (NULL, "missing argument to %s", argp[-2]);
- return;
- }
+ advise(NULL, "The -attach switch is deprecated");
continue;
case SNDNOATTACHSW:
- attach = NULL;
+ advise(NULL, "The -noattach switch is deprecated");
continue;
case SNDATTACHFORMAT:
- if (! *argp || **argp == '-')
- adios (NULL, "missing argument to %s", argp[-1]);
- else {
- attachformat = atoi (*argp);
- if (attachformat < 0 ||
- attachformat > ATTACHFORMATS - 1) {
- advise (NULL, "unsupported attachformat %d",
- attachformat);
- continue;
- }
- }
- ++argp;
+ advise(NULL, "The -attachformat switch is deprecated");
continue;
}
}
if ((cp = context_find ("Aliasfile"))) {
char **ap, *dp;
- dp = getcpy (cp);
+ dp = mh_xstrdup(cp);
for (ap = brkstring (dp, " ", "\n"); ap && *ap; ap++) {
vec[vecp++] = "-alias";
vec[vecp++] = *ap;
#endif /* not lint */
&& altmsg) {
vec[vecp++] = "-dist";
- distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
- unlink(distfile);
+ if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
+ adios(NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ distfile = mh_xstrdup(cp);
+ (void) m_unlink(distfile);
if (link (altmsg, distfile) == NOTOK)
adios (distfile, "unable to link %s to", altmsg);
} else {
distfile = NULL;
}
+#ifdef OAUTH_SUPPORT
+ if (auth_svc == NULL) {
+ if (saslmech && ! strcasecmp(saslmech, "xoauth2")) {
+ adios (NULL, "must specify -authservice with -saslmech xoauth2");
+ }
+ } else {
+ if (user == NULL) {
+ adios (NULL, "must specify -user with -saslmech xoauth2");
+ }
+ }
+#else
+ NMH_UNUSED(saslmech);
+#endif /* OAUTH_SUPPORT */
+
if (altmsg == NULL || stat (altmsg, &st) == NOTOK) {
st.st_mtime = 0;
st.st_dev = 0;
if ((pushsw = pushed))
push ();
- vec[0] = r1bindex (postproc, '/');
closefds (3);
- if (sendsbr (vec, vecp, file, &st, 1, attach, attachformat) == OK)
+ if (sendsbr (vec, vecp, program, file, &st, 1, auth_svc) == OK)
done (0);
}
{
pid_t pid;
int vecp;
- char *vec[MAXARGS];
+ char **vec, *program;
context_save (); /* save the context file */
fflush (stdout);
- switch (pid = vfork()) {
+ switch (pid = fork()) {
case NOTOK:
advise ("fork", "unable to");
return 1;
case OK:
- vecp = 0;
- vec[vecp++] = r1bindex (whomproc, '/');
- vec[vecp++] = file;
+ vec = argsplit(whomproc, &program, &vecp);
if (arg)
while (*arg)
vec[vecp++] = *arg++;
+ vec[vecp++] = file;
vec[vecp] = NULL;
- execvp (whomproc, vec);
+ execvp (program, vec);
fprintf (stderr, "unable to exec ");
perror (whomproc);
_exit (-1); /* NOTREACHED */
static int
removefile (char *drft)
{
- if (unlink (drft) == NOTOK)
+ if (m_unlink (drft) == NOTOK)
adios (drft, "unable to unlink");
return OK;
}
+
+
+/*
+ * Return 1 if we already have a MIME-Version header, 0 otherwise.
+ */
+
+static int
+checkmimeheader (char *drft)
+{
+ FILE *f;
+ m_getfld_state_t gstate = 0;
+ char buf[BUFSIZ], name[NAMESZ];
+ int state, retval = 0;
+
+ if ((f = fopen(drft, "r")) == NULL) {
+ admonish(drft, "unable to read draft");
+ return (0);
+ }
+
+ for (;;) {
+ int bufsz = sizeof(buf);
+ switch (state = m_getfld(&gstate, name, buf, &bufsz, f)) {
+ case FLD:
+ case FLDPLUS:
+ if (strcasecmp(name, VRSN_FIELD) == 0) {
+ advise(NULL, "Cannot use attach commands with already-"
+ "formatted MIME message \"%s\"", drft);
+ retval = 1;
+ break;
+ }
+ continue;
+ default:
+ break;
+ }
+ break;
+ }
+
+ m_getfld_state_destroy(&gstate);
+ fclose(f);
+
+ return retval;
+}
projects / nmh / blobdiff