X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=67fc5eb294e36d187525d1af5f123920ac9e3124;hp=7c0d1985b56fb85d96e807e1454f00da1c503d0f;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/scansbr.c b/uip/scansbr.c index 7c0d198..67fc5eb 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -1,10 +1,10 @@ /* - * 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. - */ +** 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 @@ -28,12 +28,12 @@ #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; @@ -59,8 +59,8 @@ char *scanl = 0; /* text of most recent scanline */ } /* - * prototypes - */ +** prototypes +*/ int sc_width (void); /* from termsbr.c */ static int mh_fputs(char *, FILE *); @@ -99,7 +99,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, width = MAXSCANL; } dat[3] = slwidth = width; - scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) ); + scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * + (slwidth + 2) ); if (outnum) umask(~m_gmprot()); @@ -116,7 +117,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, cptr->c_text = folder; FINDCOMP(cptr, "encrypted"); if (!cptr) - if ((cptr = (struct comp *) calloc (1, sizeof(*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; @@ -125,7 +127,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, FINDCOMP (cptr, "dtimenow"); if (cptr) cptr->c_text = getcpy(dtimenow (0)); - nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, sizeof(char *)); + 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), @@ -139,8 +142,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, } /* - * each-message initialization - */ + ** each-message initialization + */ nxtbuf = compbuffers; savecomp = used_buf; tmpbuf = *nxtbuf++; @@ -149,9 +152,9 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, dat[4] = unseen; /* - * Get the first field. If the message is non-empty - * and we're doing an "inc", open the output file. - */ + ** 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" */ @@ -173,9 +176,9 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, adios (scnmsg, "unable to write"); #ifdef RPATHS /* - * Add the Return-Path and Delivery-Date - * header fields to message. - */ + ** Add the Return-Path and Delivery-Date + ** header fields to message. + */ if (get_returnpath (returnpath, sizeof(returnpath), deliverydate, sizeof(deliverydate))) { FPUTS ("Return-Path: "); @@ -187,22 +190,26 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, } /* scan - main loop */ - for (compnum = 1; ; state = m_getfld (state, name, tmpbuf, rlwidth, inb)) { + 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(); + 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 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)) { @@ -238,16 +245,18 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, 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". - */ + ** 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) { #ifdef LINUX_STDIO @@ -278,10 +287,7 @@ body:; case LENERR: case FMTERR: - fprintf (stderr, - innum ? "??Format error (message %d) in " - : "??Format error in ", - outnum ? outnum : innum); + fprintf (stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum); fprintf (stderr, "component %d\n", compnum); if (outnum) { @@ -302,8 +308,8 @@ body:; } /* - * format and output the scan line. - */ + ** format and output the scan line. + */ finished: if (ferror(inb)) { advise("read", "unable to"); /* "read error" */ @@ -318,8 +324,7 @@ finished: if (size) dat[2] = size; - else if (outnum > 0) - { + else if (outnum > 0) { dat[2] = ftell(scnout); if (dat[2] == EOF) DIEWRERR(); } @@ -385,4 +390,3 @@ mh_fputs(char *s, FILE *stream) return(EOF); return (0); } -