X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=534f896c2d48138787138a741502a9acbab97ade;hp=a2dba260966f2e7f7c14a76be509b61d922739be;hb=e954d689b5adafa4ec74e7dbd1e087dbf998f6d6;hpb=684ec30d81e1223a282764452f4902ed4ad1c754

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index a2dba26..534f896 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -7,7 +7,6 @@
 */
 
 #include <h/mh.h>
-#include <h/mts.h>
 #include <h/utils.h>
 
 /*
@@ -30,9 +29,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 +53,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):
 **
@@ -616,10 +615,7 @@ finish:
 	return (state);
 }
 
-
-#ifdef RPATHS
 static char unixbuf[BUFSIZ] = "";
-#endif /* RPATHS */
 
 void
 m_unknown(FILE *iob)
@@ -649,15 +645,10 @@ m_unknown(FILE *iob)
 			&& 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 */
 		adios(NULL, "No Unix style (mbox) maildrop.");
@@ -697,9 +688,7 @@ m_Eom(int c, FILE *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
@@ -717,23 +706,16 @@ m_Eom(int c, FILE *iob)
 	}
 
 	if (msg_style == MS_MBOX) {
-#ifndef RPATHS
-		while ((c = getc(iob)) != '\n')
-			if (c < 0)
-				break;
-#else /* RPATHS */
 		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.
@@ -791,7 +773,6 @@ get_returnpath(char *rp, int rplen, char *dd, int ddlen)
 	unixbuf[0] = 0;
 	return 1;
 }
-#endif /* RPATHS */
 
 
 static unsigned char *