X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=ff936bc0a745ff7f7feb3f2c5420c7b5ca6498cd;hp=7a9384bb6fab74fd0b0a2ed13278948940409eb6;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1 diff --git a/uip/repl.c b/uip/repl.c index 7a9384b..ff936bc 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -1,10 +1,10 @@ /* - * repl.c -- reply to 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. - */ +** repl.c -- reply to 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 @@ -23,53 +23,47 @@ static struct swit switches[] = { { "cc all|to|cc|me", 0 }, #define NCCSW 5 { "nocc type", 0 }, -#define DFOLDSW 6 - { "draftfolder +folder", 0 }, -#define DMSGSW 7 - { "draftmessage msg", 0 }, -#define NDFLDSW 8 - { "nodraftfolder", 0 }, -#define EDITRSW 9 +#define EDITRSW 6 { "editor editor", 0 }, -#define NEDITSW 10 +#define NEDITSW 7 { "noedit", 0 }, -#define FCCSW 11 +#define FCCSW 8 { "fcc folder", 0 }, -#define FILTSW 12 +#define FILTSW 9 { "filter filterfile", 0 }, -#define FORMSW 13 +#define FORMSW 10 { "form formfile", 0 }, -#define FRMTSW 14 +#define FRMTSW 11 { "format", 5 }, -#define NFRMTSW 15 +#define NFRMTSW 12 { "noformat", 7 }, -#define INPLSW 16 +#define INPLSW 13 { "inplace", 0 }, -#define NINPLSW 17 +#define NINPLSW 14 { "noinplace", 0 }, -#define MIMESW 18 +#define MIMESW 15 { "mime", 0 }, -#define NMIMESW 19 +#define NMIMESW 16 { "nomime", 0 }, -#define QURYSW 20 +#define QURYSW 17 { "query", 0 }, -#define NQURYSW 21 +#define NQURYSW 18 { "noquery", 0 }, -#define WHATSW 22 +#define WHATSW 19 { "whatnowproc program", 0 }, -#define NWHATSW 23 +#define NWHATSW 20 { "nowhatnowproc", 0 }, -#define WIDTHSW 24 +#define WIDTHSW 21 { "width columns", 0 }, -#define VERSIONSW 25 +#define VERSIONSW 22 { "version", 0 }, -#define HELPSW 26 +#define HELPSW 23 { "help", 0 }, -#define FILESW 27 +#define FILESW 24 { "file file", 4 }, /* interface from msh */ #ifdef MHE -#define BILDSW 28 +#define BILDSW 25 { "build", 5 }, /* interface from mhe */ #endif @@ -88,28 +82,6 @@ static struct swit ccswitches[] = { { NULL, 0 } }; -static struct swit aqrnl[] = { -#define NOSW 0 - { "quit", 0 }, -#define YESW 1 - { "replace", 0 }, -#define LISTDSW 2 - { "list", 0 }, -#define REFILSW 3 - { "refile +folder", 0 }, -#define NEWSW 4 - { "new", 0 }, - { NULL, 0 } -}; - -static struct swit aqrl[] = { - { "quit", 0 }, - { "replace", 0 }, - { "list", 0 }, - { "refile +folder", 0 }, - { NULL, 0 } -}; - short ccto = -1; /* global for replsbr */ short cccc = -1; short ccme = -1; @@ -125,23 +97,21 @@ char *fcc = NULL; /* folders to add to Fcc: header */ /* - * prototypes - */ -void docc (char *, int); +** prototypes +*/ +void docc(char *, int); int -main (int argc, char **argv) +main(int argc, char **argv) { - int i, isdf = 0; int anot = 0, inplace = 1; int nedit = 0, nwhat = 0; char *cp, *cwd, *dp, *maildir, *file = NULL; - char *folder = NULL, *msg = NULL, *dfolder = NULL; - char *dmsg = NULL, *ed = NULL, drft[BUFSIZ], buf[BUFSIZ]; + char *folder = NULL, *msg = NULL; + char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ]; char **argp, **arguments; struct msgs *mp = NULL; - struct stat st; FILE *in; #ifdef MHE @@ -151,31 +121,30 @@ 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)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw (cp, switches); - done (1); + ambigsw(cp, switches); + done(1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + adios(NULL, "-%s unknown", cp); case HELPSW: - snprintf (buf, sizeof(buf), "%s: [+folder] [msg] [switches]", - invo_name); - print_help (buf, switches, 1); - done (0); + snprintf(buf, sizeof(buf), "%s: [+folder] [msg] [switches]", invo_name); + print_help(buf, switches, 1); + done(0); case VERSIONSW: print_version(invo_name); - done (1); + done(1); case GROUPSW: groupreply++; @@ -193,18 +162,18 @@ main (int argc, char **argv) case CCSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - docc (cp, 1); + adios(NULL, "missing argument to %s", argp[-2]); + docc(cp, 1); continue; case NCCSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - docc (cp, 0); + adios(NULL, "missing argument to %s", argp[-2]); + docc(cp, 0); continue; case EDITRSW: if (!(ed = *argp++) || *ed == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", argp[-2]); nedit = 0; continue; case NEDITSW: @@ -212,8 +181,9 @@ main (int argc, char **argv) continue; case WHATSW: - if (!(whatnowproc = *argp++) || *whatnowproc == '-') - adios (NULL, "missing argument to %s", argp[-2]); + if (!(whatnowproc = *argp++) || + *whatnowproc == '-') + adios(NULL, "missing argument to %s", argp[-2]); nwhat = 0; continue; #ifdef MHE @@ -226,37 +196,37 @@ main (int argc, char **argv) case FCCSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", argp[-2]); dp = NULL; if (*cp == '@') - cp = dp = path (cp + 1, TSUBCWF); + cp = dp = getcpy(expandfol(cp)); if (fcc) - fcc = add (", ", fcc); - fcc = add (cp, fcc); + fcc = add(", ", fcc); + fcc = add(cp, fcc); if (dp) - free (dp); + free(dp); continue; case FILESW: if (file) - adios (NULL, "only one file at a time!"); + adios(NULL, "only one file at a time!"); if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - file = path (cp, TFILE); + adios(NULL, "missing argument to %s", argp[-2]); + file = getcpy(expanddir(cp)); continue; case FILTSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - filter = getcpy (etcpath (cp)); + adios(NULL, "missing argument to %s", argp[-2]); + filter = getcpy(etcpath(cp)); mime = 0; continue; case FORMSW: if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", argp[-2]); continue; case FRMTSW: - filter = getcpy (etcpath (mhlreply)); + filter = getcpy(etcpath(mhlreply)); mime = 0; continue; case NFRMTSW: @@ -287,39 +257,20 @@ main (int argc, char **argv) case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if ((outputlinelen = atoi (cp)) < 10) - adios (NULL, "impossible width %d", outputlinelen); - 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 (dmsg) - adios (NULL, "only one draft message at a time!"); - if (!(dmsg = *argp++) || *dmsg == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case NDFLDSW: - dfolder = NULL; - isdf = NOTOK; + adios(NULL, "missing argument to %s", argp[-2]); + if ((outputlinelen = atoi(cp)) < 10) + adios(NULL, "impossible width %d", outputlinelen); 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; } @@ -332,126 +283,92 @@ main (int argc, char **argv) if (ccme == -1) ccme = groupreply; - cwd = getcpy (pwd ()); + cwd = getcpy(pwd()); - if (!context_find ("path")) - free (path ("./", TFOLDER)); if (file && (msg || folder)) - adios (NULL, "can't mix files and folders/msgs"); - -try_it_again: + adios(NULL, "can't mix files and folders/msgs"); #ifdef MHE - strncpy (drft, buildsw ? m_maildir ("reply") - : m_draft (dfolder, NULL, NOUSE, &isdf), sizeof(drft)); - - /* Check if a draft exists */ - if (!buildsw && stat (drft, &st) != NOTOK) { + strncpy(drft, buildsw ? toabsdir("reply") + : m_draft("new"), sizeof(drft)); #else - strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft)); - - /* Check if a draft exists */ - if (stat (drft, &st) != NOTOK) { + strncpy(drft, m_draft("new"), sizeof(drft)); #endif /* MHE */ - printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size); - for (i = LISTDSW; i != YESW;) { - if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl))) - done (1); - switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) { - case NOSW: - done (0); - case NEWSW: - dmsg = NULL; - goto try_it_again; - case YESW: - break; - case LISTDSW: - showfile (++argp, drft); - break; - case REFILSW: - if (refile (++argp, drft) == 0) - i = YESW; - break; - default: - advise (NULL, "say what?"); - break; - } - } - } if (file) { /* - * We are replying to a file. - */ + ** We are replying to a file. + */ anot = 0; /* we don't want to annotate a file */ } else { /* - * We are replying to a message. - */ + ** We are replying to a message. + */ if (!msg) msg = "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!"); - 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); /* update current folder */ + seq_setcur(mp, mp->lowsel); /* update current message */ + seq_save(mp); /* synchronize sequences */ + context_save(); /* save the context file */ } - msg = file ? file : getcpy (m_name (mp->lowsel)); + msg = file ? file : getcpy(m_name(mp->lowsel)); - if ((in = fopen (msg, "r")) == NULL) - adios (msg, "unable to open"); + if ((in = fopen(msg, "r")) == NULL) + adios(msg, "unable to open"); /* find form (components) file */ if (!form) { if (groupreply) - form = etcpath (replgroupcomps); + form = etcpath(replgroupcomps); else - form = etcpath (replcomps); + form = etcpath(replcomps); } - replout (in, msg, drft, mp, outputlinelen, mime, form, filter, fcc); - fclose (in); + replout(in, msg, drft, mp, outputlinelen, mime, form, filter, fcc); + fclose(in); if (nwhat) - done (0); - what_now (ed, nedit, NOUSE, drft, msg, 0, mp, - anot ? "Replied" : NULL, inplace, cwd); - done (1); + done(0); + what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, + inplace, cwd); + done(1); return 1; } void -docc (char *cp, int ccflag) +docc(char *cp, int ccflag) { - switch (smatch (cp, ccswitches)) { + switch (smatch(cp, ccswitches)) { case AMBIGSW: - ambigsw (cp, ccswitches); - done (1); + ambigsw(cp, ccswitches); + done(1); case UNKWNSW: - adios (NULL, "-%scc %s unknown", ccflag ? "" : "no", cp); + adios(NULL, "-%scc %s unknown", ccflag ? "" : "no", + cp); case CTOSW: ccto = ccflag;