X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b524f0f5810f9b34f1d56195d603886ce9075dff..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/fmttest.c diff --git a/uip/fmttest.c b/uip/fmttest.c index dafdbdb8..7d08438b 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -21,15 +21,14 @@ 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) \ @@ -58,7 +57,7 @@ static struct format **lvec = NULL; 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}))%>" @@ -83,16 +82,20 @@ static void assignlabel(struct format *); 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 test_trace(void *, struct format *, int, char *, char *); +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 *); @@ -107,25 +110,19 @@ 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, trace = 0; + 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; @@ -168,17 +165,12 @@ main (int argc, char **argv) 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 == '-') @@ -191,13 +183,6 @@ main (int argc, char **argv) form = NULL; continue; - case NORMSW: - normalize = AD_HOST; - continue; - case NNORMSW: - normalize = AD_NHST; - continue; - case TRACESW: trace++; continue; @@ -218,10 +203,17 @@ main (int argc, char **argv) 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; @@ -276,7 +268,7 @@ main (int argc, char **argv) * 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 @@ -325,22 +317,13 @@ main (int argc, char **argv) } } - /* - * If we don't specify a buffer size, allocate a default one. - */ - - if (bufsize == 0) - bufsize = BUFSIZ; + buffer = charstring_create(BUFSIZ); - buffer = mh_xmalloc(bufsize); - - 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; @@ -368,10 +351,10 @@ main (int argc, char **argv) if (trace) { struct trace_context *ctx; - ctx = mh_xmalloc(sizeof(*ctx)); + NEW(ctx); ctx->num = -1; ctx->str = dummy; - ctx->outbuf = getcpy(NULL); + ctx->outbuf = mh_xstrdup(""); cb.trace_func = test_trace; cb.trace_context = ctx; @@ -379,8 +362,8 @@ main (int argc, char **argv) } 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) { @@ -391,13 +374,12 @@ main (int argc, char **argv) } 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); @@ -415,8 +397,8 @@ struct pqpair { }; 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; @@ -438,11 +420,10 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer, 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); @@ -453,27 +434,23 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer, for (p = pq.pq_next; p; p = q) { c = fmt_findcomp("text"); if (c) { - if (c->c_text) - free(c->c_text); + mh_xfree(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); + mh_xfree(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); + mh_xfree(p->pq_text); + mh_xfree(p->pq_error); q = p->pq_next; free(p); } @@ -487,17 +464,34 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer, 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; - m_getfld_state_t gstate = 0; - int bufsz; + + /* + * 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); @@ -507,7 +501,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) @@ -531,14 +525,13 @@ process_messages(struct format *fmt, struct msgs_array *comps, 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); + mh_xfree(dp); } } @@ -557,26 +550,13 @@ process_messages(struct format *fmt, struct msgs_array *comps, 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; } @@ -586,68 +566,114 @@ process_messages(struct format *fmt, struct msgs_array *comps, * Read in the message and process the components */ - for (state = FLD;;) { - 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) { - bufsz = sizeof(rbuf); - state = m_getfld(&gstate, name, rbuf, &bufsz, in); - fmt_appendcomp(i, name, rbuf); - } - } - - while (state == FLDPLUS) { - bufsz = sizeof(rbuf); - state = m_getfld(&gstate, name, rbuf, &bufsz, in); - } - break; + process_single_file(in, comps, dat, msgsize, fmt, buffer, + outwidth, cb); + } + } - case BODY: - if (fmt_findcomp("body")) { - if ((i = strlen(rbuf)) < outwidth) { - bufsz = outwidth - 1; - state = m_getfld(&gstate, name, rbuf + i, - &bufsz, in); - } + ivector_free (seqnum); + folder_free(mp); + return; +} - fmt_addcomptext("body", rbuf); - } - /* fall through */ +/* + * Process a single file in message mode + */ - default: - goto finished; +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 = 0; + struct comp *c; + int bufsz; + + /* + * 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; + } + + /* + * Initialize everyting else + */ + + 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 + */ + + for (;;) { + 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) { + bufsz = sizeof(rbuf); + state = m_getfld(&gstate, name, rbuf, &bufsz, in); + fmt_appendcomp(i, name, rbuf); } } -finished: - fclose(in); - m_getfld_state_destroy(&gstate); - /* - * 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_getfld(&gstate, name, rbuf, &bufsz, in); + } + break; + + case BODY: + if (fmt_findcomp("body")) { + if ((i = strlen(rbuf)) < outwidth) { + bufsz = min (outwidth, (int) sizeof rbuf - i); + m_getfld(&gstate, name, rbuf + i, &bufsz, in); } + + fmt_addcomptext("body", rbuf); } - fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb); - fputs(buffer, stdout); - mlistfree(); + /* fall through */ + + 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) { + mh_xfree(c->c_text); + c->c_text = getcpy(comps->msgs[i + 1]); + } + } + } + fmt_scan(fmt, buffer, outwidth, dat, cb); + fputs(charstring_buffer (buffer), stdout); + mlistfree(); } /* @@ -655,8 +681,8 @@ finished: */ 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; @@ -674,13 +700,12 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer, for (i = 0; i < text->size; i++) { if (c != NULL) { - if (c->c_text != NULL) - free(c->c_text); + mh_xfree(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(); } } @@ -693,7 +718,8 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer, */ static void -test_trace(void *context, struct format *fmt, int num, char *str, char *outbuf) +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; @@ -708,18 +734,21 @@ test_trace(void *context, struct format *fmt, int num, char *str, char *outbuf) if (str != ctx->str) { if (changed++) - printf(" "); - printf("str=\"%s\"", str ? str : "NULL"); + putchar(' '); + printf("str="); + litputs(str); ctx->str = str; } if (changed) - printf("\n"); + putchar('\n'); if (strcmp(outbuf, ctx->outbuf) != 0) { - printf("outbuf=\"%s\"\n", outbuf); + printf("outbuf="); + litputs(outbuf); + putchar('\n'); free(ctx->outbuf); - ctx->outbuf = getcpy(outbuf); + ctx->outbuf = mh_xstrdup(outbuf); } } @@ -741,7 +770,7 @@ fmt_dump (char *nfs, struct format *fmth) static void dumpone(struct format *fmt) { - register int i; + int i; if ((i = findlabel(fmt)) >= 0) printf("L%d:", i); @@ -809,6 +838,8 @@ dumpone(struct format *fmt) 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) @@ -881,6 +912,7 @@ dumpone(struct format *fmt) 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); @@ -950,7 +982,7 @@ initlabels(struct format *fmth) static int findlabel(struct format *addr) { - register int i; + int i; for (i = 0; i < lused; ++i) if (addr == lvec[i]) @@ -1005,6 +1037,7 @@ f_typestr(int t) 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"); @@ -1049,6 +1082,8 @@ f_typestr(int t) 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"); #ifdef FT_ADDTOSEQ case FT_ADDTOSEQ: return("ADDTOSEQ"); #endif @@ -1079,50 +1114,26 @@ f_typestr(int t) } } -#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); @@ -1137,11 +1148,8 @@ static void 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); @@ -1208,13 +1216,13 @@ static unsigned int bufsiz=0; /* current size of buf */ 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) { @@ -1240,7 +1248,7 @@ test_formataddr (char *orig, char *str) /* 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; } @@ -1301,8 +1309,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)) @@ -1322,8 +1332,8 @@ mlistfree(void) { 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); } }