-
-/*
- * fmttest.c -- A program to help test and debug format instructions
+/* fmttest.c -- A program to help test and debug format instructions
*
* This code is Copyright (c) 2012, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/utils.h>
#include <h/scansbr.h>
#include <h/addrsbr.h>
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
#define FMTTEST_SWITCHES \
X("form formatfile", 0, FORMSW) \
X("format string", 5, FMTSW) \
- X("dump", 0, DUMPSW) \
X("address", 0, ADDRSW) \
X("raw", 0, RAWSW) \
X("date", 0, DATESW) \
X("message", 0, MESSAGESW) \
+ X("file", 0, FILESW) \
+ X("nofile", 0, NFILESW) \
+ X("-component-name component-text", 0, OTHERSW) \
X("dupaddrs", 0, DUPADDRSW) \
X("nodupaddrs", 0, NDUPADDRSW) \
X("ccme", 0, CCMESW) \
X("noccme", 0, NCCMESW) \
- X("normalize", 0, NORMSW) \
- X("nonormalize", 0, NNORMSW) \
X("outsize size-in-characters", 0, OUTSIZESW) \
- X("bufsize size-in-bytes", 0, BUFSZSW) \
X("width column-width", 0, WIDTHSW) \
X("msgnum number", 0, MSGNUMSW) \
X("msgcur flag", 0, MSGCURSW) \
X("msgsize size", 0, MSGSIZESW) \
X("unseen flag", 0, UNSEENSW) \
+ X("dump", 0, DUMPSW) \
+ X("nodump", 0, NDUMPSW) \
+ X("trace", 0, TRACESW) \
+ X("notrace", 0, NTRACESW) \
X("version", 0, VERSIONSW) \
- X("-component-name component-text", 0, OTHERSW) \
X("help", 0, HELPSW) \
#define X(sw, minchars, id) id,
static int lused = 0;
static int lallocated = 0;
-enum mode_t { MESSAGE, ADDRESS, RAW };
+enum mode_t { MESSAGE, ADDRESS, DATE, RAW };
#define DEFADDRFORMAT "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
#define DEFDATEFORMAT "%<(nodate{text})error: %{text}%|%(putstr(pretty{text}))%>"
+/*
+ * Context structure used by the tracing routines
+ */
+
+struct trace_context {
+ int num;
+ char *str;
+ char *outbuf;
+};
+
/*
* static prototypes
*/
static char *f_typestr(int);
static char *c_typestr(int);
static char *c_flagsstr(int);
-static void litputs(char *);
+static void litputs(const char *);
static void litputc(char);
-static void process_addresses(struct format *, struct msgs_array *, char *,
- int, int, int *, int, struct fmt_callbacks *);
-static void process_raw(struct format *, struct msgs_array *, char *,
- int, int, int *, struct fmt_callbacks *);
+static void process_addresses(struct format *, struct msgs_array *,
+ charstring_t, int, int *,
+ struct fmt_callbacks *);
+static void process_raw(struct format *, struct msgs_array *, charstring_t,
+ int, int *, struct fmt_callbacks *);
static void process_messages(struct format *, struct msgs_array *,
- struct msgs_array *, char *, char *, int,
+ struct msgs_array *, charstring_t, char *, int,
int, int *, struct fmt_callbacks *);
+static void process_single_file(FILE *, struct msgs_array *, int *, int,
+ struct format *, charstring_t, int,
+ struct fmt_callbacks *);
+static void test_trace(void *, struct format *, int, char *, const char *);
static char *test_formataddr(char *, char *);
static char *test_concataddr(char *, char *);
static int insert(struct mailname *);
static int nodupcheck = 0; /* If set, no check for duplicates */
static int ccme = 0; /* Should I cc myself? */
static struct mailname mq; /* Mail addresses to check for duplicates */
+static char *dummy = "dummy";
int
main (int argc, char **argv)
{
char *cp, *form = NULL, *format = NULL, *defformat = FORMAT, *folder = NULL;
- char buf[BUFSIZ], *nfs, **argp, **arguments, *buffer;
+ char buf[BUFSIZ], *nfs, **argp, **arguments;
+ charstring_t buffer;
struct format *fmt;
struct comp *cptr;
struct msgs_array msgs = { 0, 0, NULL }, compargs = { 0, 0, NULL};
int dump = 0, i;
- int outputsize = 0, bufsize = 0, dupaddrs = 1;
+ int outputsize = 0, dupaddrs = 1, trace = 0, files = 0;
int colwidth = -1, msgnum = -1, msgcur = -1, msgsize = -1, msgunseen = -1;
- int normalize = AD_HOST;
enum mode_t mode = MESSAGE;
int dat[5];
struct fmt_callbacks cb, *cbp = NULL;
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], 1)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
if (strcmp(cp, "max") == 0)
- outputsize = -1;
+ outputsize = INT_MAX;
else if (strcmp(cp, "width") == 0)
outputsize = sc_width();
else
outputsize = atoi(cp);
continue;
- case BUFSZSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- bufsize = atoi(cp);
- continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
form = NULL;
continue;
- case NORMSW:
- normalize = AD_HOST;
+ case TRACESW:
+ trace++;
continue;
- case NNORMSW:
- normalize = AD_NHST;
+ case NTRACESW:
+ trace = 0;
continue;
case ADDRSW:
dupaddrs = 0;
continue;
case DATESW:
- mode = RAW;
+ mode = DATE;
defformat = DEFDATEFORMAT;
continue;
+ case FILESW:
+ files++;
+ continue;
+ case NFILESW:
+ files = 0;
+ continue;
+
case DUPADDRSW:
dupaddrs++;
continue;
case DUMPSW:
dump++;
continue;
+ case NDUMPSW:
+ dump = 0;
+ continue;
}
}
* Only interpret as a folder if we're in message mode
*/
- if (mode == MESSAGE && (*cp == '+' || *cp == '@')) {
+ if (mode == MESSAGE && !files && (*cp == '+' || *cp == '@')) {
if (folder)
adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
*/
if (!dump && compargs.size == 0 && msgs.size == 0) {
- adios (NULL, "usage: [switches] [+folder] msgs | strings...",
- invo_name);
+ adios(NULL, "usage: [switches] [+folder] msgs | strings...");
+ }
+
+ /*
+ * If you're picking "raw" as a mode, then you have to select
+ * a format.
+ */
+
+ if (mode == RAW && form == NULL && format == NULL) {
+ adios (NULL, "You must specify a format with -form or -format when "
+ "using -raw");
}
/*
nfs = new_fs (form, format, defformat);
(void) fmt_compile(nfs, &fmt, 1);
- if (dump) {
- fmt_dump(nfs, fmt);
- if (compargs.size == 0 && msgs.size == 0)
- done(0);
+ if (dump || trace) {
+ initlabels(fmt);
+ if (dump) {
+ fmt_dump(nfs, fmt);
+ if (compargs.size == 0 && msgs.size == 0)
+ done(0);
+ }
}
- /*
- * If we don't specify a buffer size, allocate a default one.
- */
-
- if (bufsize == 0)
- bufsize = BUFSIZ;
-
- buffer = mh_xmalloc(bufsize);
+ buffer = charstring_create(BUFSIZ);
- if (outputsize < 0)
- outputsize = bufsize - 1; /* For the trailing NUL */
- else if (outputsize == 0) {
- if (mode == MESSAGE)
+ if (outputsize == 0) {
+ if (mode == MESSAGE)
outputsize = sc_width();
else
- outputsize = bufsize - 1;
+ outputsize = INT_MAX;
}
dat[0] = msgnum;
* callback, do that now. Also, prime ismymbox if we use it.
*/
- if (dupaddrs == 0) {
- memset(&cb, 0, sizeof(cb));
- cb.formataddr = test_formataddr;
- cb.concataddr = test_concataddr;
+ if (dupaddrs == 0 || trace) {
+ ZERO(&cb);
cbp = &cb;
- if (!ccme)
- ismymbox(NULL);
+
+ if (dupaddrs == 0) {
+ cb.formataddr = test_formataddr;
+ cb.concataddr = test_concataddr;
+ if (!ccme)
+ ismymbox(NULL);
+ }
+
+ if (trace) {
+ struct trace_context *ctx;
+
+ NEW(ctx);
+ ctx->num = -1;
+ ctx->str = dummy;
+ ctx->outbuf = mh_xstrdup("");
+
+ cb.trace_func = test_trace;
+ cb.trace_context = ctx;
+ }
}
if (mode == MESSAGE) {
- process_messages(fmt, &compargs, &msgs, buffer, folder, bufsize,
- outputsize, dat, cbp);
+ process_messages(fmt, &compargs, &msgs, buffer, folder, outputsize,
+ files, dat, cbp);
} else {
if (compargs.size) {
for (i = 0; i < compargs.size; i += 2) {
}
if (mode == ADDRESS) {
- fmt_norm = normalize;
- process_addresses(fmt, &msgs, buffer, bufsize, outputsize,
- dat, normalize, cbp);
- } else
- process_raw(fmt, &msgs, buffer, bufsize, outputsize, dat, cbp);
+ process_addresses(fmt, &msgs, buffer, outputsize, dat, cbp);
+ } else /* Fall-through for RAW or DATE */
+ process_raw(fmt, &msgs, buffer, outputsize, dat, cbp);
}
+ charstring_free(buffer);
fmt_free(fmt, 1);
done(0);
};
static void
-process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
- int bufsize, int outwidth, int *dat, int norm,
+process_addresses(struct format *fmt, struct msgs_array *addrs,
+ charstring_t buffer, int outwidth, int *dat,
struct fmt_callbacks *cb)
{
int i;
for (i = 0; i < addrs->size; i++) {
(q = &pq)->pq_next = NULL;
while ((cp = getname(addrs->msgs[i]))) {
- if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
- adios (NULL, "unable to allocate pqpair memory");
- if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
- p->pq_text = getcpy(cp);
- p->pq_error = getcpy(error);
+ NEW0(p);
+ if ((mp = getm(cp, NULL, 0, error, sizeof(error))) == NULL) {
+ p->pq_text = mh_xstrdup(cp);
+ p->pq_error = mh_xstrdup(error);
} else {
p->pq_text = getcpy(mp->m_text);
mnfree(mp);
for (p = pq.pq_next; p; p = q) {
c = fmt_findcomp("text");
if (c) {
- if (c->c_text)
- free(c->c_text);
+ free(c->c_text);
c->c_text = p->pq_text;
p->pq_text = NULL;
}
c = fmt_findcomp("error");
if (c) {
- if (c->c_text)
- free(c->c_text);
+ free(c->c_text);
c->c_text = p->pq_error;
p->pq_error = NULL;
}
- fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
- fputs(buffer, stdout);
+ fmt_scan(fmt, buffer, outwidth, dat, cb);
+ fputs(charstring_buffer(buffer), stdout);
mlistfree();
- if (p->pq_text)
- free(p->pq_text);
- if (p->pq_error)
- free(p->pq_error);
+ free(p->pq_text);
+ free(p->pq_error);
q = p->pq_next;
free(p);
}
static void
process_messages(struct format *fmt, struct msgs_array *comps,
- struct msgs_array *msgs, char *buffer, char *folder,
- int bufsize, int outwidth, int *dat, struct fmt_callbacks *cb)
+ struct msgs_array *msgs, charstring_t buffer, char *folder,
+ int outwidth, int files, int *dat,
+ struct fmt_callbacks *cb)
{
- int i, state, msgnum, msgsize = dat[2], num = dat[0], cur = dat[1];
- int num_unseen_seq = 0, seqnum[NUMATTRS];
- char *maildir, *cp, name[NAMESZ], rbuf[BUFSIZ];
+ int i, msgnum, msgsize = dat[2], num = dat[0], cur = dat[1];
+ int num_unseen_seq = 0;
+ ivector_t seqnum = ivector_create (0);
+ char *maildir, *cp;
struct msgs *mp;
- struct comp *c;
FILE *in;
+ /*
+ * If 'files' is set, short-circuit everything else and just process
+ * everything now.
+ */
+
+ if (files) {
+ for (i = 0; i < msgs->size; i++) {
+ if ((in = fopen(cp = msgs->msgs[i], "r")) == NULL) {
+ admonish(cp, "unable to open file");
+ continue;
+ }
+ process_single_file(in, comps, dat, msgsize, fmt, buffer,
+ outwidth, cb);
+ }
+
+ return;
+ }
+
if (! folder)
folder = getfolder(1);
if (chdir(maildir) < 0)
adios(maildir, "unable to change directory to");
- if (!(mp = folder_read(folder)))
+ if (!(mp = folder_read(folder, 1)))
adios(NULL, "unable to read folder %s", folder);
if (mp->nummsg == 0)
done(1);
seq_setprev(mp); /* set the Previous-Sequence */
- context_replace(pfolder, folder); /* update curren folder */
+ context_replace(pfolder, folder); /* update current folder */
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
if ((cp = context_find(usequence)) && *cp) {
char **ap, *dp;
- dp = getcpy(cp);
+ dp = mh_xstrdup(cp);
ap = brkstring(dp, " ", "\n");
for (i = 0; ap && *ap; i++, ap++)
- seqnum[i] = seq_getnum(mp, *ap);
+ ivector_push_back (seqnum, seq_getnum(mp, *ap));
num_unseen_seq = i;
- if (dp)
- free(dp);
+ free(dp);
}
}
if (cur == -1)
dat[1] = msgnum == mp->curmsg;
- /*
- * Get our size if we didn't include one
- */
-
- if (msgsize == -1) {
- struct stat st;
-
- if (fstat(fileno(in), &st) < 0)
- dat[2] = 0;
- else
- dat[2] = st.st_size;
- }
-
/*
* Check to see if this is in the unseen sequence
*/
dat[4] = 0;
for (i = 0; i < num_unseen_seq; i++) {
- if (in_sequence(mp, seqnum[i], msgnum)) {
+ if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {
dat[4] = 1;
break;
}
* Read in the message and process the components
*/
- for (state = FLD;;) {
- state = m_getfld(state, name, rbuf, sizeof(rbuf), in);
- switch (state) {
- case FLD:
- case FLDPLUS:
- i = fmt_addcomptext(name, rbuf);
- if (i != -1) {
- while (state == FLDPLUS) {
- state = m_getfld(state, name, rbuf,
- sizeof(rbuf), in);
- fmt_appendcomp(i, name, rbuf);
- }
- }
-
- while (state == FLDPLUS)
- state = m_getfld(state, name, rbuf,
- sizeof(rbuf), in);
- break;
+ process_single_file(in, comps, dat, msgsize, fmt, buffer,
+ outwidth, cb);
+ }
+ }
+
+ ivector_free (seqnum);
+ folder_free(mp);
+}
+
+/*
+ * Process a single file in message mode
+ */
+
+static void
+process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
+ struct format *fmt, charstring_t buffer, int outwidth,
+ struct fmt_callbacks *cb)
+{
+ int i, state;
+ char name[NAMESZ], rbuf[NMH_BUFSIZ];
+ m_getfld_state_t gstate;
+ struct comp *c;
+ int bufsz;
+
+ /*
+ * Get our size if we didn't include one
+ */
- case BODY:
- if (fmt_findcomp("body")) {
- if ((i = strlen(rbuf)) < outwidth)
- state = m_getfld(state, name, rbuf + i,
- outwidth - 1, in);
+ if (msgsize == -1) {
+ struct stat st;
+
+ if (fstat(fileno(in), &st) < 0)
+ dat[2] = 0;
+ else
+ dat[2] = st.st_size;
+ }
- fmt_addcomptext("body", rbuf);
- }
- /* fall through */
+ /*
+ * Initialize everything else
+ */
- default:
- goto finished;
+ if (dat[0] == -1)
+ dat[0] = 0;
+ if (dat[1] == -1)
+ dat[1] = 0;
+ if (dat[4] == -1)
+ dat[4] = 0;
+
+ /*
+ * Read in the message and process the components
+ */
+
+ gstate = m_getfld_state_init(in);
+ for (;;) {
+ bufsz = sizeof(rbuf);
+ state = m_getfld2(&gstate, name, rbuf, &bufsz);
+ switch (state) {
+ case FLD:
+ case FLDPLUS:
+ i = fmt_addcomptext(name, rbuf);
+ if (i != -1) {
+ while (state == FLDPLUS) {
+ bufsz = sizeof(rbuf);
+ state = m_getfld2(&gstate, name, rbuf, &bufsz);
+ fmt_appendcomp(i, name, rbuf);
}
}
-finished:
- fclose(in);
- /*
- * Do this now to override any components in the original message
- */
- if (comps->size) {
- for (i = 0; i < comps->size; i += 2) {
- c = fmt_findcomp(comps->msgs[i]);
- if (c) {
- if (c->c_text)
- free(c->c_text);
- c->c_text = getcpy(comps->msgs[i + 1]);
- }
+ while (state == FLDPLUS) {
+ bufsz = sizeof(rbuf);
+ state = m_getfld2(&gstate, name, rbuf, &bufsz);
+ }
+ break;
+
+ case BODY:
+ if (fmt_findcomp("body")) {
+ if ((i = strlen(rbuf)) < outwidth) {
+ bufsz = min (outwidth, (int) sizeof rbuf - i);
+ m_getfld2(&gstate, name, rbuf + i, &bufsz);
}
+
+ fmt_addcomptext("body", rbuf);
}
- fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
- fputs(buffer, stdout);
- mlistfree();
+ goto finished;
+
+ default:
+ goto finished;
}
}
+finished:
+ fclose(in);
+ m_getfld_state_destroy(&gstate);
- folder_free(mp);
- return;
+ /*
+ * Do this now to override any components in the original message
+ */
+ if (comps->size) {
+ for (i = 0; i < comps->size; i += 2) {
+ c = fmt_findcomp(comps->msgs[i]);
+ if (c) {
+ free(c->c_text);
+ c->c_text = getcpy(comps->msgs[i + 1]);
+ }
+ }
+ }
+ fmt_scan(fmt, buffer, outwidth, dat, cb);
+ fputs(charstring_buffer (buffer), stdout);
+ mlistfree();
}
/*
*/
static void
-process_raw(struct format *fmt, struct msgs_array *text, char *buffer,
- int bufsize, int outwidth, int *dat, struct fmt_callbacks *cb)
+process_raw(struct format *fmt, struct msgs_array *text, charstring_t buffer,
+ int outwidth, int *dat, struct fmt_callbacks *cb)
{
int i;
struct comp *c;
for (i = 0; i < text->size; i++) {
if (c != NULL) {
- if (c->c_text != NULL)
- free(c->c_text);
+ free(c->c_text);
c->c_text = getcpy(text->msgs[i]);
}
- fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
- fputs(buffer, stdout);
+ fmt_scan(fmt, buffer, outwidth, dat, cb);
+ fputs(charstring_buffer (buffer), stdout);
mlistfree();
}
}
+/*
+ * Our basic tracing support callback.
+ *
+ * Print out each instruction as it's executed, including the values of
+ * the num and str registers if they've changed.
+ */
+
+static void
+test_trace(void *context, struct format *fmt, int num, char *str,
+ const char *outbuf)
+{
+ struct trace_context *ctx = (struct trace_context *) context;
+ int changed = 0;
+
+ dumpone(fmt);
+
+ if (num != ctx->num) {
+ printf("num=%d", num);
+ ctx->num = num;
+ changed++;
+ }
+
+ if (str != ctx->str) {
+ if (changed++)
+ putchar(' ');
+ printf("str=");
+ litputs(str);
+ ctx->str = str;
+ }
+
+ if (changed)
+ putchar('\n');
+
+ if (strcmp(outbuf, ctx->outbuf) != 0) {
+ printf("outbuf=");
+ litputs(outbuf);
+ putchar('\n');
+ free(ctx->outbuf);
+ ctx->outbuf = mh_xstrdup(outbuf);
+ }
+}
+
static void
fmt_dump (char *nfs, struct format *fmth)
{
printf("Instruction dump of format string: \n%s\n", nfs);
- initlabels(fmth);
-
/* Dump them out! */
for (fmt = fmth; fmt; ++fmt) {
dumpone(fmt);
static void
dumpone(struct format *fmt)
{
- register int i;
+ int i;
if ((i = findlabel(fmt)) >= 0)
printf("L%d:", i);
case FT_LS_FRIENDLY:
case FT_PARSEADDR:
case FT_MYMBOX:
+ case FT_GETMYMBOX:
+ case FT_GETMYADDR:
printf(", c_name ");
litputs(fmt->f_comp->c_name);
if (fmt->f_comp->c_type)
break;
case FT_LIT:
-#ifdef FT_LIT_FORCE
- case FT_LIT_FORCE:
-#endif
putchar(' ');
litputs(fmt->f_text);
break;
case FT_IF_MATCH:
case FT_IF_AMATCH:
printf(" continue else goto");
+ /* FALLTHRU */
case FT_GOTO:
i = findlabel(fmt + fmt->f_skip);
printf(" L%d", i);
case FT_LV_LIT:
case FT_LV_PLUS_L:
case FT_LV_MINUS_L:
+ case FT_LV_MULTIPLY_L:
case FT_LV_DIVIDE_L:
case FT_LV_MODULO_L:
printf(" value %d", fmt->f_value);
static int
findlabel(struct format *addr)
{
- register int i;
+ int i;
for (i = 0; i < lused; ++i)
if (addr == lvec[i])
static char buf[32];
switch (t) {
- case FT_COMP: return("COMP");
- case FT_COMPF: return("COMPF");
- case FT_LIT: return("LIT");
- case FT_LITF: return("LITF");
-#ifdef FT_LIT_FORCE
- case FT_LIT_FORCE: return("LIT_FORCE");
-#endif
- case FT_CHAR: return("CHAR");
- case FT_NUM: return("NUM");
- case FT_NUMF: return("NUMF");
- case FT_STR: return("STR");
- case FT_STRF: return("STRF");
- case FT_STRFW: return("STRFW");
- case FT_PUTADDR: return("PUTADDR");
- case FT_STRLIT: return("STRLIT");
- case FT_STRLITZ: return("STRLITZ");
- case FT_LS_COMP: return("LS_COMP");
- case FT_LS_LIT: return("LS_LIT");
- case FT_LS_GETENV: return("LS_GETENV");
- case FT_LS_DECODECOMP: return("FT_LS_DECODECOMP");
- case FT_LS_DECODE: return("FT_LS_DECODE");
- case FT_LS_TRIM: return("LS_TRIM");
- case FT_LV_COMP: return("LV_COMP");
- case FT_LV_COMPFLAG: return("LV_COMPFLAG");
- case FT_LV_LIT: return("LV_LIT");
- case FT_LV_DAT: return("LV_DAT");
- case FT_LV_STRLEN: return("LV_STRLEN");
- case FT_LV_PLUS_L: return("LV_PLUS_L");
- case FT_LV_MINUS_L: return("LV_MINUS_L");
- case FT_LV_DIVIDE_L: return("LV_DIVIDE_L");
- case FT_LV_MODULO_L: return("LV_MODULO_L");
- case FT_LV_CHAR_LEFT: return("LV_CHAR_LEFT");
- case FT_LS_MONTH: return("LS_MONTH");
- case FT_LS_LMONTH: return("LS_LMONTH");
- case FT_LS_ZONE: return("LS_ZONE");
- case FT_LS_DAY: return("LS_DAY");
- case FT_LS_WEEKDAY: return("LS_WEEKDAY");
- case FT_LS_822DATE: return("LS_822DATE");
- case FT_LS_PRETTY: return("LS_PRETTY");
- case FT_LV_SEC: return("LV_SEC");
- case FT_LV_MIN: return("LV_MIN");
- case FT_LV_HOUR: return("LV_HOUR");
- case FT_LV_MDAY: return("LV_MDAY");
- case FT_LV_MON: return("LV_MON");
- case FT_LV_YEAR: return("LV_YEAR");
- case FT_LV_YDAY: return("LV_YDAY");
- case FT_LV_WDAY: return("LV_WDAY");
- case FT_LV_ZONE: return("LV_ZONE");
- case FT_LV_CLOCK: return("LV_CLOCK");
- case FT_LV_RCLOCK: return("LV_RCLOCK");
- case FT_LV_DAYF: return("LV_DAYF");
- case FT_LV_DST: return("LV_DST");
- case FT_LV_ZONEF: return("LV_ZONEF");
- case FT_LS_ADDR: return("LS_ADDR");
- case FT_LS_PERS: return("LS_PERS");
- case FT_LS_MBOX: return("LS_MBOX");
- case FT_LS_HOST: return("LS_HOST");
- case FT_LS_PATH: return("LS_PATH");
- case FT_LS_GNAME: return("LS_GNAME");
- case FT_LS_NOTE: return("LS_NOTE");
- case FT_LS_822ADDR: return("LS_822ADDR");
- case FT_LS_FRIENDLY: return("LS_FRIENDLY");
- case FT_LV_HOSTTYPE: return("LV_HOSTTYPE");
- case FT_LV_INGRPF: return("LV_INGRPF");
- case FT_LV_NOHOSTF: return("LV_NOHOSTF");
- case FT_LOCALDATE: return("LOCALDATE");
- case FT_GMTDATE: return("GMTDATE");
- case FT_PARSEDATE: return("PARSEDATE");
- case FT_PARSEADDR: return("PARSEADDR");
- case FT_FORMATADDR: return("FORMATADDR");
- case FT_CONCATADDR: return("CONCATADDR");
- case FT_MYMBOX: return("MYMBOX");
-#ifdef FT_ADDTOSEQ
- case FT_ADDTOSEQ: return("ADDTOSEQ");
-#endif
- case FT_SAVESTR: return("SAVESTR");
-#ifdef FT_PAUSE
- case FT_PAUSE: return ("PAUSE");
-#endif
- case FT_DONE: return("DONE");
- case FT_NOP: return("NOP");
- case FT_GOTO: return("GOTO");
- case FT_IF_S_NULL: return("IF_S_NULL");
- case FT_IF_S: return("IF_S");
- case FT_IF_V_EQ: return("IF_V_EQ");
- case FT_IF_V_NE: return("IF_V_NE");
- case FT_IF_V_GT: return("IF_V_GT");
- case FT_IF_MATCH: return("IF_MATCH");
- case FT_IF_AMATCH: return("IF_AMATCH");
- case FT_S_NULL: return("S_NULL");
- case FT_S_NONNULL: return("S_NONNULL");
- case FT_V_EQ: return("V_EQ");
- case FT_V_NE: return("V_NE");
- case FT_V_GT: return("V_GT");
- case FT_V_MATCH: return("V_MATCH");
- case FT_V_AMATCH: return("V_AMATCH");
+ case FT_COMP: return "COMP";
+ case FT_COMPF: return "COMPF";
+ case FT_LIT: return "LIT";
+ case FT_LITF: return "LITF";
+ case FT_CHAR: return "CHAR";
+ case FT_NUM: return "NUM";
+ case FT_NUMF: return "NUMF";
+ case FT_STR: return "STR";
+ case FT_STRF: return "STRF";
+ case FT_STRFW: return "STRFW";
+ case FT_STRLIT: return "STRLIT";
+ case FT_STRLITZ: return "STRLITZ";
+ case FT_PUTADDR: return "PUTADDR";
+ case FT_LS_COMP: return "LS_COMP";
+ case FT_LS_LIT: return "LS_LIT";
+ case FT_LS_GETENV: return "LS_GETENV";
+ case FT_LS_CFIND: return "LS_CFIND";
+ case FT_LS_DECODECOMP: return "LS_DECODECOMP";
+ case FT_LS_DECODE: return "LS_DECODE";
+ case FT_LS_TRIM: return "LS_TRIM";
+ case FT_LV_COMP: return "LV_COMP";
+ case FT_LV_COMPFLAG: return "LV_COMPFLAG";
+ case FT_LV_LIT: return "LV_LIT";
+ case FT_LV_DAT: return "LV_DAT";
+ case FT_LV_STRLEN: return "LV_STRLEN";
+ case FT_LV_PLUS_L: return "LV_PLUS_L";
+ case FT_LV_MINUS_L: return "LV_MINUS_L";
+ case FT_LV_MULTIPLY_L: return "LV_MULTIPLY_L";
+ case FT_LV_DIVIDE_L: return "LV_DIVIDE_L";
+ case FT_LV_MODULO_L: return "LV_MODULO_L";
+ case FT_LV_CHAR_LEFT: return "LV_CHAR_LEFT";
+ case FT_LS_MONTH: return "LS_MONTH";
+ case FT_LS_LMONTH: return "LS_LMONTH";
+ case FT_LS_ZONE: return "LS_ZONE";
+ case FT_LS_DAY: return "LS_DAY";
+ case FT_LS_WEEKDAY: return "LS_WEEKDAY";
+ case FT_LS_822DATE: return "LS_822DATE";
+ case FT_LS_PRETTY: return "LS_PRETTY";
+ case FT_LS_KILO: return "LS_KILO";
+ case FT_LS_KIBI: return "LS_KIBI";
+ case FT_LV_SEC: return "LV_SEC";
+ case FT_LV_MIN: return "LV_MIN";
+ case FT_LV_HOUR: return "LV_HOUR";
+ case FT_LV_MDAY: return "LV_MDAY";
+ case FT_LV_MON: return "LV_MON";
+ case FT_LV_YEAR: return "LV_YEAR";
+ case FT_LV_YDAY: return "LV_YDAY";
+ case FT_LV_WDAY: return "LV_WDAY";
+ case FT_LV_ZONE: return "LV_ZONE";
+ case FT_LV_CLOCK: return "LV_CLOCK";
+ case FT_LV_RCLOCK: return "LV_RCLOCK";
+ case FT_LV_DAYF: return "LV_DAYF";
+ case FT_LV_DST: return "LV_DST";
+ case FT_LV_ZONEF: return "LV_ZONEF";
+ case FT_LS_PERS: return "LS_PERS";
+ case FT_LS_MBOX: return "LS_MBOX";
+ case FT_LS_HOST: return "LS_HOST";
+ case FT_LS_PATH: return "LS_PATH";
+ case FT_LS_GNAME: return "LS_GNAME";
+ case FT_LS_NOTE: return "LS_NOTE";
+ case FT_LS_ADDR: return "LS_ADDR";
+ case FT_LS_822ADDR: return "LS_822ADDR";
+ case FT_LS_FRIENDLY: return "LS_FRIENDLY";
+ case FT_LV_HOSTTYPE: return "LV_HOSTTYPE";
+ case FT_LV_INGRPF: return "LV_INGRPF";
+ case FT_LS_UNQUOTE: return "LS_UNQUOTE";
+ case FT_LV_NOHOSTF: return "LV_NOHOSTF";
+ case FT_LOCALDATE: return "LOCALDATE";
+ case FT_GMTDATE: return "GMTDATE";
+ case FT_PARSEDATE: return "PARSEDATE";
+ case FT_PARSEADDR: return "PARSEADDR";
+ case FT_FORMATADDR: return "FORMATADDR";
+ case FT_CONCATADDR: return "CONCATADDR";
+ case FT_MYMBOX: return "MYMBOX";
+ case FT_GETMYMBOX: return "GETMYMBOX";
+ case FT_GETMYADDR: return "GETMYADDR";
+ case FT_SAVESTR: return "SAVESTR";
+ case FT_DONE: return "DONE";
+ case FT_PAUSE: return "PAUSE";
+ case FT_NOP: return "NOP";
+ case FT_GOTO: return "GOTO";
+ case FT_IF_S_NULL: return "IF_S_NULL";
+ case FT_IF_S: return "IF_S";
+ case FT_IF_V_EQ: return "IF_V_EQ";
+ case FT_IF_V_NE: return "IF_V_NE";
+ case FT_IF_V_GT: return "IF_V_GT";
+ case FT_IF_MATCH: return "IF_MATCH";
+ case FT_IF_AMATCH: return "IF_AMATCH";
+ case FT_S_NULL: return "S_NULL";
+ case FT_S_NONNULL: return "S_NONNULL";
+ case FT_V_EQ: return "V_EQ";
+ case FT_V_NE: return "V_NE";
+ case FT_V_GT: return "V_GT";
+ case FT_V_MATCH: return "V_MATCH";
+ case FT_V_AMATCH: return "V_AMATCH";
default:
- printf(buf, "/* ??? #%d */", t);
+ snprintf(buf, sizeof(buf), "/* ??? #%d */", t);
return(buf);
}
}
-#define FNORD(v, s) if (t & (v)) { \
- if (i++ > 0) \
- strcat(buf, "|"); \
- strcat(buf, s); }
-
static char *
c_typestr(int t)
{
- register int i;
static char buf[64];
- buf[0] = '\0';
- if (t & ~(CT_ADDR|CT_DATE))
- printf(buf, "0x%x ", t);
- strcat(buf, "<");
- i = 0;
- FNORD(CT_ADDR, "ADDR");
- FNORD(CT_DATE, "DATE");
- strcat(buf, ">");
+ snprintb(buf, sizeof(buf), t, CT_BITS);
return(buf);
}
static char *
c_flagsstr(int t)
{
- register int i;
static char buf[64];
- buf[0] = '\0';
- if (t & ~(CF_TRUE|CF_PARSED|CF_DATEFAB|CF_TRIMMED))
- printf(buf, "0x%x ", t);
- strcat(buf, "<");
- i = 0;
- FNORD(CF_TRUE, "TRUE");
- FNORD(CF_PARSED, "PARSED");
- FNORD(CF_DATEFAB, "DATEFAB");
- FNORD(CF_TRIMMED, "TRIMMED");
- strcat(buf, ">");
+ snprintb(buf, sizeof(buf), t, CF_BITS);
return(buf);
}
-#undef FNORD
static void
-litputs(char *s)
+litputs(const char *s)
{
if (s) {
- putc('"', stdout);
+ putchar('"');
while (*s)
litputc(*s++);
- putc('"', stdout);
+ putchar('"');
} else
fputs("<nil>", stdout);
}
litputc(char c)
{
if (c & ~ 0177) {
- putc('M', stdout);
- putc('-', stdout);
- c &= 0177;
- }
- if (c < 0x20 || c == 0177) {
+ printf("\\x%02x", (unsigned char) c);
+ } else if (c < 0x20 || c == 0177) {
if (c == '\b') {
- putc('\\', stdout);
- putc('b', stdout);
+ putchar('\\');
+ putchar('b');
} else if (c == '\f') {
- putc('\\', stdout);
- putc('f', stdout);
+ putchar('\\');
+ putchar('f');
} else if (c == '\n') {
- putc('\\', stdout);
- putc('n', stdout);
+ putchar('\\');
+ putchar('n');
} else if (c == '\r') {
- putc('\\', stdout);
- putc('r', stdout);
+ putchar('\\');
+ putchar('r');
} else if (c == '\t') {
- putc('\\', stdout);
- putc('t', stdout);
+ putchar('\\');
+ putchar('t');
} else {
- putc('^', stdout);
- putc(c ^ 0x40, stdout); /* DEL to ?, others to alpha */
+ putchar('^');
+ putchar(c ^ 0x40); /* DEL to ?, others to alpha */
}
} else
- putc(c, stdout);
+ putchar(c);
}
/*
static char *
test_formataddr (char *orig, char *str)
{
- register int len;
+ int len;
char error[BUFSIZ];
- register int isgroup;
- register char *dst;
- register char *cp;
- register char *sp;
- register struct mailname *mp = NULL;
+ int isgroup;
+ char *dst;
+ char *cp;
+ char *sp;
+ struct mailname *mp = NULL;
/* if we don't have a buffer yet, get one */
if (bufsiz == 0) {
/* concatenate all the new addresses onto 'buf' */
for (isgroup = 0; (cp = getname (str)); ) {
- if ((mp = getm (cp, NULL, 0, AD_NAME, error)) == NULL) {
+ if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
fprintf(stderr, "bad address \"%s\" -- %s\n", cp, error);
continue;
}
return 0;
for (mp = &mq; mp->m_next; mp = mp->m_next) {
- if (!mh_strcasecmp (np->m_host, mp->m_next->m_host)
- && !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox))
+ if (!strcasecmp (FENDNULL(np->m_host),
+ FENDNULL(mp->m_next->m_host)) &&
+ !strcasecmp (FENDNULL(np->m_mbox),
+ FENDNULL(mp->m_next->m_mbox)))
return 0;
}
if (!ccme && ismymbox (np))
{
struct mailname *mp, *mp2;
- for (mp = mq.m_next; mp; mp = mp2->m_next) {
- mp2 = mp;
+ for (mp = mq.m_next; mp; mp = mp2) {
+ mp2 = mp->m_next;
mnfree(mp);
}
}
projects / nmh / blobdiff