-
-/*
- * scansbr.c -- routines to help scan along...
+/* scansbr.c -- routines to help scan along...
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/tws.h>
#include <h/utils.h>
-m_getfld_state_t gstate;
-
-#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
static int dat[5]; /* aux. data for format routine */
-char *scanl = 0; /* text of most recent scanline */
+static m_getfld_state_t gstate; /* for accessor functions below */
#define DIEWRERR() adios (scnmsg, "write error on")
#define FPUTS(buf) {\
- if (mh_fputs(buf,scnout) == EOF)\
+ if (fputs(buf,scnout) == EOF)\
DIEWRERR();\
}
-/*
- * prototypes
- */
-static int mh_fputs(char *, FILE *);
-
-#ifdef MULTIBYTE_SUPPORT
-#define SCAN_CHARWIDTH MB_CUR_MAX
-#else
-#define SCAN_CHARWIDTH 1
-#endif
-
int
scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
- int unseen, char *folder, long size, int noisy)
+ int unseen, char *folder, long size, int noisy, charstring_t *scanl)
{
int i, compnum, encrypted, state;
- unsigned char *cp, *tmpbuf, *startbody;
- char **nxtbuf;
+ char *cp, *tmpbuf, *startbody, **nxtbuf;
char *saved_c_text = NULL;
struct comp *cptr;
struct comp **savecomp;
char name[NAMESZ];
int bufsz;
static int rlwidth, slwidth;
- static size_t scanl_size;
- /* first-time only initialization */
- if (!scanl) {
- if (width == 0) {
+ /* first-time only initialization, which will always happen the
+ way the code is now, with callers initializing *scanl to NULL.
+ scanl used to be a global. */
+ if (! *scanl) {
+ if (width == -1) {
+ /* Default: width of the terminal, but at least WIDTH/2. */
if ((width = sc_width ()) < WIDTH/2)
width = WIDTH/2;
- else if (width > MAXSCANL)
- width = MAXSCANL;
+ } else if (width == 0) {
+ /* Unlimited width. */
+ width = INT_MAX;
}
dat[3] = slwidth = width;
- /* Arbitrarily allocate 20 * slwidth to provide room for lots
- of escape sequences. */
- scanl_size = SCAN_CHARWIDTH * (20 * slwidth + 2);
- scanl = (char *) mh_xmalloc (scanl_size);
+ *scanl = charstring_create (width < NMH_BUFSIZ ? width : NMH_BUFSIZ);
if (outnum)
umask(~m_gmprot());
datecomp = fmt_findcomp("date");
cptr = fmt_findcomp("folder");
if (cptr && folder)
- cptr->c_text = getcpy(folder);
+ cptr->c_text = mh_xstrdup(folder);
if (fmt_addcompentry("encrypted")) {
ncomps++;
}
* and it's our responsibility to free it.
*/
- nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, sizeof(char *));
- if (nxtbuf == NULL)
- adios (NULL, "unable to allocate component buffers");
- used_buf = (struct comp **) calloc((size_t) (ncomps+1),
- sizeof(struct comp *));
- if (used_buf == NULL)
- adios (NULL, "unable to allocate component buffer stack");
+ nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof *nxtbuf);
+ used_buf = mh_xcalloc(ncomps + 1, sizeof *used_buf);
used_buf += ncomps+1; *--used_buf = 0;
- rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
+ rlwidth = bodycomp && (width > SBUFSIZ)
+ ? min (width, NMH_BUFSIZ)
+ : SBUFSIZ;
for (i = ncomps; i--; )
*nxtbuf++ = mh_xmalloc(rlwidth);
}
*/
bufsz = rlwidth;
m_getfld_state_reset (&gstate);
- if ((state = m_getfld (gstate, name, tmpbuf, &bufsz, inb)) == FILEEOF) {
+ if ((state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) == FILEEOF) {
if (ferror(inb)) {
advise("read", "unable to"); /* "read error" */
return SCNFAT;
- } else {
- return SCNEOF;
}
+ return SCNEOF;
}
if (outnum) {
/* scan - main loop */
for (compnum = 1; ;
- bufsz = rlwidth, state = m_getfld (gstate, name, tmpbuf, &bufsz, inb)) {
+ bufsz = rlwidth, state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) {
switch (state) {
case FLD:
case FLDPLUS:
cptr->c_text = tmpbuf;
for (cp = tmpbuf + strlen (tmpbuf) - 1;
cp >= tmpbuf; cp--)
- if (isspace (*cp))
+ if (isspace ((unsigned char) *cp))
*cp = 0;
else
break;
while (state == FLDPLUS) {
bufsz = rlwidth;
- state = m_getfld (gstate, name, tmpbuf, &bufsz, inb);
+ state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);
if (outnum)
FPUTS (tmpbuf);
}
break;
case BODY:
- compnum = -1;
/*
* A slight hack ... if we have less than rlwidth characters
* in the buffer, call m_getfld again.
if ((i = strlen(tmpbuf)) < rlwidth) {
bufsz = rlwidth - i;
- state = m_getfld (gstate, name, tmpbuf + i, &bufsz, inb);
+ state = m_getfld (&gstate, name, tmpbuf + i, &bufsz, inb);
}
if (! outnum) {
* The previous code here used to call m_getfld() using
* pointers to the underlying output stdio buffers to
* avoid the extra copy. Tests by Markus Schnalke show
- * no noticable performance loss on larger mailboxes
+ * no noticeable performance loss on larger mailboxes
* if we incur an extra copy, and messing around with
* internal stdio buffers is becoming more and more
* unportable as times go on. So from now on just deal
while (state == BODY) {
bufsz = rlwidth;
- state = m_getfld (gstate, name, tmpbuf, &bufsz, inb);
+ state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);
FPUTS(tmpbuf);
}
goto finished;
case LENERR:
case FMTERR:
- fprintf (stderr,
- innum ? "??Format error (message %d) in "
- : "??Format error in ",
- outnum ? outnum : innum);
+ if (innum)
+ fprintf (stderr, "??Format error (message %d) in ",
+ outnum ? outnum : innum);
+ else
+ fprintf (stderr, "??Format error in ");
+
fprintf (stderr, "component %d\n", compnum);
if (outnum) {
state = BODY;
goto body;
}
- /* fall through */
+ /* FALLTHRU */
case FILEEOF:
goto finished;
if (datecomp) {
if (! datecomp->c_text) {
if (datecomp->c_tws == NULL)
- datecomp->c_tws = (struct tws *)
- calloc((size_t) 1, sizeof(*datecomp->c_tws));
- if (datecomp->c_tws == NULL)
- adios (NULL, "unable to allocate tws buffer");
+ NEW0(datecomp->c_tws);
*datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
} else {
}
}
- fmt_scan (fmt, scanl, scanl_size, slwidth, dat);
+ fmt_scan (fmt, *scanl, slwidth, dat, NULL);
if (bodycomp)
bodycomp->c_text = saved_c_text;
if (noisy)
- fputs (scanl, stdout);
+ fputs (charstring_buffer (*scanl), stdout);
cptr = fmt_findcomp ("encrypted");
encrypted = cptr && cptr->c_text;
/* return dynamically allocated buffers to pool */
while ((cptr = *savecomp++)) {
- *--nxtbuf = cptr->c_text;
cptr->c_text = NULL;
}
- *--nxtbuf = tmpbuf;
if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
DIEWRERR();
}
-static int
-mh_fputs(char *s, FILE *stream)
-{
- char c;
-
- while ((c = *s++))
- if (putc (c,stream) == EOF )
- return(EOF);
- return (0);
+/* The following two functions allow access to the global gstate above. */
+void
+scan_finished () {
+ m_getfld_state_destroy (&gstate);
}
+void
+scan_detect_mbox_style (FILE *f) {
+ m_unknown (&gstate, f);
+}
projects / nmh / blobdiff