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
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
-** abort.
-*/
-
- 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 ";
- cp = unixbuf;
- while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
- *cp++ = c;
- *cp = 0;
- } else {
- /* not a Unix style maildrop */
+ 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';
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) {
+ if (ismbox) {
cp = unixbuf;
while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;