#include <h/mh.h>
#include <h/utils.h>
+#include <ctype.h>
+#include <sysexits.h>
/*
** This module has a long and checkered history.
# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
#endif
-#ifdef SCO_5_STDIO
-# define _ptr __ptr
-# define _cnt __cnt
-# define _base __base
-# define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp))
-# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
-#endif
-
#ifndef DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
extern int _filbuf(FILE*);
#endif
*cp++ = j = *(iob->_ptr + c);
c = _filbuf(iob);
#endif
- if (c == EOF ||
- ((j == '\0' || j == '\n') && c != ' ' && c != '\t')) {
+ if (c == EOF || ((j == '\0' || j == '\n')
+ && c != ' ' && c != '\t')) {
if (c != EOF) {
#ifdef LINUX_STDIO
--iob->_IO_read_ptr;
break;
default:
- adios(NULL, "m_getfld() called with bogus state of %d", state);
+ adios(EX_SOFTWARE, NULL, "m_getfld() called with bogus state of %d", state);
}
finish:
*cp = 0;
return (state);
}
-static char fromline[BUFSIZ] = "";
void
thisisanmbox(FILE *iob)
{
register int c;
- register long pos;
char text[10];
register char *cp;
register char *delimstr;
+ c = getc(iob);
+ if (feof(iob)) {
+ return;
+ }
+ ungetc(c, iob);
+
/*
** Figure out what the message delimitter string is for this
** maildrop. (This used to be part of m_Eom but I didn't like
** abort.
*/
- pos = ftell(iob);
if (fread(text, sizeof(*text), 5, iob) != 5) {
- adios(NULL, "Read error");
+ adios(EX_IOERR, NULL, "Read error");
}
if (strncmp(text, "From ", 5)!=0) {
- adios(NULL, "No Unix style (mbox) maildrop.");
+ adios(EX_USAGE, NULL, "No Unix style (mbox) maildrop.");
}
ismbox = TRUE;
delimstr = "\nFrom ";
- cp = fromline;
- while ((c = getc(iob)) != '\n' && cp - fromline < BUFSIZ - 1)
- *cp++ = c;
- *cp = '\0';
-
+ while ((c = getc(iob)) != '\n' && c >= 0) {
+ continue;
+ }
c = strlen(delimstr);
fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
*fdelim++ = '\0';
strcpy(msg_delim, delimstr);
delimend = (unsigned char *)msg_delim + edelimlen;
if (edelimlen <= 1)
- adios(NULL, "maildrop delimiter must be at least 2 bytes");
+ adios(EX_DATAERR, NULL, "maildrop delimiter must be at least 2 bytes");
/*
** build a Boyer-Moore end-position map for the matcher in m_getfld.
** N.B. - we don't match just the first char (since it's the newline
register long pos = 0L;
register int i;
char text[10];
- register char *cp;
pos = ftell(iob);
if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen ||
}
if (ismbox) {
- cp = fromline;
- while ((c = getc(iob)) != '\n' && c >= 0 && cp - fromline < BUFSIZ - 1)
- *cp++ = c;
- *cp = '\0';
+ while ((c = getc(iob)) != '\n' && c >= 0) {
+ continue;
+ }
}
return 1;
}
-/*
-** Return the Return-Path and Delivery-Date header information.
-**
-** Currently, I'm assuming that the "From " line takes the following form:
-** "From" sender@host date (sendmail delivery)
-*/
-int
-get_returnpath(char *rp, int rplen, char *dd, int ddlen)
-{
- char *cp;
-
- if (!(cp = strchr(fromline, ' '))) {
- return 0;
- }
- /* Extract the Return-Path. */
- snprintf(rp, rplen, "%.*s\n", (int)(cp - fromline), fromline);
- /* Advance over the whitespace. */
- while (*cp == ' ' || *cp == '\t') {
- cp++;
- }
- /* Extract the Delivery-Date. */
- snprintf(dd, ddlen, "%.*s\n", 24, cp);
- *fromline = '\0';
- return 1;
-}
-
-
static unsigned char *
matchc(int patln, char *pat, int strln, char *str)
{