X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=877bdef2d814e20e95456adb85e213ab37637d40;hp=b15c908e368fa517a7c96ed05dd2436150c60072;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=c6615b2fbf66e8c99a00330e23747787fb6c35cc diff --git a/uip/scansbr.c b/uip/scansbr.c index b15c908..877bdef 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -12,27 +12,21 @@ #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 */ /* ** 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. +** calls on m_getfld. */ #define SBUFSIZ 512 @@ -49,7 +43,7 @@ char *scanl = NULL; /* text of most recent scanline */ #define FPUTS(buf) {\ if (fputs(buf, scnout) == EOF)\ - adios(scnmsg, "write error on");\ + adios(EX_IOERR, scnmsg, "write error on");\ } /* @@ -67,6 +61,7 @@ int scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg, int unseen) { + static int slwidth; int i, compnum, state; unsigned char *cp, *tmpbuf; char **nxtbuf; @@ -75,41 +70,41 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg, char *scnmsg = NULL; FILE *scnout = NULL; char name[NAMESZ]; - static int slwidth; - char returnpath[BUFSIZ]; - char deliverydate[BUFSIZ]; - int incing = (outnum > 0); - int scanfolder = (outnum == 0); + 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 (incing) umask(~m_gmprot()); - /* Compile format string */ - ncomps = fmt_compile(fmtstr, &fmt) + 1; - - 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; + 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 = mh_xcalloc(slwidth + 2, SCAN_CHARWIDTH); /* probably for \n and \0 */ + /* Compile format string */ + ncomps = fmt_compile(fmtstr, &fmt) + 1; + FINDCOMP(datecomp, "date"); + } else { + ncomps = 1; + datecomp = NULL; + } + + nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof(char *)); + used_buf = mh_xcalloc(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); + *nxtbuf++ = mh_xcalloc(SBUFSIZ, sizeof(char)); } /* @@ -121,6 +116,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, 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 @@ -139,19 +135,8 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg, scnmsg = m_name(outnum); if (*scnmsg == '?') /* msg num out of range */ return SCNNUM; - if ((scnout = fopen(scnmsg, "w")) == NULL) - adios(scnmsg, "unable to write"); - /* - ** 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); - } + if (!(scnout = fopen(scnmsg, "w"))) + adios(EX_IOERR, scnmsg, "unable to write"); } /* scan - main loop */ @@ -173,21 +158,24 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, 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)); } @@ -201,47 +189,23 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg, case BODY: compnum = -1; - if (!incing) { - state = FILEEOF; /* stop here if scan cmd */ + if (scanfolder) { + /* stop here if we scan a msg in a folder */ + state = FILEEOF; goto finished; } - FPUTS("\n"); - 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". - */ + /* otherwise (mbox): snarf the body */ + if (incing) { + FPUTS("\n"); + FPUTS(tmpbuf); + } body:; while (state == BODY) { -#ifdef LINUX_STDIO - if (scnout->_IO_write_ptr == scnout->_IO_write_end) { -#elif defined(__DragonFly__) - if (((struct __FILE_public *)scnout)->_w <= 0) { -#else - if (scnout->_cnt <= 0) { -#endif - if (fflush(scnout) == EOF) - adios(scnmsg, "write error on"); + state = m_getfld(state, name, tmpbuf, SBUFSIZ, + inb); + if (incing) { + FPUTS(tmpbuf); } -#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; -#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; -#endif } goto finished; @@ -263,7 +227,7 @@ body:; goto finished; default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } @@ -277,33 +241,35 @@ finished: if (incing) { if ((dat[2] = ftell(scnout)) == EOF) - adios(scnmsg, "write error on"); + 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) || scanfolder) { - struct stat st; - + if (fmtstr) { fstat(fileno(inb), &st); - if (scanfolder) + if (scanfolder) { dat[2] = st.st_size; - if (datecomp) { + } + if (datecomp && !datecomp->c_text) { 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->c_tws) + datecomp->c_tws = mh_xcalloc(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; } } - } - /* print the scan line */ - fmt_scan(fmt, scanl, slwidth, dat); - if (fmtstr) + /* print the scan line */ + fmt_scan(fmt, scanl, slwidth, dat); fputs(scanl, stdout); + } /* return dynamically allocated buffers to pool */ while ((cptr = *savecomp++)) { @@ -313,7 +279,7 @@ finished: *--nxtbuf = tmpbuf; if (incing && (ferror(scnout) || fclose(scnout) == EOF)) - adios(scnmsg, "write error on"); + adios(EX_IOERR, scnmsg, "write error on"); return (state != FILEEOF ? SCNERR : SCNMSG); }