X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=3db8cfc068c54bf46b2bbaee6060ed23736ba5fa;hp=991f5cd1f535b7500b18632b8c979c8be87abe25;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0 diff --git a/uip/dist.c b/uip/dist.c index 991f5cd..3db8cfc 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -17,24 +17,14 @@ static struct swit switches[] = { { "noannotate", 0 }, #define EDITRSW 2 { "editor editor", 0 }, -#define NEDITSW 3 - { "noedit", 0 }, -#define FORMSW 4 +#define FORMSW 3 { "form formfile", 0 }, -#define INPLSW 5 - { "inplace", 0 }, -#define NINPLSW 6 - { "noinplace", 0 }, -#define WHATSW 7 +#define WHATSW 4 { "whatnowproc program", 0 }, -#define NWHATSW 8 - { "nowhatnowproc", 0 }, -#define VERSIONSW 9 - { "version", 0 }, -#define HELPSW 10 +#define VERSIONSW 5 + { "Version", 0 }, +#define HELPSW 6 { "help", 0 }, -#define FILESW 11 - { "file file", -4 }, /* interface from msh */ { NULL, 0 } }; @@ -42,13 +32,14 @@ static struct swit switches[] = { int main(int argc, char **argv) { - int anot = 0, inplace = 1, nedit = 0; - int nwhat = 0, in, out; + int anot = 0; + int in, out; char *cp, *cwd, *maildir, *msgnam; - char *ed = NULL, *file = NULL, *folder = NULL; + char *ed = NULL, *folder = NULL; char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ]; char **argp, **arguments; struct msgs *mp = NULL; + char *fmtstr; #ifdef LOCALE setlocale(LC_ALL, ""); @@ -64,63 +55,44 @@ main(int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { switch (smatch(++cp, switches)) { - case AMBIGSW: - ambigsw(cp, switches); - done(1); - case UNKWNSW: - adios(NULL, "-%s unknown", cp); - - case HELPSW: - snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name); - print_help(buf, switches, 1); - done(1); - case VERSIONSW: - print_version(invo_name); - done(1); - - case ANNOSW: - anot++; - continue; - case NANNOSW: - anot = 0; - continue; - - case EDITRSW: - if (!(ed = *argp++) || *ed == '-') - adios(NULL, "missing argument to %s", argp[-2]); - nedit = 0; - continue; - case NEDITSW: - nedit++; - continue; - - case WHATSW: - if (!(whatnowproc = *argp++) || *whatnowproc == '-') - adios(NULL, "missing argument to %s", argp[-2]); - nwhat = 0; - continue; - case NWHATSW: - nwhat++; - continue; - - case FILESW: - if (file) - adios(NULL, "only one file at a time!"); - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", argp[-2]); - file = getcpy(expanddir(cp)); - continue; - case FORMSW: - if (!(form = *argp++) || *form == '-') - adios(NULL, "missing argument to %s", argp[-2]); - continue; - - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; + case AMBIGSW: + ambigsw(cp, switches); + done(1); + case UNKWNSW: + adios(NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name); + print_help(buf, switches, 1); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case ANNOSW: + anot++; + continue; + case NANNOSW: + anot = 0; + continue; + + case EDITRSW: + if (!(ed = *argp++) || *ed == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case WHATSW: + if (!(whatnowproc = *argp++) || *whatnowproc == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case FORMSW: + if (!(form = *argp++) || *form == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; } } if (*cp == '+' || *cp == '@') { @@ -138,70 +110,50 @@ main(int argc, char **argv) cwd = getcpy(pwd()); - if (file && (msg || folder)) - adios(NULL, "can't mix files and folders/msgs"); - - in = open_form(&form, distcomps); - - strncpy(drft, m_draft("new"), sizeof(drft)); - + strncpy(drft, m_draft(seq_beyond), sizeof(drft)); if ((out = creat(drft, m_gmprot())) == NOTOK) adios(drft, "unable to create"); - cpydata(in, out, form, drft); - close(in); + fmtstr = new_fs(form, distcomps); + if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) { + adios(drft, "error writing"); + } close(out); - if (file) { - /* - ** Dist a file - */ - anot = 0; /* don't want to annotate a file */ - } else { - /* - ** Dist a message - */ - if (!msg) - msg = "cur"; - if (!folder) - folder = getcurfol(); - maildir = toabsdir(folder); - - if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); - - /* read folder and create message structure */ - if (!(mp = folder_read(folder))) - adios(NULL, "unable to read folder %s", folder); - - /* check for empty folder */ - if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); - - /* parse the message range/sequence/name and set SELECTED */ - if (!m_convert(mp, msg)) - done(1); - seq_setprev(mp); /* set the previous-sequence */ - - if (mp->numsel > 1) - adios(NULL, "only one message at a time!"); - } + if (!msg) + msg = seq_cur; + if (!folder) + folder = getcurfol(); + maildir = toabsdir(folder); + + if (chdir(maildir) == NOTOK) + adios(maildir, "unable to change directory to"); - msgnam = file ? file : getcpy(m_name(mp->lowsel)); + if (!(mp = folder_read(folder))) + adios(NULL, "unable to read folder %s", folder); + + /* check for empty folder */ + if (mp->nummsg == 0) + adios(NULL, "no messages in %s", folder); + + /* parse the message range/sequence/name and set SELECTED */ + if (!m_convert(mp, msg)) + done(1); + seq_setprev(mp); + + if (mp->numsel > 1) + adios(NULL, "only one message at a time!"); + + msgnam = getcpy(m_name(mp->lowsel)); if ((in = open(msgnam, O_RDONLY)) == NOTOK) adios(msgnam, "unable to open message"); - if (!file) { - context_replace(pfolder, folder); /* update current folder */ - seq_setcur(mp, mp->lowsel); /* update current message */ - seq_save(mp); /* synchronize sequences */ - context_save(); /* save the context file */ - } + context_replace(curfolder, folder); + seq_setcur(mp, mp->lowsel); + seq_save(mp); /* synchronize sequences */ + context_save(); - if (nwhat) - done(0); - what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, - inplace, cwd); + what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd); done(1); return 1; }