X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=1c68bc26d53afbfa4bfe8297f4b5a9ec40a3543d;hp=3bede5ae792a54b3b75e0a9bfa9491c692d73349;hb=51d0e643f8daeb2db8de0a3d31d7d7f038b48380;hpb=f38ce2484d327ca8062117a2643500bd0d01d830 diff --git a/uip/scansbr.c b/uip/scansbr.c index 3bede5a..1c68bc2 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -1,13 +1,10 @@ - /* - * scansbr.c -- routines to help scan along... - * - * $Id$ - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** 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 +** complete copyright information. +*/ #include #include @@ -17,8 +14,8 @@ #include #ifdef _FSTDIO -# define _ptr _p /* Gag */ -# define _cnt _w /* Wretch */ +# define _ptr _p /* Gag */ +# define _cnt _w /* Wretch */ #endif #ifdef SCO_5_STDIO @@ -28,367 +25,321 @@ # define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp)) #endif -#define MAXSCANL 256 /* longest possible scan line */ +#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 but small enough so that we don't snarf - * the entire message body when we're only going to display 30 - * characters of it. - */ +** 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. +*/ #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 */ +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 = 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 */ +static int dat[5]; /* aux. data for format routine */ -char *scanl = 0; /* text of most recent scanline */ +char *scanl = NULL; /* text of most recent scanline */ -#define DIEWRERR() adios (scnmsg, "write error on") +#define DIEWRERR() adios(scnmsg, "write error on") #define FPUTS(buf) {\ - if (mh_fputs(buf,scnout) == EOF)\ - DIEWRERR();\ - } + if (fputs(buf,scnout) == EOF)\ + DIEWRERR();\ + } /* - * prototypes - */ -int sc_width (void); /* from termsbr.c */ -static int mh_fputs(char *, FILE *); +** prototypes +*/ +int sc_width(void); /* from termsbr.c */ +#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) +scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, + int unseen, int noisy) { - int i, compnum, encrypted, state; - char *cp, *tmpbuf, **nxtbuf; - char *saved_c_text; - struct comp *cptr; - struct comp **savecomp; - char *scnmsg; - FILE *scnout; - char name[NAMESZ]; - static int rlwidth, slwidth; + int i, compnum, 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; #ifdef RPATHS - char returnpath[BUFSIZ]; - char deliverydate[BUFSIZ]; + char returnpath[BUFSIZ]; + char deliverydate[BUFSIZ]; #endif - /* first-time only initialization */ - if (!scanl) { - if (width == 0) { - if ((width = sc_width ()) < WIDTH/2) - width = WIDTH/2; - else if (width > MAXSCANL) - width = MAXSCANL; - } - dat[3] = slwidth = width; - scanl = (char *) mh_xmalloc((size_t) MB_CUR_MAX * (slwidth + 2) ); - 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"); - if (cptr && folder) - cptr->c_text = folder; - FINDCOMP(cptr, "encrypted"); - if (!cptr) - if ((cptr = (struct comp *) calloc (1, sizeof(*cptr)))) { - cptr->c_name = "encrypted"; - cptr->c_next = wantcomp[i = CHASH (cptr->c_name)]; - wantcomp[i] = cptr; - ncomps++; - } - FINDCOMP (cptr, "dtimenow"); - if (cptr) - cptr->c_text = getcpy(dtimenow (0)); - 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"); - used_buf += ncomps+1; *--used_buf = 0; - rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ; - for (i = ncomps; i--; ) - *nxtbuf++ = mh_xmalloc(rlwidth); - } - - /* - * each-message initialization - */ - nxtbuf = compbuffers; - savecomp = used_buf; - tmpbuf = *nxtbuf++; - dat[0] = innum ? innum : outnum; - dat[1] = curflg; - dat[4] = unseen; - - /* - * 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 (ferror(inb)) { - advise("read", "unable to"); /* "read error" */ - return SCNFAT; - } else { - return SCNEOF; + /* first-time only initialization */ + if (!scanl) { + if (width == 0) { + if ((width = sc_width()) < WIDTH/2) + width = WIDTH/2; + else if (width > MAXSCANL) + width = MAXSCANL; + } + dat[3] = slwidth = width; + scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * + (slwidth + 2) ); + if (outnum) + umask(~m_gmprot()); + + /* Compile format string */ + ncomps = fmt_compile(nfs, &fmt) + 1; + + FINDCOMP(bodycomp, "body"); + FINDCOMP(datecomp, "date"); + 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"); + used_buf += ncomps+1; *--used_buf = 0; + rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ; + for (i = ncomps; i--; ) + *nxtbuf++ = mh_xmalloc(rlwidth); } - } - if (outnum) { - if (outnum > 0) { - scnmsg = m_name (outnum); - if (*scnmsg == '?') /* msg num out of range */ - return SCNNUM; - } else { - scnmsg = "/dev/null"; - } - if ((scnout = fopen (scnmsg, "w")) == NULL) - adios (scnmsg, "unable to write"); -#ifdef RPATHS /* - * Add the Return-Path and Delivery-Date - * header fields to message. - */ - if (get_returnpath (returnpath, sizeof(returnpath), - deliverydate, sizeof(deliverydate))) { - FPUTS ("Return-Path: "); - FPUTS (returnpath); - FPUTS ("Delivery-Date: "); - FPUTS (deliverydate); + ** each-message initialization + */ + nxtbuf = compbuffers; + savecomp = used_buf; + tmpbuf = *nxtbuf++; + dat[0] = innum ? innum : outnum; + dat[1] = curflg; + dat[4] = unseen; + + /* + ** 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 (ferror(inb)) { + advise("read", "unable to"); /* "read error" */ + return SCNFAT; + } else { + return SCNEOF; + } } -#endif /* RPATHS */ - } - - /* scan - main loop */ - for (compnum = 1; ; state = m_getfld (state, name, tmpbuf, rlwidth, inb)) { - switch (state) { - case FLD: - case FLDPLUS: - compnum++; - if (outnum) { - FPUTS (name); - if ( putc (':', scnout) == EOF) DIEWRERR(); - FPUTS (tmpbuf); + + if (outnum) { + if (outnum > 0) { + scnmsg = m_name(outnum); + if (*scnmsg == '?') /* msg num out of range */ + return SCNNUM; + } else { + scnmsg = "/dev/null"; } + if ((scnout = fopen(scnmsg, "w")) == NULL) + adios(scnmsg, "unable to write"); +#ifdef RPATHS /* - * 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 (!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)); + ** Add the Return-Path and Delivery-Date + ** header fields to message. + */ + if (get_returnpath(returnpath, sizeof(returnpath), + deliverydate, sizeof(deliverydate))) { + FPUTS("Return-Path: "); + FPUTS(returnpath); + FPUTS("Delivery-Date: "); + FPUTS(deliverydate); } +#endif /* RPATHS */ + } - while (state == FLDPLUS) { - state = m_getfld (state, name, tmpbuf, rlwidth, inb); - if (outnum) - FPUTS (tmpbuf); - } - break; + /* scan - main loop */ + for (compnum = 1; ; + state = m_getfld(state, name, tmpbuf, rlwidth, 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)); + } - case BODY: - compnum = -1; - if (! outnum) { - state = FILEEOF; /* stop now if scan cmd */ - goto finished; - } - if (putc ('\n', 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". - */ + 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(); + 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) { + while (state == BODY) { #ifdef LINUX_STDIO - if (scnout->_IO_write_ptr == scnout->_IO_write_end) { + if (scnout->_IO_write_ptr == scnout->_IO_write_end) { +#elif defined(__DragonFly__) + if (((struct __FILE_public *)scnout)->_w <= 0) { #else - if (scnout->_cnt <= 0) { + if (scnout->_cnt <= 0) { #endif - if (fflush(scnout) == EOF) - DIEWRERR (); - } + if (fflush(scnout) == EOF) + DIEWRERR(); + } #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; + 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; + 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 */ + } + 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; + case FILEEOF: + goto finished; - default: - adios (NULL, "getfld() returned %d", state); + default: + adios(NULL, "getfld() returned %d", state); + } } - } - /* - * format and output the scan line. - */ + /* + ** format and output the scan line. + */ finished: - if (ferror(inb)) { - advise("read", "unable to"); /* "read error" */ - 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) - { - dat[2] = ftell(scnout); - if (dat[2] == EOF) DIEWRERR(); - } - - if ((datecomp && !datecomp->c_text) || (!size && !outnum)) { - struct stat st; - - fstat (fileno(inb), &st); - if (!size && !outnum) - dat[2] = st.st_size; - 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"); - *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime); - datecomp->c_flags |= CF_DATEFAB|CF_TRUE; - } else { - datecomp->c_flags &= ~CF_DATEFAB; - } + if (ferror(inb)) { + advise("read", "unable to"); /* "read error" */ + return SCNFAT; } - } - - 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); - FINDCOMP (cptr, "encrypted"); - encrypted = cptr && cptr->c_text; + /* Save and restore buffer so we don't trash our dynamic pool! */ + if (bodycomp) { + saved_c_text = bodycomp->c_text; + bodycomp->c_text = tmpbuf; + } - /* return dynamically allocated buffers to pool */ - while ((cptr = *savecomp++)) { - *--nxtbuf = cptr->c_text; - cptr->c_text = NULL; - } - *--nxtbuf = tmpbuf; + if (outnum > 0) { + dat[2] = ftell(scnout); + if (dat[2] == EOF) + DIEWRERR(); + } - if (outnum && (ferror(scnout) || fclose (scnout) == EOF)) - DIEWRERR(); + if ((datecomp && !datecomp->c_text) || !outnum) { + struct stat st; + + fstat(fileno(inb), &st); + if (!outnum) + dat[2] = st.st_size; + 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"); + *datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime); + datecomp->c_flags |= CF_DATEFAB|CF_TRUE; + } else { + datecomp->c_flags &= ~CF_DATEFAB; + } + } + } - return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG); -} + fmt_scan(fmt, scanl, 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; -} + if (noisy) + fputs(scanl, stdout); + /* return dynamically allocated buffers to pool */ + while ((cptr = *savecomp++)) { + *--nxtbuf = cptr->c_text; + cptr->c_text = NULL; + } + *--nxtbuf = tmpbuf; -static int -mh_fputs(char *s, FILE *stream) -{ - char c; + if (outnum && (ferror(scnout) || fclose(scnout) == EOF)) + DIEWRERR(); - while ((c = *s++)) - if (putc (c,stream) == EOF ) - return(EOF); - return (0); + return (state != FILEEOF ? SCNERR : SCNMSG); } -