X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;fp=sbr%2Fm_getfld.c;h=5dd697397f6d3bed44fb6834a7f9e07aaedc4247;hp=47c7e7deda11b754743777460f19674d9f09a5e9;hb=be6a3c548620f6d908ccaff321c8fb372b615406;hpb=fdc012cb43b5fc0baa6f4470b47be397bfc3f21b

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 47c7e7d..5dd6973 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -144,24 +144,20 @@ static int m_Eom(int, FILE *);
 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)  (msg_style == MS_MBOX && \
 	(((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 msg_style = MS_DEFAULT;
 
 /*
 ** The "full" delimiter string for a packed maildrop consists
@@ -175,7 +171,8 @@ extern int msg_style;
 ** 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;
@@ -508,7 +505,7 @@ m_getfld(int state, unsigned char *name, unsigned char *buf,
 		cnt = ++iob->_cnt;
 #endif
 		c = (cnt < i ? cnt : i);
-		if (msg_style != MS_DEFAULT && c > 1) {
+		if (msg_style == MS_MBOX && c > 1) {
 			/*
 			** packed maildrop - only take up to the (possible)
 			** start of the next message.  This "matchc" should
@@ -626,33 +623,32 @@ 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
-** 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.");
 	}
+	msg_style = MS_MBOX;
+	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';