X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=4dbd94fdc4368efd2369b3354db5d0bc26109544;hp=8fd836430b4d6ef07ae9914236e95acf285e2aaa;hb=d3540eaa4251b3a282115a72ed5d1bb39ce74b3f;hpb=9f9bfa91d88b3ca4cd9206c1f2b17c6d13ebcaba

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 8fd8364..4dbd94f 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -30,9 +30,6 @@
 ** 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
@@ -57,6 +54,9 @@
 ** 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):
 **
@@ -639,15 +639,14 @@ m_unknown(FILE *iob)
 **
 ** 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).
+** abort.
 */
 
 	msg_style = MS_UNKNOWN;
 
 	pos = ftell(iob);
 	if (fread(text, sizeof(*text), 5, iob) == 5
-		&& strncmp(text, "From ", 5) == 0) {
+			&& strncmp(text, "From ", 5) == 0) {
 		msg_style = MS_MBOX;
 		delimstr = "\nFrom ";
 #ifndef RPATHS
@@ -661,11 +660,7 @@ m_unknown(FILE *iob)
 #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;
+		adios(NULL, "No Unix style (mbox) maildrop.");
 	}
 	c = strlen(delimstr);
 	fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
@@ -689,14 +684,6 @@ m_unknown(FILE *iob)
 
 	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);
-	}
 }