X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/eae69f175e0dc5229d74f1c3bf8fa42b6e69cd6f..c0a87b2e2dfa156bfb4e6c0e5d43f7a582f779fc:/uip/fmttest.c diff --git a/uip/fmttest.c b/uip/fmttest.c index 8297ccb8..e18e2cd5 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -17,11 +17,11 @@ #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("-component-name component-text", 0, OTHERSW) \ X("dupaddrs", 0, DUPADDRSW) \ X("nodupaddrs", 0, NDUPADDRSW) \ X("ccme", 0, CCMESW) \ @@ -35,8 +35,11 @@ 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, @@ -59,6 +62,16 @@ enum mode_t { MESSAGE, ADDRESS, 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 */ @@ -79,6 +92,7 @@ static void process_raw(struct format *, struct msgs_array *, char *, static void process_messages(struct format *, struct msgs_array *, struct msgs_array *, char *, char *, int, int, int *, struct fmt_callbacks *); +static void test_trace(void *, struct format *, int, char *, char *); static char *test_formataddr(char *, char *); static char *test_concataddr(char *, char *); static int insert(struct mailname *); @@ -87,6 +101,7 @@ static void mlistfree(void); 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) @@ -97,7 +112,7 @@ main (int argc, char **argv) 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, bufsize = 0, dupaddrs = 1, trace = 0; int colwidth = -1, msgnum = -1, msgcur = -1, msgsize = -1, msgunseen = -1; int normalize = AD_HOST; enum mode_t mode = MESSAGE; @@ -183,6 +198,13 @@ main (int argc, char **argv) normalize = AD_NHST; continue; + case TRACESW: + trace++; + continue; + case NTRACESW: + trace = 0; + continue; + case ADDRSW: mode = ADDRESS; defformat = DEFADDRFORMAT; @@ -243,6 +265,9 @@ main (int argc, char **argv) case DUMPSW: dump++; continue; + case NDUMPSW: + dump = 0; + continue; } } @@ -275,16 +300,29 @@ main (int argc, char **argv) invo_name); } + /* + * 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"); + } + /* * Get new format string. Must be before chdir(). */ 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); + } } /* @@ -316,13 +354,28 @@ main (int argc, char **argv) * callback, do that now. Also, prime ismymbox if we use it. */ - if (dupaddrs == 0) { + if (dupaddrs == 0 || trace) { memset(&cb, 0, sizeof(cb)); - cb.formataddr = test_formataddr; - cb.concataddr = test_concataddr; 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; + + ctx = mh_xmalloc(sizeof(*ctx)); + ctx->num = -1; + ctx->str = dummy; + ctx->outbuf = getcpy(NULL); + + cb.trace_func = test_trace; + cb.trace_context = ctx; + } } if (mode == MESSAGE) { @@ -438,11 +491,14 @@ process_messages(struct format *fmt, struct msgs_array *comps, int bufsize, int outwidth, 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]; + int num_unseen_seq = 0; + ivector_t seqnum = ivector_create (0); char *maildir, *cp, name[NAMESZ], rbuf[BUFSIZ]; struct msgs *mp; struct comp *c; FILE *in; + m_getfld_state_t gstate = 0; + int bufsz; if (! folder) folder = getfolder(1); @@ -452,7 +508,7 @@ process_messages(struct format *fmt, struct msgs_array *comps, 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) @@ -479,7 +535,7 @@ process_messages(struct format *fmt, struct msgs_array *comps, dp = getcpy(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) @@ -521,7 +577,7 @@ process_messages(struct format *fmt, struct msgs_array *comps, 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; } @@ -532,29 +588,33 @@ process_messages(struct format *fmt, struct msgs_array *comps, */ for (state = FLD;;) { - state = m_getfld(state, name, rbuf, sizeof(rbuf), in); + bufsz = sizeof(rbuf); + state = m_getfld(&gstate, name, rbuf, &bufsz, 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); + bufsz = sizeof(rbuf); + state = m_getfld(&gstate, name, rbuf, &bufsz, in); fmt_appendcomp(i, name, rbuf); } } - while (state == FLDPLUS) - state = m_getfld(state, name, rbuf, - sizeof(rbuf), in); + while (state == FLDPLUS) { + bufsz = sizeof(rbuf); + state = m_getfld(&gstate, name, rbuf, &bufsz, in); + } break; case BODY: if (fmt_findcomp("body")) { - if ((i = strlen(rbuf)) < outwidth) - state = m_getfld(state, name, rbuf + i, - outwidth - 1, in); + if ((i = strlen(rbuf)) < outwidth) { + bufsz = outwidth - 1; + state = m_getfld(&gstate, name, rbuf + i, + &bufsz, in); + } fmt_addcomptext("body", rbuf); } @@ -566,6 +626,7 @@ process_messages(struct format *fmt, struct msgs_array *comps, } finished: fclose(in); + m_getfld_state_destroy(&gstate); /* * Do this now to override any components in the original message @@ -586,6 +647,7 @@ finished: } } + ivector_free (seqnum); folder_free(mp); return; } @@ -625,6 +687,44 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer, } } +/* + * 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, 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++) + printf(" "); + printf("str=\"%s\"", str ? str : "NULL"); + ctx->str = str; + } + + if (changed) + printf("\n"); + + if (strcmp(outbuf, ctx->outbuf) != 0) { + printf("outbuf=\"%s\"\n", outbuf); + free(ctx->outbuf); + ctx->outbuf = getcpy(outbuf); + } +} + static void fmt_dump (char *nfs, struct format *fmth) { @@ -632,8 +732,6 @@ 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); @@ -899,8 +997,8 @@ f_typestr(int t) 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_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"); @@ -944,6 +1042,7 @@ f_typestr(int t) 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"); @@ -977,7 +1076,7 @@ f_typestr(int t) 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); } } @@ -1204,8 +1303,10 @@ insert (struct mailname *np) 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 (np->m_host ? np->m_host : "", + mp->m_next->m_host ? mp->m_next->m_host : "") && + !strcasecmp (np->m_mbox ? np->m_mbox : "", + mp->m_next->m_mbox ? mp->m_next->m_mbox : "")) return 0; } if (!ccme && ismymbox (np))