/*
** Buffer size for content part of header fields. We want this
** to be large enough so that we don't do a lot of extra FLDPLUS
-** calls on m_getfld but small enough so that we don't snarf
-** the entire message body when we're only going to display 30
-** characters of it.
+** calls on m_getfld.
*/
#define SBUFSIZ 512
static struct format *fmt;
-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
static struct comp *datecomp; /* pntr to "date" comp */
-static struct comp *bodycomp; /* pntr to "body" pseudo-comp (if referenced) */
static int ncomps = 0; /* # of interesting components */
static char **compbuffers = 0; /* buffers for component text */
static struct comp **used_buf = 0; /* stack for comp that use buffers */
int i, compnum, encrypted, state;
unsigned char *cp, *tmpbuf;
char **nxtbuf;
- char *saved_c_text = NULL;
struct comp *cptr;
struct comp **savecomp;
char *scnmsg = NULL;
FILE *scnout = NULL;
char name[NAMESZ];
- static int rlwidth, slwidth;
+ static int slwidth;
#ifdef RPATHS
char returnpath[BUFSIZ];
/* Compile format string */
ncomps = fmt_compile(nfs, &fmt) + 1;
-#ifdef JLR
- fmt_top = fmt;
-#endif /* JLR */
- FINDCOMP(bodycomp, "body");
FINDCOMP(datecomp, "date");
FINDCOMP(cptr, "folder");
if (cptr && folder)
if (!cptr)
if ((cptr = (struct comp *)calloc(1, sizeof(*cptr)))) {
cptr->c_name = "encrypted";
- cptr->c_next = wantcomp[i = CHASH(cptr->c_name)];
+ cptr->c_next = wantcomp[i=CHASH(cptr->c_name)];
wantcomp[i] = cptr;
ncomps++;
}
if (used_buf == NULL)
adios(NULL, "unable to allocate component buffer stack");
used_buf += ncomps+1; *--used_buf = 0;
- rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
for (i = ncomps; i--; )
- *nxtbuf++ = mh_xmalloc(rlwidth);
+ *nxtbuf++ = mh_xmalloc(SBUFSIZ);
}
/*
** Get the first field. If the message is non-empty
** and we're doing an "inc", open the output file.
*/
- if ((state = m_getfld(FLD, name, tmpbuf, rlwidth, inb)) == FILEEOF) {
+ if ((state = m_getfld(FLD, name, tmpbuf, SBUFSIZ, inb)) == FILEEOF) {
if (ferror(inb)) {
advise("read", "unable to"); /* "read error" */
return SCNFAT;
/* scan - main loop */
for (compnum = 1; ;
- state = m_getfld(state, name, tmpbuf, rlwidth, inb)) {
+ state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb)) {
switch (state) {
- case FLD:
- case FLDPLUS:
- compnum++;
- if (outnum) {
- FPUTS(name);
- if (putc(':', scnout) == EOF)
- DIEWRERR();
- FPUTS(tmpbuf);
- }
- /*
- ** if we're interested in this component,
- ** save a pointer to the component text,
- ** then start using our next free buffer
- ** as the component temp buffer (buffer
- ** switching saves an extra copy of the
- ** component text).
- */
- if ((cptr = wantcomp[CHASH(name)])) {
- do {
- if (!mh_strcasecmp(name, cptr->c_name)) {
- if (! cptr->c_text) {
- cptr->c_text = tmpbuf;
- for (cp = tmpbuf + strlen(tmpbuf) - 1;
- cp >= tmpbuf; cp--)
- if (isspace(*cp))
- *cp = 0;
- else
- break;
- *--savecomp = cptr;
- tmpbuf = *nxtbuf++;
- }
- break;
- }
- } while ((cptr = cptr->c_next));
- }
-
- while (state == FLDPLUS) {
- state = m_getfld(state, name, tmpbuf,
- rlwidth, inb);
- if (outnum)
- FPUTS(tmpbuf);
- }
- break;
-
- case BODY:
- compnum = -1;
- if (! outnum) {
- state = FILEEOF; /* stop now if scan cmd */
- goto finished;
- }
- if (putc('\n', scnout) == EOF) DIEWRERR();
+ case FLD:
+ case FLDPLUS:
+ compnum++;
+ if (outnum) {
+ FPUTS(name);
+ if (putc(':', scnout) == EOF)
+ DIEWRERR();
FPUTS(tmpbuf);
- /*
- ** performance hack: some people like to
- ** run "inc" on things like net.sources or
- ** large digests. We do a copy directly
- ** into the output buffer rather than
- ** going through an intermediate buffer.
- **
- ** We need the amount of data m_getfld
- ** found & don't want to do a strlen on
- ** the long buffer so there's a hack in
- ** m_getfld to save the amount of data it
- ** returned in the global "msg_count".
- */
-body:;
- while (state == BODY) {
-#ifdef LINUX_STDIO
- if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
-#elif defined(__DragonFly__)
- if (((struct __FILE_public *)scnout)->_w <= 0) {
-#else
- if (scnout->_cnt <= 0) {
-#endif
- if (fflush(scnout) == EOF)
- DIEWRERR();
+ }
+ /*
+ ** if we're interested in this component, save
+ ** a pointer to the component text, then start
+ ** using our next free buffer as the component
+ ** temp buffer (buffer switching saves an extra
+ ** copy of the component text).
+ */
+ if ((cptr = wantcomp[CHASH(name)])) {
+ do {
+ if (!mh_strcasecmp(name, cptr->c_name)) {
+ if (! cptr->c_text) {
+ cptr->c_text = tmpbuf;
+ for (cp = tmpbuf + strlen(tmpbuf) - 1; cp >= tmpbuf; cp--)
+ if (isspace(*cp))
+ *cp = 0;
+ else
+ break;
+ *--savecomp = cptr;
+ tmpbuf = *nxtbuf++;
+ }
+ break;
}
-#ifdef LINUX_STDIO
- state = m_getfld(state, name, scnout->_IO_write_ptr,
- (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
- scnout->_IO_write_ptr += msg_count;
-#elif defined(__DragonFly__)
- state = m_getfld(state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb );
- ((struct __FILE_public *)scnout)->_w -= msg_count;
- ((struct __FILE_public *)scnout)->_p += msg_count;
-#else
- state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb );
- scnout->_cnt -= msg_count;
- scnout->_ptr += msg_count;
-#endif
- }
- goto finished;
-
- case LENERR:
- case FMTERR:
- fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
- fprintf(stderr, "component %d\n", compnum);
-
- if (outnum) {
- FPUTS("\n\nBAD MSG:\n");
- FPUTS(name);
- if (putc('\n', scnout) == EOF)
- DIEWRERR();
- state = BODY;
- goto body;
- }
- /* fall through */
-
- case FILEEOF:
- goto finished;
-
- default:
- adios(NULL, "getfld() returned %d", state);
+ } while ((cptr = cptr->c_next));
+ }
+
+ while (state == FLDPLUS) {
+ state = m_getfld(state, name, tmpbuf, SBUFSIZ,
+ inb);
+ if (outnum)
+ FPUTS(tmpbuf);
+ }
+ break;
+
+ case BODY:
+ state = FILEEOF;
+ goto finished;
+
+ case LENERR:
+ case FMTERR:
+ fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
+ fprintf(stderr, "component %d\n", compnum);
+
+ if (outnum) {
+ FPUTS("\n\nBAD MSG:\n");
+ FPUTS(name);
+ if (putc('\n', scnout) == EOF)
+ DIEWRERR();
+ }
+ /* fall through */
+
+ case FILEEOF:
+ goto finished;
+
+ default:
+ adios(NULL, "getfld() returned %d", state);
}
}
return SCNFAT;
}
- /* Save and restore buffer so we don't trash our dynamic pool! */
- if (bodycomp) {
- saved_c_text = bodycomp->c_text;
- bodycomp->c_text = tmpbuf;
- }
-
if (size)
dat[2] = size;
else if (outnum > 0) {
fmt_scan(fmt, scanl, slwidth, dat);
-#if 0
- fmt = fmt_scan(fmt, scanl, slwidth, dat);
- if (!fmt)
- fmt = fmt_top; /* reset for old format files */
-#endif
-
- if (bodycomp)
- bodycomp->c_text = saved_c_text;
-
if (noisy)
fputs(scanl, stdout);
projects / mmh / blobdiff