X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=d985a5cab544ddf045450a24640cf3018ef78b63;hp=9617237a3a92791536758f70e090cb4bf4a7b3a1;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=70b2643e0da8485174480c644ad9785c84f5bff4 diff --git a/uip/scansbr.c b/uip/scansbr.c index 9617237..d985a5c 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -12,19 +12,15 @@ #include #include #include +#include +#include +#include #ifdef _FSTDIO # define _ptr _p /* Gag */ # define _cnt _w /* Wretch */ #endif -#ifdef SCO_5_STDIO -# define _ptr __ptr -# define _cnt __cnt -# define _base __base -# define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp)) -#endif - #define MAXSCANL 256 /* longest possible scan line */ /* @@ -38,25 +34,22 @@ static struct format *fmt; static struct comp *datecomp; /* pntr to "date" comp */ 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 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 */ -char *scanl = 0; /* text of most recent scanline */ - -#define DIEWRERR() adios(scnmsg, "write error on") +char *scanl = NULL; /* text of most recent scanline */ #define FPUTS(buf) {\ - if (mh_fputs(buf,scnout) == EOF)\ - DIEWRERR();\ + if (fputs(buf, scnout) == EOF)\ + adios(EX_IOERR, scnmsg, "write error on");\ } /* ** prototypes */ int sc_width(void); /* from termsbr.c */ -static int mh_fputs(char *, FILE *); #ifdef MULTIBYTE_SUPPORT #define SCAN_CHARWIDTH MB_CUR_MAX @@ -65,10 +58,11 @@ static int mh_fputs(char *, FILE *); #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 *fmtstr, int width, int curflg, + int unseen) { - int i, compnum, encrypted, state; + static int slwidth; + int i, compnum, state; unsigned char *cp, *tmpbuf; char **nxtbuf; struct comp *cptr; @@ -76,54 +70,42 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, char *scnmsg = NULL; FILE *scnout = NULL; char name[NAMESZ]; - static int slwidth; - -#ifdef RPATHS - char returnpath[BUFSIZ]; - char deliverydate[BUFSIZ]; -#endif + int incing = (outnum != SCN_MBOX && outnum != SCN_FOLD); + int scanfolder = (outnum == SCN_FOLD); + long fpos; + struct stat st; /* 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) + if (incing) umask(~m_gmprot()); - /* Compile format string */ - ncomps = fmt_compile(nfs, &fmt) + 1; - - 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++; + if (fmtstr) { + 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)); /* probably for \n and \0 */ + /* Compile format string */ + ncomps = fmt_compile(fmtstr, &fmt) + 1; + FINDCOMP(datecomp, "date"); + } else { + ncomps = 1; + datecomp = NULL; } - FINDCOMP(cptr, "dtimenow"); - if (cptr) - cptr->c_text = getcpy(dtimenow(0)); - nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, + + nxtbuf = compbuffers = (char **) mh_xcalloc((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; + used_buf = (struct comp **) mh_xcalloc((size_t) (ncomps+1), + sizeof(struct comp *)); + /* NULL-terminate array */ + used_buf += ncomps; + *used_buf = NULL; + /* allocate space for the items */ for (i = ncomps; i--; ) *nxtbuf++ = mh_xmalloc(SBUFSIZ); } @@ -137,6 +119,7 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, dat[0] = innum ? innum : outnum; dat[1] = curflg; dat[4] = unseen; + fpos = ftell(inb); /* ** Get the first field. If the message is non-empty @@ -151,29 +134,12 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, } } - 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); - } -#endif /* RPATHS */ + if (incing) { + scnmsg = m_name(outnum); + if (*scnmsg == '?') /* msg num out of range */ + return SCNNUM; + if (!(scnout = fopen(scnmsg, "w"))) + adios(EX_IOERR, scnmsg, "unable to write"); } /* scan - main loop */ @@ -183,10 +149,9 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, case FLD: case FLDPLUS: compnum++; - if (outnum) { + if (incing) { FPUTS(name); - if (putc(':', scnout) == EOF) - DIEWRERR(); + FPUTS(":"); FPUTS(tmpbuf); } /* @@ -196,34 +161,55 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, ** temp buffer (buffer switching saves an extra ** copy of the component text). */ - if ((cptr = wantcomp[CHASH(name)])) { + if (fmtstr && (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++; + if (mh_strcasecmp(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; } - break; + *--savecomp = cptr; + tmpbuf = *nxtbuf++; } + break; } while ((cptr = cptr->c_next)); } while (state == FLDPLUS) { state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb); - if (outnum) + if (incing) FPUTS(tmpbuf); } break; case BODY: - state = FILEEOF; + compnum = -1; + if (scanfolder) { + /* stop here if we scan a msg in a folder */ + state = FILEEOF; + goto finished; + } + /* otherwise (mbox): snarf the body */ + if (incing) { + FPUTS("\n"); + FPUTS(tmpbuf); + } +body:; + while (state == BODY) { + state = m_getfld(state, name, tmpbuf, SBUFSIZ, + inb); + if (incing) { + FPUTS(tmpbuf); + } + } goto finished; case LENERR: @@ -231,66 +217,62 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum); fprintf(stderr, "component %d\n", compnum); - if (outnum) { + if (incing) { FPUTS("\n\nBAD MSG:\n"); FPUTS(name); - if (putc('\n', scnout) == EOF) - DIEWRERR(); + FPUTS("\n"); + state = BODY; + goto body; } - /* fall through */ + /* fall through if we scan only */ case FILEEOF: goto finished; default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } - /* - ** format and output the scan line. - */ finished: + + /* Format and output the scan line. */ if (ferror(inb)) { - advise("read", "unable to"); /* "read error" */ + advise("read", "unable to"); return SCNFAT; } - if (size) - dat[2] = size; - else if (outnum > 0) { - dat[2] = ftell(scnout); - if (dat[2] == EOF) - DIEWRERR(); + if (incing) { + if ((dat[2] = ftell(scnout)) == EOF) + adios(EX_IOERR, scnmsg, "write error on"); + } else if (!scanfolder) { + if ((dat[2] = ftell(inb)) == EOF) + adios(EX_IOERR, scnmsg, "write error on"); + dat[2] -= fpos; } - if ((datecomp && !datecomp->c_text) || (!size && !outnum)) { - struct stat st; - + if (fmtstr) { fstat(fileno(inb), &st); - if (!size && !outnum) + if (scanfolder) { 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"); + } + if (datecomp && !datecomp->c_text) { + if (!datecomp->c_text) { + if (!datecomp->c_tws) + datecomp->c_tws = (struct tws *) mh_xcalloc((size_t) 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); datecomp->c_flags |= CF_DATEFAB|CF_TRUE; } else { datecomp->c_flags &= ~CF_DATEFAB; } } - } - - fmt_scan(fmt, scanl, slwidth, dat); - if (noisy) + /* print the scan line */ + fmt_scan(fmt, scanl, slwidth, dat); fputs(scanl, stdout); - - FINDCOMP(cptr, "encrypted"); - encrypted = cptr && cptr->c_text; + } /* return dynamically allocated buffers to pool */ while ((cptr = *savecomp++)) { @@ -299,19 +281,8 @@ finished: } *--nxtbuf = tmpbuf; - if (outnum && (ferror(scnout) || fclose(scnout) == EOF)) - DIEWRERR(); - - return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG); -} - -static int -mh_fputs(char *s, FILE *stream) -{ - char c; + if (incing && (ferror(scnout) || fclose(scnout) == EOF)) + adios(EX_IOERR, scnmsg, "write error on"); - while ((c = *s++)) - if (putc(c,stream) == EOF ) - return(EOF); - return (0); + return (state != FILEEOF ? SCNERR : SCNMSG); }