int
main(int argc, char **argv)
{
- int msgp = 0, distsw = 0, vecp = 1;
+ int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
int msgnum, status;
char *cp, *maildir = NULL;
char buf[BUFSIZ], **ap, **argp, **arguments;
char *msgs[MAXARGS], *vec[MAXARGS];
+ char *files[MAXARGS];
struct msgs *mp;
struct stat st;
}
} else {
- msgs[msgp++] = cp;
+ if (*cp == '/') {
+ files[nfiles++] = cp;
+ } else {
+ msgs[msgp++] = cp;
+ }
}
}
for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap;
ap++) {
vec[vecp++] = "-alias";
- vec[vecp++] = *ap;
+ vec[vecp++] = getcpy(etcpath(*ap));
}
}
- if (!msgp)
+ if (!msgp && !nfiles)
msgs[msgp++] = seq_cur;
maildir = toabsdir(draftfolder);
adios(NULL, "no messages in draft folder %s", draftfolder);
/* parse all the message ranges/sequences and set SELECTED */
- for (msgnum = 0; msgnum < msgp; msgnum++)
- if (!m_convert(mp, msgs[msgnum]))
+ for (msgnum = 0; msgnum < msgp; msgnum++) {
+ if (!m_convert(mp, msgs[msgnum])) {
done(1);
+ }
+ }
seq_setprev(mp); /* set the previous-sequence */
for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (is_selected(mp, msgnum)) {
- msgs[msgp++] = getcpy(m_name(msgnum));
+ files[nfiles++] = getcpy(m_name(msgnum));
unset_exists(mp, msgnum);
}
}
if ((cp = context_find("signature")) && *cp)
m_putenv("SIGNATURE", cp);
- for (msgnum = 0; msgnum < msgp; msgnum++)
- if (stat(msgs[msgnum], &st) == NOTOK)
- adios(msgs[msgnum], "unable to stat draft file");
+ for (msgnum = 0; msgnum < nfiles; msgnum++)
+ if (stat(files[msgnum], &st) == NOTOK)
+ adios(files[msgnum], "unable to stat draft file");
if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
annotext = NULL;
vec[vecp++] = "-dist";
distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
if (link(altmsg, distfile) == NOTOK) {
- if (errno != EXDEV
-#ifdef EISREMOTE
- && errno != EISREMOTE
-#endif /* EISREMOTE */
- )
+ if (errno != EXDEV)
adios(distfile, "unable to link %s to",
altmsg);
free(distfile);
vec[0] = mhbasename(postproc);
closefds(3);
- for (msgnum = 0; msgnum < msgp; msgnum++) {
- switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1)) {
+ for (msgnum = 0; msgnum < nfiles; msgnum++) {
+ switch (sendsbr(vec, vecp, files[msgnum], &st, 1)) {
case DONE:
done(++status);
case NOTOK: