#include <sys/stat.h>
#include <sysexits.h>
-#ifdef _FSTDIO
-# define _ptr _p /* Gag */
-# define _cnt _w /* Wretch */
-#endif
-
#define MAXSCANL 256 /* longest possible scan line */
-/*
-** 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.
-*/
-#define SBUFSIZ 512
-
static struct format *fmt;
static struct comp *datecomp; /* pntr to "date" comp */
static int ncomps = 0; /* # of interesting components */
-static char **compbuffers = NULL; /* buffers for component text */
-static struct comp **used_buf = NULL; /* stack for comp that use buffers */
static int dat[5]; /* aux. data for format routine */
int unseen)
{
static int slwidth;
- int i, compnum, state;
- unsigned char *cp, *tmpbuf;
- char **nxtbuf;
+ int compnum, i;
+ enum state state;
+ struct field f = {{0}};
+ char *cp;
struct comp *cptr;
- struct comp **savecomp;
char *scnmsg = NULL;
FILE *scnout = NULL;
- char name[NAMESZ];
int incing = (outnum != SCN_MBOX && outnum != SCN_FOLD);
int scanfolder = (outnum == SCN_FOLD);
long fpos;
struct stat st;
+ int blankline;
/* first-time only initialization */
if (!scanl) {
width = MAXSCANL;
}
dat[3] = slwidth = width;
- scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
- (slwidth + 2)); /* probably for \n and \0 */
+ scanl = mh_xcalloc(slwidth + 2, SCAN_CHARWIDTH); /* probably for \n and \0 */
/* Compile format string */
ncomps = fmt_compile(fmtstr, &fmt) + 1;
FINDCOMP(datecomp, "date");
ncomps = 1;
datecomp = NULL;
}
+ }
- nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
- sizeof(char *));
- if (!nxtbuf)
- adios(EX_OSERR, NULL, "unable to allocate component buffers");
- used_buf = (struct comp **) calloc((size_t) (ncomps+1),
- sizeof(struct comp *));
- if (!used_buf)
- adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
- /* NULL-terminate array */
- used_buf += ncomps;
- *used_buf = NULL;
- /* allocate space for the items */
- for (i = ncomps; i--; )
- *nxtbuf++ = mh_xmalloc(SBUFSIZ);
+ if (feof(inb)) {
+ return SCNEOF;
}
/*
** each-message initialization
*/
- nxtbuf = compbuffers;
- savecomp = used_buf;
- tmpbuf = *nxtbuf++;
dat[0] = innum ? innum : outnum;
dat[1] = curflg;
dat[4] = unseen;
fpos = ftell(inb);
- /*
- ** 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, SBUFSIZ, inb)) == FILEEOF) {
- if (ferror(inb)) {
- advise("read", "unable to"); /* "read error" */
- return SCNFAT;
- } else {
- return SCNEOF;
- }
- }
-
if (incing) {
scnmsg = m_name(outnum);
if (*scnmsg == '?') /* msg num out of range */
if (!(scnout = fopen(scnmsg, "w")))
adios(EX_IOERR, scnmsg, "unable to write");
}
-
/* scan - main loop */
- for (compnum = 1; ;
- state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb)) {
+ for (compnum = 1, state = FLD2; ; ) {
+ state = m_getfld2(state, &f, inb);
switch (state) {
- case FLD:
- case FLDPLUS:
+ case LENERR2:
+ state = FLD2;
+ /* FALL */
+ case FLD2:
compnum++;
if (incing) {
- FPUTS(name);
+ FPUTS(f.name);
FPUTS(":");
- FPUTS(tmpbuf);
+ FPUTS(f.value);
}
- /*
- ** 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 (fmtstr && (cptr = wantcomp[CHASH(name)])) {
+ if (fmtstr && (cptr = wantcomp[CHASH(f.name)])) {
+ /*
+ ** we're interested in this component,
+ ** but find the right one in the hash
+ ** collision chain ...
+ */
do {
- if (mh_strcasecmp(name, cptr->c_name)!=0) {
+ if (mh_strcasecmp(f.name, cptr->c_name)!=0) {
continue;
}
- if (!cptr->c_text) {
- cptr->c_text = tmpbuf;
- cp = tmpbuf+strlen(tmpbuf)-1;
- for (; cp >= tmpbuf; cp--) {
- if (isspace(*cp))
- *cp = '\0';
- else
- break;
+ if (cptr->c_text) {
+ free(cptr->c_text);
+ cptr->c_text = NULL;
+ }
+ cptr->c_text = mh_xstrdup(f.value);
+ cp = cptr->c_text + strlen(cptr->c_text) - 1;
+ for (; cp >= cptr->c_text; 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, SBUFSIZ,
- inb);
- if (incing)
- FPUTS(tmpbuf);
- }
break;
- case BODY:
+ case BODY2:
compnum = -1;
if (scanfolder) {
/* stop here if we scan a msg in a folder */
- state = FILEEOF;
+ state = FILEEOF2;
goto finished;
}
/* otherwise (mbox): snarf the body */
+ if (strncmp("From ", f.value, 5)==0) {
+ state = FILEEOF2;
+ goto finished;
+ }
if (incing) {
FPUTS("\n");
- FPUTS(tmpbuf);
+ FPUTS(f.value);
}
body:;
- while (state == BODY) {
- state = m_getfld(state, name, tmpbuf, SBUFSIZ,
- inb);
+ blankline = 0;
+ while ((state = m_getfld2(state, &f, inb)) == BODY2) {
+ /*
+ ** recognize From lines without blank lines
+ ** before them as well.
+ */
+ if (strncmp("From ", f.value, 5)==0) {
+ state = FILEEOF2;
+ goto finished;
+ }
+ /*
+ ** delay the printing of blank lines
+ ** because if it's the end of the message,
+ ** then we must omit the blank line,
+ ** as it is not part of the message but
+ ** part of the mbox format
+ */
+ if (blankline) {
+ /* print the delayed blank line */
+ FPUTS("\n");
+ blankline = 0;
+ }
+ if (strcmp(f.value, "\n")==0) {
+ blankline = 1;
+ continue;
+ }
if (incing) {
- FPUTS(tmpbuf);
+ FPUTS(f.value);
}
}
goto finished;
- case LENERR:
- case FMTERR:
- fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
+ case FMTERR2:
+ if (strncmp("From ", f.value, 5)==0) {
+ state = FILEEOF2;
+ goto finished;
+ }
+ state = FLD2;
+ fprintf(stderr, innum ?
+ "??Format error (message %d) in " :
+ "??Format error in ",
+ outnum ? outnum : innum);
+ fprintf(stderr, "component %d\n", compnum);
+ continue;
+
+ case IOERR2:
+ fprintf(stderr, innum ?
+ "??Format error (message %d) in " :
+ "??Format error in ",
+ outnum ? outnum : innum);
fprintf(stderr, "component %d\n", compnum);
if (incing) {
FPUTS("\n\nBAD MSG:\n");
- FPUTS(name);
+ FPUTS(f.name); /* XXX use f.field? */
FPUTS("\n");
- state = BODY;
+ state = BODY2;
goto body;
}
/* fall through if we scan only */
- case FILEEOF:
+ case FILEEOF2:
goto finished;
default:
}
finished:
-
/* Format and output the scan line. */
if (ferror(inb)) {
advise("read", "unable to");
if (datecomp && !datecomp->c_text) {
if (!datecomp->c_text) {
if (!datecomp->c_tws)
- datecomp->c_tws = (struct tws *) calloc((size_t) 1, sizeof(*datecomp->c_tws));
+ datecomp->c_tws = mh_xcalloc(1, sizeof(*datecomp->c_tws));
if (!datecomp->c_tws)
adios(EX_OSERR, NULL, "unable to allocate tws buffer");
*datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
fputs(scanl, stdout);
}
- /* return dynamically allocated buffers to pool */
- while ((cptr = *savecomp++)) {
- *--nxtbuf = cptr->c_text;
- cptr->c_text = NULL;
+ /* clean up old values */
+ for (i=0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
+ for (cptr=wantcomp[i]; cptr; cptr=cptr->c_next) {
+ if (cptr->c_text) {
+ free(cptr->c_text);
+ cptr->c_text = NULL;
+ }
+ }
}
- *--nxtbuf = tmpbuf;
if (incing && (ferror(scnout) || fclose(scnout) == EOF))
adios(EX_IOERR, scnmsg, "write error on");
- return (state != FILEEOF ? SCNERR : SCNMSG);
+ return (state == FILEEOF2 ? SCNMSG : SCNERR);
}
projects / mmh / blobdiff