X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=1d5c3aa4c41b8713c82586a9d4bc58f4db39f1f4;hp=39d65253f256a35560b74dfd55bb03665107b1f5;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=84c6039eb7226c0ba0a8f708205e33d10950d2ae diff --git a/uip/dist.c b/uip/dist.c index 39d6525..1d5c3aa 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -9,47 +9,43 @@ #include #include #include +#include +#include +#include static struct swit switches[] = { #define ANNOSW 0 { "annotate", 0 }, #define NANNOSW 1 - { "noannotate", 0 }, + { "noannotate", 2 }, #define EDITRSW 2 { "editor editor", 0 }, -#define NEDITSW 3 - { "noedit", 0 }, -#define FORMSW 4 +#define FORMSW 3 { "form formfile", 0 }, -#define WHATSW 5 +#define WHATSW 4 { "whatnowproc program", 0 }, -#define NWHATSW 6 - { "nowhatnowproc", 0 }, -#define VERSIONSW 7 - { "version", 0 }, -#define HELPSW 8 +#define VERSIONSW 5 + { "Version", 0 }, +#define HELPSW 6 { "help", 0 }, -#define FILESW 9 - { "file file", -4 }, /* interface from msh */ { NULL, 0 } }; +char *version=VERSION; int main(int argc, char **argv) { - int anot = 0, 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 *nfs; + char *fmtstr; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -63,17 +59,18 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); + case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case ANNOSW: anot++; @@ -84,117 +81,94 @@ main(int argc, char **argv) case EDITRSW: if (!(ed = *argp++) || *ed == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, 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", + if (!(whatnowproc = *argp++) || *whatnowproc == '-') { + adios(EX_USAGE, 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", + if (!(form = *argp++) || *form == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } continue; } } if (*cp == '+' || *cp == '@') { - if (folder) - adios(NULL, "only one folder at a time!"); - else - folder = getcpy(expandfol(cp)); + if (folder) { + adios(EX_USAGE, NULL, "only one folder at a time!"); + } else { + folder = mh_xstrdup(expandfol(cp)); + } } else { - if (msg) - adios(NULL, "only one message at a time!"); - else + if (msg) { + adios(EX_USAGE, NULL, "only one message at a time!"); + } else { msg = cp; + } } } - cwd = getcpy(pwd()); - - if (file && (msg || folder)) - adios(NULL, "can't mix files and folders/msgs"); + cwd = mh_xstrdup(pwd()); strncpy(drft, m_draft(seq_beyond), sizeof(drft)); - if ((out = creat(drft, m_gmprot())) == NOTOK) - adios(drft, "unable to create"); + if ((out = creat(drft, m_gmprot())) == NOTOK) { + adios(EX_CANTCREAT, drft, "unable to create"); + } - nfs = new_fs(form, NULL, distcomps, NULL); - if (write(out, nfs, strlen(nfs)) != strlen(nfs)) { - adios(drft, "error writing"); + fmtstr = new_fs(form, distcomps); + if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) { + adios(EX_IOERR, 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 = seq_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(EX_OSERR, maildir, "unable to change directory to"); + } + + if (!(mp = folder_read(folder))) { + adios(EX_IOERR, NULL, "unable to read folder %s", folder); + } + + /* check for empty folder */ + if (mp->nummsg == 0) { + adios(EX_NOINPUT, NULL, "no messages in %s", folder); } - msgnam = file ? file : getcpy(m_name(mp->lowsel)); - if ((in = open(msgnam, O_RDONLY)) == NOTOK) - adios(msgnam, "unable to open message"); + /* parse the message range/sequence/name and set SELECTED */ + if (!m_convert(mp, msg)) { + exit(EX_USAGE); + } + seq_setprev(mp); - if (!file) { - context_replace(curfolder, folder); /* update current folder */ - seq_setcur(mp, mp->lowsel); /* update current message */ - seq_save(mp); /* synchronize sequences */ - context_save(); /* save the context file */ + if (mp->numsel > 1) { + adios(EX_USAGE, NULL, "only one message at a time!"); } - if (nwhat) - done(0); - what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, - cwd); - done(1); - return 1; + msgnam = mh_xstrdup(m_name(mp->lowsel)); + if ((in = open(msgnam, O_RDONLY)) == NOTOK) { + adios(EX_IOERR, msgnam, "unable to open message"); + } + + context_replace(curfolder, folder); + seq_setcur(mp, mp->lowsel); + seq_save(mp); /* synchronize sequences */ + context_save(); + + what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd); + return EX_SOFTWARE; }