X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=7a8b8e6d32eee135b07308ac4d8ddc60142a5ca6;hb=eda72d6a7a7c20ff123043fb7f19c509ea01f932;hp=da5f23bfbda078a0c589d581eebfa96afb408437;hpb=556e1267b7be84fd25c2d52aa754d623889d52ac;p=mmh diff --git a/uip/send.c b/uip/send.c index da5f23b..7a8b8e6 100644 --- a/uip/send.c +++ b/uip/send.c @@ -62,11 +62,12 @@ extern char *distfile; 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; @@ -147,7 +148,11 @@ main(int argc, char **argv) } } else { - msgs[msgp++] = cp; + if (*cp == '/') { + files[nfiles++] = cp; + } else { + msgs[msgp++] = cp; + } } } @@ -164,7 +169,7 @@ main(int argc, char **argv) } } - if (!msgp) + if (!msgp && !nfiles) msgs[msgp++] = seq_cur; maildir = toabsdir(draftfolder); @@ -180,14 +185,16 @@ main(int argc, char **argv) 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); } } @@ -199,9 +206,9 @@ main(int argc, char **argv) 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; @@ -252,8 +259,8 @@ main(int argc, char **argv) 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: