#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 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(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
#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;
+ int i, compnum, state;
unsigned char *cp, *tmpbuf;
char **nxtbuf;
char *saved_c_text = NULL;
FILE *scnout = NULL;
char name[NAMESZ];
static int rlwidth, slwidth;
-
-#ifdef RPATHS
char returnpath[BUFSIZ];
char deliverydate[BUFSIZ];
-#endif
+ int incing = (outnum > 0);
+ int ismbox = (outnum != 0);
/* first-time only initialization */
if (!scanl) {
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;
+ ncomps = fmt_compile(fmtstr, &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)
}
}
- if (outnum) {
- if (outnum > 0) {
+ if (ismbox) {
+ if (incing) {
scnmsg = m_name(outnum);
if (*scnmsg == '?') /* msg num out of range */
return SCNNUM;
}
if ((scnout = fopen(scnmsg, "w")) == NULL)
adios(scnmsg, "unable to write");
-#ifdef RPATHS
/*
** Add the Return-Path and Delivery-Date
** header fields to message.
FPUTS("Delivery-Date: ");
FPUTS(deliverydate);
}
-#endif /* RPATHS */
}
/* scan - main loop */
case FLD:
case FLDPLUS:
compnum++;
- if (outnum) {
+ if (incing) {
FPUTS(name);
if (putc(':', scnout) == EOF)
- DIEWRERR();
+ adios(scnmsg, "write error on");
FPUTS(tmpbuf);
}
/*
while (state == FLDPLUS) {
state = m_getfld(state, name, tmpbuf, rlwidth,
inb);
- if (outnum)
+ if (incing)
FPUTS(tmpbuf);
}
break;
case BODY:
compnum = -1;
- if (! outnum) {
+ if (!incing) {
state = FILEEOF; /* stop now if scan cmd */
goto finished;
}
- if (putc('\n', scnout) == EOF) DIEWRERR();
+ if (putc('\n', scnout) == EOF)
+ adios(scnmsg, "write error on");
FPUTS(tmpbuf);
/*
** performance hack: some people like to run "inc"
if (scnout->_cnt <= 0) {
#endif
if (fflush(scnout) == EOF)
- DIEWRERR();
+ adios(scnmsg, "write error on");
}
#ifdef LINUX_STDIO
state = m_getfld(state, name, scnout->_IO_write_ptr, (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , 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);
+ state = m_getfld(state, name, scnout->_ptr, -(scnout->_cnt), inb);
scnout->_cnt -= msg_count;
scnout->_ptr += msg_count;
#endif
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();
+ adios(scnmsg, "write error on");
+ }
+ if (ismbox) {
state = BODY;
goto body;
}
}
}
- /*
- ** 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;
}
bodycomp->c_text = tmpbuf;
}
- 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(scnmsg, "write error on");
}
- if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+ if ((datecomp && !datecomp->c_text) || !ismbox) {
struct stat st;
fstat(fileno(inb), &st);
- if (!size && !outnum)
+ if (!ismbox)
dat[2] = st.st_size;
if (datecomp) {
if (! datecomp->c_text) {
}
}
+ /* print the scan line */
fmt_scan(fmt, scanl, slwidth, dat);
+ if (fmtstr)
+ fputs(scanl, stdout);
if (bodycomp)
bodycomp->c_text = saved_c_text;
- if (noisy)
- fputs(scanl, stdout);
-
- FINDCOMP(cptr, "encrypted");
- encrypted = cptr && cptr->c_text;
-
/* return dynamically allocated buffers to pool */
while ((cptr = *savecomp++)) {
*--nxtbuf = cptr->c_text;
}
*--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 (ismbox && (ferror(scnout) || fclose(scnout) == EOF))
+ adios(scnmsg, "write error on");
- while ((c = *s++))
- if (putc(c,stream) == EOF )
- return(EOF);
- return (0);
+ return (state != FILEEOF ? SCNERR : SCNMSG);
}
projects / mmh / blobdiff