We don't need m_msgdef.c separately and some minor rework in m_getfld.c.

diff --git a/h/mh.h b/h/mh.h
index 8f66669..0738f42 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -234,12 +234,9 @@ struct msgs {
 ** Maildrop styles
 */
 #define MS_DEFAULT  0    /* default (one msg per file) */
-#define MS_UNKNOWN  1    /* type not known yet         */
-#define MS_MBOX     2    /* Unix-style "from" lines    */
+#define MS_MBOX     1    /* Unix-style "from" lines    */
 
 extern int msg_count;        /* m_getfld() indicators */
-extern int msg_style;        /*  .. */
-extern char *msg_delim;      /*  .. */
 
 #define NOUSE    0        /* draft being re-used */
 

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index ed1f64c..aaaf31c 100644 (file)
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -69,7 +69,7 @@ SRCS = addrsbr.c ambigsw.c brkstring.c  \
        seq_setprev.c seq_setunseen.c signals.c  \
        smatch.c snprintb.c strcasecmp.c  \
        strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c  \
-       m_msgdef.c mf.c utils.c m_mktemp.c
+       mf.c utils.c m_mktemp.c
 
 # source for compatibility functions
 COMPAT = snprintf.c strdup.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 47c7e7d..5dd6973 100644 (file)
--- 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';

diff --git a/sbr/m_msgdef.c b/sbr/m_msgdef.c
deleted file mode 100644 (file)
index cdab622..0000000
--- a/sbr/m_msgdef.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-** m_msgdef.c -- some defines for sbr/m_getfld.c
-**
-** This code is Copyright (c) 2002, by the authors of nmh.  See the
-** COPYRIGHT file in the root directory of the nmh distribution for
-** complete copyright information.
-*/
-
-#include <h/mh.h>
-
-/*
-** 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)
-*/
-int msg_count = 0;
-
-int msg_style = MS_DEFAULT;
-
-/*
-** The "full" delimiter string for a packed maildrop consists
-** of a newline followed by the actual delimiter.  E.g., the
-** full string for a Unix maildrop would be: "\n\nFrom ".
-** "Fdelim" points to the start of the full string and is used
-** in the BODY case of the main routine to search the buffer for
-** a possible eom.  Msg_delim points to the first character of
-** the actual delim. string (i.e., fdelim+1).  Edelim
-** points to the 2nd character of actual delimiter string.  It
-** is used in m_Eom because the first character of the string
-** has been read and matched before m_Eom is called.
-*/
-char *msg_delim = "";