X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fcomp.c;h=75bbf86fd667e61c9b0f45702f6baae8e7bb3073;hp=554d310ec615a6b4c24171e8eed067fe4344e499;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/comp.c b/uip/comp.c index 554d310..75bbf86 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -1,246 +1,183 @@ /* - * comp.c -- compose a message - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** comp.c -- compose a message +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #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 } }; -static struct swit aqrunl[] = { -#define NOSW 0 - { "quit", 0 }, -#define YESW 1 - { "replace", 0 }, -#define USELSW 2 - { "use", 0 }, -#define LISTDSW 3 - { "list", 0 }, -#define REFILSW 4 - { "refile +folder", 0 }, -#define NEWSW 5 - { "new", 0 }, - { NULL, 0 } -}; - +char *version=VERSION; int -main (int argc, char **argv) +main(int argc, char **argv) { - int use = NOUSE, nedit = 0, nwhat = 0; - int i, in, out; + 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; - struct stat st; + char *fmtstr; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; 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 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 FORMSW: - if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - - case USESW: - use++; - continue; - case NUSESW: - use = NOUSE; - continue; + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + exit(EX_USAGE); + case UNKWNSW: + adios(EX_USAGE, NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name); + print_help(buf, switches, 1); + exit(argc == 2 ? EX_OK : EX_USAGE); + case VERSIONSW: + print_version(invo_name); + exit(argc == 2 ? EX_OK : EX_USAGE); + + case EDITRSW: + if (!(ed = *argp++) || *ed == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } + continue; + + case WHATSW: + if (!(whatnowproc = *argp++) || *whatnowproc == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } + continue; + + case FORMSW: + if (!(form = *argp++) || *form == '-') { + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); + } + continue; + + case USESW: + use++; + continue; + case NUSESW: + use = NOUSE; + continue; } } if (*cp == '+' || *cp == '@') { - if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = pluspath (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 (!context_find ("path")) - free (path ("./", TFOLDER)); + if (form && (folder || msg)) { + adios(EX_USAGE, NULL, "can't mix forms and folders/msgs"); + } - if (form && (folder || msg)) - adios (NULL, "can't mix forms and folders/msgs"); + 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. */ + strncpy(drft, m_draft(msg ? msg : seq_cur), sizeof(drft)); - if (!use && (folder || msg)) { - /* - * Take a message as the "form" for the new message. - */ + } else if (folder || msg) { + /* Take a message as the "form" for the new message. */ if (!msg) - msg = "cur"; + msg = seq_cur; if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); - - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); - + folder = getcurfol(); + maildir = toabsdir(folder); + 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); - 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"); - } else - in = open_form(&form, components); - -try_it_again: - strncpy (drft, m_draft(use ? (msg?msg:"cur") : "new"), sizeof(drft)); - - /* - * Check if we have an existing draft - */ - if ((out = open (drft, O_RDONLY)) != NOTOK) { - i = fdcompare (in, out); - close (out); - - /* - * If we have given -use flag, or if the - * draft is just the same as the components - * file, then no need to ask any questions. - */ - if (use || i) - goto edit_it; - - if (stat (drft, &st) == NOTOK) - adios (drft, "unable to stat"); - printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size); - for (i = LISTDSW; i != YESW;) { - if (!(argp = getans ("\nDisposition? ", aqrunl))) - done (1); - switch (i = smatch (*argp, aqrunl)) { - case NOSW: - done (0); - case NEWSW: - use = NOUSE; - goto try_it_again; - case YESW: - break; - case USELSW: - use++; - goto edit_it; - case LISTDSW: - showfile (++argp, drft); - break; - case REFILSW: - if (refile (++argp, drft) == 0) - i = YESW; - break; - default: - advise (NULL, "say what?"); - break; - } + if (!m_convert(mp, msg)) { + exit(EX_SOFTWARE); + } + seq_setprev(mp); /* set the previous-sequence */ + 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"); } - } else { - if (use) - adios (drft, "unable to open"); - } - if ((out = creat (drft, m_gmprot ())) == NOTOK) - adios (drft, "unable to create"); - cpydata (in, out, form, drft); - close (in); - close (out); + strncpy(drft, m_draft(seq_beyond), sizeof(drft)); + if ((out = creat(drft, m_gmprot())) == NOTOK) { + adios(EX_CANTCREAT, drft, "unable to create"); + } + cpydata(in, out, form, drft); + close(in); + close(out); -edit_it: - context_save (); /* save the context file */ + } else { + fmtstr = new_fs(form, components); + strncpy(drft, m_draft(seq_beyond), sizeof(drft)); + if ((out = creat(drft, m_gmprot())) == NOTOK) { + adios(EX_CANTCREAT, drft, "unable to create"); + } + if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) { + adios(EX_IOERR, drft, "error writing"); + } + close(out); + } - if (nwhat) - done (0); - what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd); - done (1); - return 1; + context_save(); + what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd); + return EX_OSERR; }