#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) */
/*
* prototypes
*/
-int sc_width (void); /* from termsbr.c */
static int mh_fputs(char *, FILE *);
#ifdef MULTIBYTE_SUPPORT
FILE *scnout = NULL;
char name[NAMESZ];
static int rlwidth, slwidth;
+ static size_t scanl_size;
/* first-time only initialization */
if (!scanl) {
width = MAXSCANL;
}
dat[3] = slwidth = width;
- scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );
+ /* 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);
if (outnum)
umask(~m_gmprot());
/* 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");
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) {
+ state = m_getfld (state, name, tmpbuf + i,
+ rlwidth - i, inb);
+ }
if (! outnum) {
state = FILEEOF; /* stop now if scan cmd */
goto finished;
}
}
- 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
+ fmt_scan (fmt, scanl, scanl_size, slwidth, dat);
if (bodycomp)
bodycomp->c_text = saved_c_text;
}
-/*
- * Cheat: we are loaded with adrparse, which wants a routine called
- * OfficialName(). We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called. Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
- return name;
-}
-
-
static int
mh_fputs(char *s, FILE *stream)
{