-
-/*
- * repl.c -- reply to a message
+/* 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 <h/mh.h>
-#include <h/utils.h>
-
-
-static struct swit switches[] = {
-#define GROUPSW 0
- { "group", 0 },
-#define NGROUPSW 1
- { "nogroup", 0 },
-#define ANNOSW 2
- { "annotate", 0 },
-#define NANNOSW 3
- { "noannotate", 0 },
-#define CCSW 4
- { "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
- { "editor editor", 0 },
-#define NEDITSW 10
- { "noedit", 0 },
-#define FCCSW 11
- { "fcc folder", 0 },
-#define FILTSW 12
- { "filter filterfile", 0 },
-#define FORMSW 13
- { "form formfile", 0 },
-#define FRMTSW 14
- { "format", 5 },
-#define NFRMTSW 15
- { "noformat", 7 },
-#define INPLSW 16
- { "inplace", 0 },
-#define NINPLSW 17
- { "noinplace", 0 },
-#define MIMESW 18
- { "mime", 0 },
-#define NMIMESW 19
- { "nomime", 0 },
-#define QURYSW 20
- { "query", 0 },
-#define NQURYSW 21
- { "noquery", 0 },
-#define WHATSW 22
- { "whatnowproc program", 0 },
-#define NWHATSW 23
- { "nowhatnowproc", 0 },
-#define WIDTHSW 24
- { "width columns", 0 },
-#define VERSIONSW 25
- { "version", 0 },
-#define HELPSW 26
- { "help", 0 },
-#define FILESW 27
- { "file file", 4 }, /* interface from msh */
-
-#ifdef MHE
-#define BILDSW 28
- { "build", 5 }, /* interface from mhe */
-#endif
-
- { NULL, 0 }
-};
-
-static struct swit ccswitches[] = {
-#define CTOSW 0
- { "to", 0 },
-#define CCCSW 1
- { "cc", 0 },
-#define CMESW 2
- { "me", 0 },
-#define CALSW 3
- { "all", 0 },
- { 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 }
-};
+#include "h/mh.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/mime.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "replsbr.h"
+
+#define REPL_SWITCHES \
+ X("group", 0, GROUPSW) \
+ X("nogroup", 0, NGROUPSW) \
+ X("annotate", 0, ANNOSW) \
+ X("noannotate", 0, NANNOSW) \
+ X("cc all|to|cc|me", 0, CCSW) \
+ X("nocc all|to|cc|me", 0, NCCSW) \
+ X("draftfolder +folder", 0, DFOLDSW) \
+ X("draftmessage msg", 0, DMSGSW) \
+ X("nodraftfolder", 0, NDFLDSW) \
+ X("editor editor", 0, EDITRSW) \
+ X("noedit", 0, NEDITSW) \
+ X("convertargs type argstring", 0, CONVERTARGSW) \
+ X("fcc folder", 0, FCCSW) \
+ X("filter filterfile", 0, FILTSW) \
+ X("form formfile", 0, FORMSW) \
+ X("format", 5, FRMTSW) \
+ X("noformat", 7, NFRMTSW) \
+ X("inplace", 0, INPLSW) \
+ X("noinplace", 0, NINPLSW) \
+ X("mime", 0, MIMESW) \
+ X("nomime", 0, NMIMESW) \
+ X("query", 0, QURYSW) \
+ X("noquery", 0, NQURYSW) \
+ X("whatnowproc program", 0, WHATSW) \
+ X("nowhatnowproc", 0, NWHATSW) \
+ X("width columns", 0, WIDTHSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+ X("file file", 4, FILESW) \
+ X("build", 5, BILDSW) /* interface from mhe */ \
+ X("atfile", 0, ATFILESW) \
+ X("noatfile", 0, NOATFILESW) \
+ X("fmtproc program", 0, FMTPROCSW) \
+ X("nofmtproc", 0, NFMTPROCSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(REPL);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(REPL, switches);
+#undef X
+
+#define CC_SWITCHES \
+ X("to", 0, CTOSW) \
+ X("cc", 0, CCCSW) \
+ X("me", 0, CMESW) \
+ X("all", 0, CALSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(CC);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(CC, ccswitches);
+#undef X
+
+#define DISPO_SWITCHES \
+ X("quit", 0, NOSW) \
+ X("replace", 0, YESW) \
+ X("list", 0, LISTDSW) \
+ X("refile +folder", 0, REFILSW) \
+ X("new", 0, NEWSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(DISPO);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(DISPO, aqrnl);
+#undef X
static struct swit aqrl[] = {
- { "quit", 0 },
- { "replace", 0 },
- { "list", 0 },
- { "refile +folder", 0 },
- { NULL, 0 }
+ { "quit", 0, NOSW },
+ { "replace", 0, YESW },
+ { "list", 0, LISTDSW },
+ { "refile +folder", 0, REFILSW },
+ { NULL, 0, 0 }
};
-short ccto = -1; /* global for replsbr */
-short cccc = -1;
-short ccme = -1;
-short querysw = 0;
+static short outputlinelen = OUTPUTLINELEN;
+static bool groupreply; /* Is this a group reply? */
-short outputlinelen = OUTPUTLINELEN;
-short groupreply = 0; /* Is this a group reply? */
-
-int mime = 0; /* include original as MIME part */
-char *form = NULL; /* form (components) file */
-char *filter = NULL; /* message filter file */
-char *fcc = NULL; /* folders to add to Fcc: header */
+static bool mime; /* include original as MIME part */
+static char *form = NULL; /* form (components) file */
+static char *filter = NULL; /* message filter file */
+static char *fcc = NULL; /* folders to add to Fcc: header */
/*
* prototypes
*/
-void docc (char *, int);
+static void docc (char *, int);
+static void add_convert_header (const char *, char *, char *, char *);
int
main (int argc, char **argv)
{
int i, isdf = 0;
- int anot = 0, inplace = 1;
- int nedit = 0, nwhat = 0;
+ bool anot = false;
+ bool inplace = true;
+ bool nedit = false;
+ bool nwhat = false;
+ bool atfile = false;
+ int fmtproc = -1;
char *cp, *cwd, *dp, *maildir, *file = NULL;
char *folder = NULL, *msg = NULL, *dfolder = NULL;
char *dmsg = NULL, *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
char **argp, **arguments;
+ svector_t convert_types = svector_create (10);
+ svector_t convert_args = svector_create (10);
+ size_t n;
struct msgs *mp = NULL;
struct stat st;
FILE *in;
+ bool buildsw = false;
-#ifdef MHE
- int buildsw = 0;
-#endif /* MHE */
-
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], true, true)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ die("-%s unknown", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s: [+folder] [msg] [switches]",
done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case GROUPSW:
- groupreply++;
+ groupreply = true;
continue;
case NGROUPSW:
- groupreply = 0;
+ groupreply = false;
continue;
case ANNOSW:
- anot++;
+ anot = true;
continue;
case NANNOSW:
- anot = 0;
+ anot = false;
continue;
case CCSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
docc (cp, 1);
continue;
case NCCSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
docc (cp, 0);
continue;
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- nedit = 0;
+ die("missing argument to %s", argp[-2]);
+ nedit = false;
continue;
case NEDITSW:
- nedit++;
+ nedit = true;
continue;
+ case CONVERTARGSW: {
+ char *type;
+ size_t i;
+
+ if (!(type = *argp++)) {
+ die("missing type argument to %s", argp[-2]);
+ }
+ if (!(cp = *argp++)) {
+ die("missing argstring argument to %s",
+ argp[-3]);
+ }
+
+ for (i = 0; i < svector_size (convert_types); ++i) {
+ if (! strcmp (svector_at (convert_types, i), type)) {
+ /* Already saw this type, so just update
+ its args. */
+ svector_strs (convert_args)[i] = cp;
+ break;
+ }
+ }
+
+ if (i == svector_size (convert_types)) {
+ svector_push_back (convert_types, type);
+ svector_push_back (convert_args, cp);
+ }
+ continue;
+ }
+
case WHATSW:
if (!(whatnowproc = *argp++) || *whatnowproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- nwhat = 0;
+ die("missing argument to %s", argp[-2]);
+ nwhat = false;
continue;
-#ifdef MHE
case BILDSW:
- buildsw++; /* fall... */
-#endif /* MHE */
+ buildsw = true;
+ /* FALLTHRU */
case NWHATSW:
- nwhat++;
+ nwhat = true;
continue;
case FCCSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
dp = NULL;
if (*cp == '@')
cp = dp = path (cp + 1, TSUBCWF);
if (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!");
+ die("only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
file = path (cp, TFILE);
continue;
case FILTSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- filter = getcpy (etcpath (cp));
- mime = 0;
+ die("missing argument to %s", argp[-2]);
+ filter = mh_xstrdup(etcpath(cp));
+ mime = false;
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case FRMTSW:
- filter = getcpy (etcpath (mhlreply));
- mime = 0;
+ filter = mh_xstrdup(etcpath(mhlreply));
+ mime = false;
continue;
case NFRMTSW:
filter = NULL;
continue;
case INPLSW:
- inplace++;
+ inplace = true;
continue;
case NINPLSW:
- inplace = 0;
+ inplace = false;
continue;
case MIMESW:
- mime++;
+ mime = true;
filter = NULL;
continue;
case NMIMESW:
- mime = 0;
+ mime = false;
continue;
case QURYSW:
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
if ((outputlinelen = atoi (cp)) < 10)
- adios (NULL, "impossible width %d", outputlinelen);
+ die("impossible width %d", outputlinelen);
continue;
case DFOLDSW:
if (dfolder)
- adios (NULL, "only one draft folder at a time!");
+ die("only one draft folder at a time!");
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("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!");
+ die("only one draft message at a time!");
if (!(dmsg = *argp++) || *dmsg == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case NDFLDSW:
dfolder = NULL;
isdf = NOTOK;
continue;
+
+ case ATFILESW:
+ atfile = true;
+ continue;
+ case NOATFILESW:
+ atfile = false;
+ continue;
+
+ case FMTPROCSW:
+ if (!(formatproc = *argp++) || *formatproc == '-')
+ die("missing argument to %s", argp[-2]);
+ fmtproc = 1;
+ continue;
+ case NFMTPROCSW:
+ fmtproc = 0;
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
+ die("only one folder at a time!");
+ folder = pluspath (cp);
} else {
if (msg)
- adios (NULL, "only one message at a time!");
- else
- msg = cp;
+ die("only one message at a time!");
+ msg = cp;
}
}
if (ccme == -1)
ccme = groupreply;
- cwd = getcpy (pwd ());
+ cwd = mh_xstrdup(pwd ());
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (file && (msg || folder))
- adios (NULL, "can't mix files and folders/msgs");
+ die("can't mix files and folders/msgs");
try_it_again:
-#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) {
-#else
- strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft));
-
- /* Check if a draft exists */
- if (stat (drft, &st) != NOTOK) {
-#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)))
+ if (!(argp = read_switch_multiword ("\nDisposition? ",
+ isdf ? aqrnl : aqrl)))
done (1);
switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) {
case NOSW:
i = YESW;
break;
default:
- advise (NULL, "say what?");
+ inform("say what?");
break;
}
}
/*
* We are replying to a file.
*/
- anot = 0; /* we don't want to annotate a file */
+ anot = false; /* we don't want to annotate a file */
} else {
/*
* We are replying to a message.
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, 1)))
+ die("unable to read folder %s", folder);
/* check for empty folder */
if (mp->nummsg == 0)
- adios (NULL, "no messages in %s", folder);
+ die("no messages in %s", folder);
/* parse the message range/sequence/name and set SELECTED */
if (!m_convert (mp, msg))
seq_setprev (mp); /* set the previous-sequence */
if (mp->numsel > 1)
- adios (NULL, "only one message at a time!");
+ die("only one message at a time!");
context_replace (pfolder, folder); /* update current folder */
seq_setcur (mp, mp->lowsel); /* update current message */
context_save (); /* save the context file */
}
- msg = file ? file : getcpy (m_name (mp->lowsel));
+ msg = file ? file : mh_xstrdup(m_name (mp->lowsel));
if ((in = fopen (msg, "r")) == NULL)
adios (msg, "unable to open");
form = etcpath (replcomps);
}
- replout (in, msg, drft, mp, outputlinelen, mime, form, filter, fcc);
+ replout (in, msg, drft, mp, outputlinelen, mime, form, filter,
+ fcc, fmtproc);
fclose (in);
+ {
+ char *filename = file ? file : concat (mp->foldpath, "/", msg, NULL);
+
+ for (n = 0; n < svector_size (convert_types); ++n) {
+ add_convert_header (svector_at (convert_types, n),
+ svector_at (convert_args, n),
+ filename, drft);
+ }
+ if (! file) {
+ free (filename);
+ }
+ }
+
if (nwhat)
done (0);
- what_now (ed, nedit, NOUSE, drft, msg, 0, mp,
- anot ? "Replied" : NULL, inplace, cwd);
+ what_now (ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
+ inplace, cwd, atfile);
+
+ svector_free (convert_args);
+ svector_free (convert_types);
+
done (1);
return 1;
}
-void
+static void
docc (char *cp, int ccflag)
{
switch (smatch (cp, ccswitches)) {
ambigsw (cp, ccswitches);
done (1);
case UNKWNSW:
- adios (NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
+ die("-%scc %s unknown", ccflag ? "" : "no", cp);
case CTOSW:
ccto = ccflag;
break;
}
}
+
+/*
+ * Add pseudoheaders that will pass the convert arguments to
+ * mhbuild. They have the form:
+ * MHBUILD_FILE_PSEUDOHEADER-text/calendar: /home/user/Mail/inbox/7
+ * MHBUILD_ARGS_PSEUDOHEADER-text/calendar: reply -accept
+ * The ARGS pseudoheader is optional, but we always add it when
+ * -convertargs is used.
+ */
+static void
+add_convert_header (const char *convert_type, char *convert_arg,
+ char *filename, char *drft)
+{
+ char *field_name;
+
+ field_name = concat (MHBUILD_FILE_PSEUDOHEADER, convert_type, NULL);
+ annotate (drft, field_name, filename, 1, 0, -2, 1);
+ free (field_name);
+
+ field_name = concat (MHBUILD_ARGS_PSEUDOHEADER, convert_type, NULL);
+ annotate (drft, field_name, convert_arg, 1, 0, -2, 1);
+ free (field_name);
+}
projects / nmh / blobdiff