*/
#include <h/mh.h>
-#include <h/mts.h>
#include <h/utils.h>
/*
** the eom() macro returns FALSE saying we aren't at the end of the
** message.
**
-** The next thing to do is to read the mts.conf file and initialize
-** delimiter[] and delimlen accordingly...
-**
** After mhl was made a built-in in msh, m_getfld() worked just fine
** (using m_unknown() at startup). Until one day: a message which was
** the result of a bursting was shown. Then, since the burst boundaries
** the code gets executed is when inc (or msh) calls it, and both of these
** have already called mts_init().
**
+** [ Note by meillo 2012-02:
+** MMDF-style maildrops (4x ^A) and mts_init() were removed. ]
+**
** ------------------------
** (Written by Van Jacobson for the mh6 m_getfld, January, 1986):
**
static unsigned char *matchc(int, char *, int, char *);
static unsigned char *locc(int, unsigned char *, unsigned char);
-#define eom(c,iob) (msg_style != MS_DEFAULT && \
+#define eom(c,iob) (ismbox && \
(((c) == *msg_delim && m_Eom(c,iob)) ||\
(eom_action && (*eom_action)(c))))
static unsigned char **pat_map;
/*
-** defined in sbr/m_msgdef.c = 0
** This is a disgusting hack for "inc" so it can know how many
** characters were stuffed in the buffer on the last call
** (see comments in uip/scansbr.c).
*/
-extern int msg_count;
+int msg_count = 0;
-/*
-** defined in sbr/m_msgdef.c = MS_DEFAULT
-*/
-extern int msg_style;
+int ismbox = FALSE;
/*
** The "full" delimiter string for a packed maildrop consists
** is used in m_Eom because the first character of the string
** has been read and matched before m_Eom is called.
*/
-extern char *msg_delim; /* defined in sbr/m_msgdef.c = "" */
+char *msg_delim = "";
+
static unsigned char *fdelim;
static unsigned char *delimend;
static int fdelimlen;
cnt = ++iob->_cnt;
#endif
c = (cnt < i ? cnt : i);
- if (msg_style != MS_DEFAULT && c > 1) {
+ if (ismbox && c > 1) {
/*
** packed maildrop - only take up to the (possible)
** start of the next message. This "matchc" should
return (state);
}
-
-#ifdef RPATHS
static char unixbuf[BUFSIZ] = "";
-#endif /* RPATHS */
void
m_unknown(FILE *iob)
register char *cp;
register char *delimstr;
-/*
-** Figure out what the message delimitter string is for this
-** maildrop. (This used to be part of m_Eom but I didn't like
-** the idea of an "if" statement that could only succeed on the
-** first call to m_Eom getting executed on each call, i.e., at
-** every newline in the message).
-**
-** If the first line of the maildrop is a Unix "From " line, we
-** say the style is MBOX and eat the rest of the line. Otherwise
-** we say the style is MMDF and look for the delimiter string
-** specified when nmh was built (or from the mts.conf file).
-*/
-
- msg_style = MS_UNKNOWN;
+ /*
+ ** Figure out what the message delimitter string is for this
+ ** maildrop. (This used to be part of m_Eom but I didn't like
+ ** the idea of an "if" statement that could only succeed on the
+ ** first call to m_Eom getting executed on each call, i.e., at
+ ** every newline in the message).
+ **
+ ** If the first line of the maildrop is a Unix "From " line, we
+ ** say the style is MBOX and eat the rest of the line. Otherwise
+ ** abort.
+ */
pos = ftell(iob);
- if (fread(text, sizeof(*text), 5, iob) == 5
- && strncmp(text, "From ", 5) == 0) {
- msg_style = MS_MBOX;
- delimstr = "\nFrom ";
-#ifndef RPATHS
- while ((c = getc(iob)) != '\n' && c >= 0)
- ;
-#else /* RPATHS */
- cp = unixbuf;
- while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
- *cp++ = c;
- *cp = 0;
-#endif /* RPATHS */
- } else {
- /* not a Unix style maildrop */
- fseek(iob, pos, SEEK_SET);
- if (mmdlm2 == NULL || *mmdlm2 == 0)
- mmdlm2 = "\001\001\001\001\n";
- delimstr = mmdlm2;
- msg_style = MS_MMDF;
+ if (fread(text, sizeof(*text), 5, iob) != 5) {
+ adios(NULL, "Read error");
}
+ if (strncmp(text, "From ", 5)!=0) {
+ adios(NULL, "No Unix style (mbox) maildrop.");
+ }
+ ismbox = TRUE;
+ delimstr = "\nFrom ";
+ cp = unixbuf;
+ while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
+ *cp++ = c;
+ *cp = '\0';
+
c = strlen(delimstr);
fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
*fdelim++ = '\0';
for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
pat_map[(unsigned char)*cp] = (unsigned char *) cp;
-
- if (msg_style == MS_MMDF) {
- /* flush extra msg hdrs */
- while ((c = getc(iob)) >= 0 && eom(c, iob))
- ;
- if (c >= 0)
- ungetc(c, iob);
- }
}
register long pos = 0L;
register int i;
char text[10];
-#ifdef RPATHS
register char *cp;
-#endif /* RPATHS */
pos = ftell(iob);
if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen
|| (strncmp(text, (char *)edelim, edelimlen)!=0)) {
- if (i == 0 && msg_style == MS_MBOX)
+ if (i == 0 && ismbox)
/*
** the final newline in the (brain damaged) unix-format
** maildrop is part of the delimitter - delete it.
return 0;
}
- if (msg_style == MS_MBOX) {
-#ifndef RPATHS
- while ((c = getc(iob)) != '\n')
- if (c < 0)
- break;
-#else /* RPATHS */
+ if (ismbox) {
cp = unixbuf;
while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;
*cp = 0;
-#endif /* RPATHS */
}
return 1;
}
-#ifdef RPATHS
/*
** Return the Return-Path and Delivery-Date
** header information.
**
-** Currently, I'm assuming that the "From " line
-** takes one of the following forms.
-**
-** From sender date remote from host (for UUCP delivery)
-** From sender@host date (for sendmail delivery)
+** 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 *ap, *bp, *cp, *dp;
+ char *ap, *bp;
ap = unixbuf;
- if (!(bp = cp = strchr(ap, ' ')))
+ if (!(bp = strchr(ap, ' ')))
return 0;
- /*
- ** Check for "remote from" in envelope to see
- ** if this message uses UUCP style addressing
- */
- while ((cp = strchr(++cp, 'r'))) {
- if (strncmp(cp, "remote from", 11) == 0) {
- cp = strrchr(cp, ' ');
- break;
- }
- }
-
- /*
- ** Get the Return-Path information from
- ** the "From " envelope.
- */
- if (cp) {
- /* return path for UUCP style addressing */
- dp = strchr(++cp, '\n');
- snprintf(rp, rplen, "%.*s!%.*s\n", (int)(dp - cp), cp, (int)(bp - ap), ap);
- } else {
- /* return path for standard domain addressing */
- snprintf(rp, rplen, "%.*s\n", (int)(bp - ap), ap);
- }
+ /* Get the Return-Path information from the "From " envelope. */
+ snprintf(rp, rplen, "%.*s\n", (int)(bp - ap), ap);
/*
** advance over the spaces to get to
/* Now get delivery date from envelope */
snprintf(dd, ddlen, "%.*s\n", 24, bp);
- unixbuf[0] = 0;
+ *unixbuf = '\0';
return 1;
}
-#endif /* RPATHS */
static unsigned char *
projects / mmh / blobdiff