X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fcomp.c;h=75bbf86fd667e61c9b0f45702f6baae8e7bb3073;hp=d950833537041fdbb49a65ed3d61595a975780ba;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=f51956be123db66b00138f80464d06f030dbb88d diff --git a/uip/comp.c b/uip/comp.c index d950833..75bbf86 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -9,46 +9,43 @@ #include #include #include +#include +#include +#include static struct swit switches[] = { #define EDITRSW 0 { "editor editor", 0 }, -#define NEDITSW 1 - { "noedit", 0 }, -#define FORMSW 2 +#define FORMSW 1 { "form formfile", 0 }, -#define USESW 3 +#define USESW 2 { "use", 0 }, -#define NUSESW 4 - { "nouse", 0 }, -#define WHATSW 5 +#define NUSESW 3 + { "nouse", 2 }, +#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 }, { NULL, 0 } }; +char *version=VERSION; int main(int argc, char **argv) { - int use = NOUSE, nedit = 0, nwhat = 0; + int use = NOUSE; int in, out; char *cp, *cwd, *maildir; char *ed = NULL, *form = NULL; char *folder = NULL, *msg = NULL, buf[BUFSIZ]; char drft[BUFSIZ], **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 */ @@ -62,39 +59,34 @@ 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 EDITRSW: - if (!(ed = *argp++) || *ed == '-') - adios(NULL, "missing argument to %s", argp[-2]); - nedit = 0; - continue; - case NEDITSW: - nedit++; + if (!(ed = *argp++) || *ed == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } continue; case WHATSW: - if (!(whatnowproc = *argp++) || *whatnowproc == '-') - adios(NULL, "missing argument to %s", argp[-2]); - nwhat = 0; - continue; - case NWHATSW: - nwhat++; + if (!(whatnowproc = *argp++) || *whatnowproc == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } continue; case FORMSW: - if (!(form = *argp++) || *form == '-') - adios(NULL, "missing argument to %s", argp[-2]); + if (!(form = *argp++) || *form == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } continue; case USESW: @@ -106,25 +98,29 @@ main(int argc, char **argv) } } 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()); + cwd = mh_xstrdup(pwd()); - if (form && (folder || msg)) - adios(NULL, "can't mix forms and folders/msgs"); + if (form && (folder || msg)) { + adios(EX_USAGE, NULL, "can't mix forms and folders/msgs"); + } - if (use && folder) - adios(NULL, "can't mix -use and +folder"); + if (use && folder) { + adios(EX_USAGE, NULL, "can't mix -use and +folder"); + } if (use) { /* Don't copy; the draft shall get removed in the end. */ @@ -137,50 +133,51 @@ main(int argc, char **argv) if (!folder) folder = getcurfol(); maildir = toabsdir(folder); - if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) { + adios(EX_OSERR, 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); + if (!(mp = folder_read(folder))) { + adios(EX_IOERR, NULL, "unable to read folder %s", folder); + } /* check for empty folder */ - if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + if (mp->nummsg == 0) { + adios(EX_DATAERR, NULL, "no messages in %s", folder); + } /* parse the message range/sequence/name and set SELECTED */ - if (!m_convert(mp, msg)) - done(1); + if (!m_convert(mp, msg)) { + exit(EX_SOFTWARE); + } seq_setprev(mp); /* set the previous-sequence */ - if (mp->numsel > 1) - adios(NULL, "only one message at a time!"); - if ((in = open(form = getcpy(m_name(mp->lowsel)), - O_RDONLY)) == NOTOK) - adios(form, "unable to open message"); + if (mp->numsel > 1) { + adios(EX_USAGE, NULL, "only one message at a time!"); + } + if ((in = open(form = mh_xstrdup(m_name(mp->lowsel)), + O_RDONLY)) == NOTOK) { + adios(EX_IOERR, form, "unable to open message"); + } strncpy(drft, m_draft(seq_beyond), sizeof(drft)); if ((out = creat(drft, m_gmprot())) == NOTOK) { - adios(drft, "unable to create"); + adios(EX_CANTCREAT, drft, "unable to create"); } cpydata(in, out, form, drft); close(in); close(out); } else { - nfs = new_fs(form, components); + fmtstr = new_fs(form, components); strncpy(drft, m_draft(seq_beyond), sizeof(drft)); if ((out = creat(drft, m_gmprot())) == NOTOK) { - adios(drft, "unable to create"); + adios(EX_CANTCREAT, drft, "unable to create"); } - if (write(out, nfs, strlen(nfs)) != strlen(nfs)) { - adios(drft, "error writing"); + if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) { + adios(EX_IOERR, drft, "error writing"); } close(out); } context_save(); - - if (nwhat) { - done(0); - } - what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd); - done(1); - return 1; + what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd); + return EX_OSERR; }