/*
* scansbr.c -- routines to help scan along...
*
- * $Id$
+ * 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 <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
+#include <h/utils.h>
#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 */
/*
char *scanl = 0; /* text of most recent scanline */
+#define DIEWRERR() adios (scnmsg, "write error on")
+
#define FPUTS(buf) {\
if (mh_fputs(buf,scnout) == EOF)\
- adios (scnmsg, "write error on");\
+ DIEWRERR();\
}
/*
* prototypes
*/
-int sc_width (void); /* from termsbr.c */
static int mh_fputs(char *, FILE *);
+#ifdef MULTIBYTE_SUPPORT
+#define SCAN_CHARWIDTH MB_CUR_MAX
+#else
+#define SCAN_CHARWIDTH 1
+#endif
int
scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
int unseen, char *folder, long size, int noisy)
{
int i, compnum, encrypted, state;
- char *cp, *tmpbuf, **nxtbuf;
- char *saved_c_text;
+ unsigned char *cp, *tmpbuf;
+ char **nxtbuf;
+ char *saved_c_text = NULL;
struct comp *cptr;
struct comp **savecomp;
- char *scnmsg;
- FILE *scnout;
+ char *scnmsg = NULL;
+ 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) {
if (width == 0) {
width = MAXSCANL;
}
dat[3] = slwidth = width;
- if ((scanl = (char *) malloc((size_t) (slwidth + 2) )) == NULL)
- adios (NULL, "unable to malloc scan line (%d bytes)", slwidth+2);
+ scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );
if (outnum)
umask(~m_gmprot());
used_buf += ncomps+1; *--used_buf = 0;
rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
for (i = ncomps; i--; )
- if ((*nxtbuf++ = malloc(rlwidth)) == NULL)
- adios (NULL, "unable to allocate component buffer");
+ *nxtbuf++ = mh_xmalloc(rlwidth);
}
/*
}
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 */
}
/* scan - main loop */
compnum++;
if (outnum) {
FPUTS (name);
- putc (':', scnout);
+ if ( putc (':', scnout) == EOF) DIEWRERR();
FPUTS (tmpbuf);
}
/*
*/
if ((cptr = wantcomp[CHASH(name)])) {
do {
- if (!strcasecmp(name, cptr->c_name)) {
+ if (!mh_strcasecmp(name, cptr->c_name)) {
if (! cptr->c_text) {
cptr->c_text = tmpbuf;
for (cp = tmpbuf + strlen (tmpbuf) - 1;
case BODY:
compnum = -1;
+ /*
+ * A slight hack ... if we have less than rlwidth characters
+ * in the buffer, call m_getfld again.
+ */
+
+ if ((i = strlen(tmpbuf)) < rlwidth) {
+ state = m_getfld (state, name, tmpbuf + i,
+ rlwidth - i, inb);
+ }
if (! outnum) {
state = FILEEOF; /* stop now if scan cmd */
goto finished;
}
- putc ('\n', scnout);
+ if (putc ('\n', scnout) == EOF) DIEWRERR();
FPUTS (tmpbuf);
/*
* performance hack: some people like to run "inc" on
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");
+ DIEWRERR ();
}
#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;
if (outnum) {
FPUTS ("\n\nBAD MSG:\n");
FPUTS (name);
- putc ('\n', scnout);
+ if (putc ('\n', scnout) == EOF) DIEWRERR();
state = BODY;
goto body;
}
if (size)
dat[2] = size;
else if (outnum > 0)
+ {
dat[2] = ftell(scnout);
+ if (dat[2] == EOF) DIEWRERR();
+ }
if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
struct stat st;
if (datecomp->c_tws == NULL)
adios (NULL, "unable to allocate tws buffer");
*datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
- datecomp->c_flags = -1;
+ datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
} else {
- datecomp->c_flags = 0;
+ datecomp->c_flags &= ~CF_DATEFAB;
}
}
}
}
*--nxtbuf = tmpbuf;
- if (outnum && fclose (scnout) == EOF)
- adios (scnmsg, "write error on");
+ if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
+ DIEWRERR();
return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
}
-/*
- * Cheat: we are loaded with adrparse, which wants a routine called
- * OfficialName(). We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called. Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
- return name;
-}
-
-
static int
mh_fputs(char *s, FILE *stream)
{
projects / mmh / blobdiff