#include <h/fmt_scan.h>
#include <fcntl.h>
-static struct swit switches[] = {
-#define DFOLDSW 0
- { "draftfolder +folder", 0 },
-#define DMSGSW 1
- { "draftmessage msg", 0 },
-#define NDFLDSW 2
- { "nodraftfolder", 0 },
-#define EDITRSW 3
- { "editor editor", 0 },
-#define NEDITSW 4
- { "noedit", 0 },
-#define FILESW 5
- { "file file", 0 },
-#define FORMSW 6
- { "form formfile", 0 },
-#define USESW 7
- { "use", 0 },
-#define NUSESW 8
- { "nouse", 0 },
-#define WHATSW 9
- { "whatnowproc program", 0 },
-#define NWHATSW 10
- { "nowhatnowproc", 0 },
-#define VERSIONSW 11
- { "version", 0 },
-#define HELPSW 12
- { "help", 0 },
-#define TOSW 13
- { "to address", 0 },
-#define CCSW 14
- { "cc address", 0 },
-#define FROMSW 15
- { "from address", 0 },
-#define FCCSW 16
- { "fcc mailbox", 0 },
-#define WIDTHSW 17
- { "width colums", 0 },
-#define SUBJECTSW 18
- { "subject text", 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 }
-};
+#define COMP_SWITCHES \
+ X("draftfolder +folder", 0, DFOLDSW) \
+ X("draftmessage msg", 0, DMSGSW) \
+ X("nodraftfolder", 0, NDFLDSW) \
+ X("editor editor", 0, EDITRSW) \
+ X("noedit", 0, NEDITSW) \
+ X("file file", 0, FILESW) \
+ X("form formfile", 0, FORMSW) \
+ X("use", 0, USESW) \
+ X("nouse", 0, NUSESW) \
+ X("whatnowproc program", 0, WHATSW) \
+ X("nowhatnowproc", 0, NWHATSW) \
+ X("build", 5, BILDSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+ X("to address", 0, TOSW) \
+ X("cc address", 0, CCSW) \
+ X("from address", 0, FROMSW) \
+ X("fcc mailbox", 0, FCCSW) \
+ X("width colums", 0, WIDTHSW) \
+ X("subject text", 0, SUBJECTSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(COMP);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(COMP, switches);
+#undef X
+
+#define DISPO_SWITCHES \
+ X("quit", 0, NOSW) \
+ X("replace", 0, YESW) \
+ X("use", 0, USELSW) \
+ 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, aqrunl);
+#undef X
static struct swit aqrul[] = {
- { "quit", 0 },
- { "replace", 0 },
- { "use", 0 },
- { "list", 0 },
- { "refile", 0 },
- { NULL, 0 }
+ { "quit", 0, NOSW },
+ { "replace", 0, YESW },
+ { "use", 0, USELSW },
+ { "list", 0, LISTDSW },
+ { "refile", 0, REFILSW },
+ { NULL, 0, 0 }
};
int
main (int argc, char **argv)
{
- int use = NOUSE, nedit = 0, nwhat = 0;
+ int use = NOUSE, nedit = 0, nwhat = 0, build = 0;
int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
int outputlinelen = OUTPUTLINELEN;
char *cp, *cwd, *maildir, *dfolder = NULL;
adios (NULL, "missing argument to %s", argp[-2]);
nwhat = 0;
continue;
+
+ case BILDSW:
+ build++;
+ /* fall through */
case NWHATSW:
nwhat++;
continue;
adios (maildir, "unable to change directory to");
/* read folder and create message structure */
- if (!(mp = folder_read (folder)))
+ if (!(mp = folder_read (folder, 1)))
adios (NULL, "unable to read folder %s", folder);
/* check for empty folder */
if (!m_convert (mp, msg))
done (1);
seq_setprev (mp); /* set the previous-sequence */
+ seq_save (mp);
if (mp->numsel > 1)
adios (NULL, "only one message at a time!");
cp = new_fs(form, NULL, NULL);
format_len = strlen(cp);
- fmt_compile(cp, &fmt);
+ fmt_compile(cp, &fmt, 1);
/*
* Set up any components that were fed to us on the command line
*/
if (from) {
- FINDCOMP(cptr, "from");
+ cptr = fmt_findcomp("from");
if (cptr)
cptr->c_text = from;
}
if (to) {
- FINDCOMP(cptr, "to");
+ cptr = fmt_findcomp("to");
if (cptr)
cptr->c_text = to;
}
if (cc) {
- FINDCOMP(cptr, "cc");
+ cptr = fmt_findcomp("cc");
if (cptr)
cptr->c_text = cc;
}
if (fcc) {
- FINDCOMP(cptr, "fcc");
+ cptr = fmt_findcomp("fcc");
if (cptr)
cptr->c_text = fcc;
}
if (subject) {
- FINDCOMP(cptr, "subject");
+ cptr = fmt_findcomp("subject");
if (cptr)
cptr->c_text = subject;
}
}
try_it_again:
- strncpy (drft, m_draft (dfolder, file, use, &isdf), sizeof(drft));
+ strncpy (drft, build ? m_maildir ("draft")
+ : m_draft (dfolder, file, use, &isdf), sizeof(drft));
/*
* Check if we have an existing draft
*/
- if ((out = open (drft, O_RDONLY)) != NOTOK) {
+ if (!build && (out = open (drft, O_RDONLY)) != NOTOK) {
i = fdcompare (in, out);
close (out);
dat[2] = 0;
dat[3] = outputlinelen;
dat[4] = 0;
- fmt_scan(fmt, scanl, i + 1, i, dat);
+ fmt_scan(fmt, scanl, i + 1, i, dat, NULL);
write(out, scanl, strlen(scanl));
free(scanl);
} else {
projects / nmh / blobdiff