Made the RPATHS config option the default and removed the #ifdefs.

[mmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index db509fc..534f896 100644 (file)
--- 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)
@@ -639,33 +635,23 @@ 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
-               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;
+               adios(NULL, "No Unix style (mbox) maildrop.");
        }
        c = strlen(delimstr);
        fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
@@ -689,14 +675,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);
-       }
 }
 
 
@@ -710,13 +688,11 @@ 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
-               || strncmp(text, (char *)edelim, edelimlen)) {
+               || (strncmp(text, (char *)edelim, edelimlen)!=0)) {
                if (i == 0 && msg_style == MS_MBOX)
                        /*
                        ** the final newline in the (brain damaged) unix-format
@@ -724,33 +700,22 @@ m_Eom(int c, FILE *iob)
                        */
                        return 1;
 
-#if 0
-               fseek(iob, pos, SEEK_SET);
-#endif
-
                fseek(iob, (long)(pos-1), SEEK_SET);
                getc(iob);  /* should be OK */
                return 0;
        }
 
        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.
@@ -808,7 +773,6 @@ get_returnpath(char *rp, int rplen, char *dd, int ddlen)
        unixbuf[0] = 0;
        return 1;
 }
-#endif /* RPATHS */
 
 
 static unsigned char *