X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6ba5b855ebc737cc46cabfbe799b0c7706f437f4..95e0df2af:/uip/scansbr.c?ds=inline diff --git a/uip/scansbr.c b/uip/scansbr.c index a07889e4..87bcb591 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -14,8 +14,6 @@ #include #include -#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 @@ -35,30 +33,18 @@ static struct comp **used_buf = 0; /* stack for comp that use buffers */ static int dat[5]; /* aux. data for format routine */ -char *scanl = 0; /* text of most recent scanline */ -m_getfld_state_t gstate; /* for access by msh */ +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; char *cp, *tmpbuf, *startbody, **nxtbuf; @@ -70,21 +56,21 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, 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()); @@ -95,7 +81,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, 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++; } @@ -135,15 +121,12 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, * 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); } @@ -169,9 +152,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, if (ferror(inb)) { advise("read", "unable to"); /* "read error" */ return SCNFAT; - } else { - return SCNEOF; } + return SCNEOF; } if (outnum) { @@ -227,7 +209,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, break; case BODY: - compnum = -1; /* * A slight hack ... if we have less than rlwidth characters * in the buffer, call m_getfld again. @@ -250,7 +231,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, * 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 @@ -292,7 +273,7 @@ body:; state = BODY; goto body; } - /* fall through */ + /* FALLTHRU */ case FILEEOF: goto finished; @@ -334,10 +315,7 @@ 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 { @@ -346,13 +324,13 @@ finished: } } - fmt_scan (fmt, scanl, scanl_size, slwidth, dat, NULL); + 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; @@ -369,18 +347,7 @@ finished: } -static int -mh_fputs(char *s, FILE *stream) -{ - char c; - - while ((c = *s++)) - if (putc (c,stream) == EOF ) - return(EOF); - return (0); -} - -/* The following three functions allow access to the global gstate above. */ +/* The following two functions allow access to the global gstate above. */ void scan_finished () { m_getfld_state_destroy (&gstate); @@ -390,13 +357,3 @@ void scan_detect_mbox_style (FILE *f) { m_unknown (&gstate, f); } - -void -scan_eom_action (int (*action)()) { - m_eomsbr (gstate, action); -} - -void -scan_reset_m_getfld_state () { - m_getfld_state_reset (&gstate); -}