X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fcomp.c;h=45363720d99ce82961e5a9d10c9c9504e70c60da;hb=67411b1f95d6ec987b4c732459e1ba8a8ac192c6;hp=f713b6f4970e296b4c7b4c6494fe7d14c3b55ea3;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1;p=mmh diff --git a/uip/comp.c b/uip/comp.c index f713b6f..4536372 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -1,41 +1,33 @@ /* - * 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 static struct swit switches[] = { -#define DFOLDSW 0 - { "draftfolder +folder", 0 }, -#define DMSGSW 1 - { "draftmessage msg", 0 }, -#define NDFLDSW 2 - { "nodraftfolder", 0 }, -#define EDITRSW 3 +#define EDITRSW 0 { "editor editor", 0 }, -#define NEDITSW 4 +#define NEDITSW 1 { "noedit", 0 }, -#define FILESW 5 - { "file file", 0 }, -#define FORMSW 6 +#define FORMSW 2 { "form formfile", 0 }, -#define USESW 7 +#define USESW 3 { "use", 0 }, -#define NUSESW 8 +#define NUSESW 4 { "nouse", 0 }, -#define WHATSW 9 +#define WHATSW 5 { "whatnowproc program", 0 }, -#define NWHATSW 10 +#define NWHATSW 6 { "nowhatnowproc", 0 }, -#define VERSIONSW 11 +#define VERSIONSW 7 { "version", 0 }, -#define HELPSW 12 +#define HELPSW 8 { "help", 0 }, { NULL, 0 } }; @@ -56,23 +48,14 @@ static struct swit aqrunl[] = { { NULL, 0 } }; -static struct swit aqrul[] = { - { "quit", 0 }, - { "replace", 0 }, - { "use", 0 }, - { "list", 0 }, - { "refile", 0 }, - { NULL, 0 } -}; - int -main (int argc, char **argv) +main(int argc, char **argv) { int use = NOUSE, nedit = 0, nwhat = 0; - int i, in, isdf = 0, out; - char *cp, *cwd, *maildir, *dfolder = NULL; - char *ed = NULL, *file = NULL, *form = NULL; + int i, 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; @@ -81,218 +64,180 @@ main (int argc, char **argv) #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; - - case FILESW: /* compatibility */ - if (file) - adios (NULL, "only one file at a time!"); - if (!(file = *argp++) || *file == '-') - adios (NULL, "missing argument to %s", argp[-2]); - isdf = NOTOK; - continue; - - case DFOLDSW: - if (dfolder) - adios (NULL, "only one draft folder at a time!"); - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp, - *cp != '@' ? TFOLDER : TSUBCWF); - continue; - case DMSGSW: - if (file) - adios (NULL, "only one draft message at a time!"); - if (!(file = *argp++) || *file == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case NDFLDSW: - dfolder = NULL; - isdf = NOTOK; - continue; + 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; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + adios(NULL, "only one folder at a time!"); else - folder = pluspath (cp); + folder = getcpy(expandfol(cp)); } else { if (msg) - adios (NULL, "only one message at a time!"); + adios(NULL, "only one message at a time!"); else msg = cp; } } - cwd = getcpy (pwd ()); - - if (!context_find ("path")) - free (path ("./", TFOLDER)); + cwd = getcpy(pwd()); - /* - * Check if we are using a draft folder - * and have specified a message in it. - */ - if ((dfolder || context_find ("Draft-Folder")) && !folder && msg && !file) { - file = msg; - msg = NULL; - } if (form && (folder || msg)) - adios (NULL, "can't mix forms and folders/msgs"); + adios(NULL, "can't mix forms and folders/msgs"); - if (folder || msg) { + if (!use && (folder || msg)) { /* - * Use a message as the "form" for the new message. - */ + ** 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); + folder = getcurfol(); + maildir = toabsdir(folder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + 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); + 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); + 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 (!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!"); + 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 ((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 (dfolder, file, use, &isdf), sizeof(drft)); + strncpy(drft, m_draft(use ? (msg?msg:seq_cur) : seq_beyond), + sizeof(drft)); /* - * Check if we have an existing draft - */ - if ((out = open (drft, O_RDONLY)) != NOTOK) { - i = fdcompare (in, out); - close (out); + ** 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 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); + 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? ", isdf ? aqrunl : aqrul))) - done (1); - switch (i = smatch (*argp, isdf ? aqrunl : aqrul)) { - case NOSW: - done (0); - case NEWSW: - file = NULL; - 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 (!(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; } } - } else { - if (use) - adios (drft, "unable to open"); + } 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); + if ((out = creat(drft, m_gmprot())) == NOTOK) + adios(drft, "unable to create"); + cpydata(in, out, form, drft); + close(in); + close(out); edit_it: - context_save (); /* save the context file */ + context_save(); /* save the context file */ if (nwhat) - done (0); - what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd); - done (1); + done(0); + what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd); + done(1); return 1; }