#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, state;
unsigned char *cp, *tmpbuf;
FILE *scnout = NULL;
char name[NAMESZ];
static int rlwidth, slwidth;
-
-#ifdef RPATHS
char returnpath[BUFSIZ];
char deliverydate[BUFSIZ];
-#endif
/* first-time only initialization */
if (!scanl) {
umask(~m_gmprot());
/* Compile format string */
- ncomps = fmt_compile(nfs, &fmt) + 1;
+ ncomps = fmt_compile(fmtstr, &fmt) + 1;
FINDCOMP(bodycomp, "body");
FINDCOMP(datecomp, "date");
- FINDCOMP(cptr, "folder");
- if (cptr && folder)
- cptr->c_text = folder;
- FINDCOMP(cptr, "dtimenow");
- if (cptr)
- cptr->c_text = getcpy(dtimenow(0));
nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
sizeof(char *));
if (nxtbuf == 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.
FPUTS("Delivery-Date: ");
FPUTS(deliverydate);
}
-#endif /* RPATHS */
}
/* scan - main loop */
bodycomp->c_text = tmpbuf;
}
- if (size)
- dat[2] = size;
- else if (outnum > 0) {
+ if (outnum > 0) {
dat[2] = ftell(scnout);
if (dat[2] == EOF)
DIEWRERR();
}
- if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+ if ((datecomp && !datecomp->c_text) || !outnum) {
struct stat st;
fstat(fileno(inb), &st);
- if (!size && !outnum)
+ if (!outnum)
dat[2] = st.st_size;
if (datecomp) {
if (! datecomp->c_text) {
if (bodycomp)
bodycomp->c_text = saved_c_text;
- if (noisy)
+ if (fmtstr)
fputs(scanl, stdout);
/* return dynamically allocated buffers to pool */