X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/86c5ebc87b70528e01ba0477d021c2633d0a4c12..afaab789:/sbr/m_getfld.c?ds=sidebyside

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 4c775e4f..0f068031 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -1,6 +1,4 @@
-
-/*
- * m_getfld.c -- read/parse a message
+/* m_getfld.c -- read/parse a message
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -202,7 +200,6 @@
 /*
  * static prototypes
  */
-struct m_getfld_state;
 static int m_Eom (m_getfld_state_t);
 
 #define eom(c,s)	(s->msg_style != MS_DEFAULT && \
@@ -432,7 +429,8 @@ read_more (m_getfld_state_t s) {
     ssize_t retain = s->edelimlen;
     size_t num_read;
 
-    if (retain < s->end - s->readpos) retain = s->end - s->readpos;
+    if (retain < s->end - s->readpos)
+        retain = s->end - s->readpos;
     assert (retain <= s->readpos - s->msg_buf);
 
     /* Move what we want to retain at end of the buffer to the beginning. */
@@ -547,7 +545,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 		int next_char;
 		if (c == EOF  ||  (next_char = Peek (s)) == EOF) {
 		    *bufsz = *cp = *buf = 0;
-		    advise (NULL, "eof encountered in field \"%s\"", name);
+		    inform("eof encountered in field \"%s\"", name);
 		    leave_getfld (s);
 		    return s->state = FMTERR;
 		}
@@ -573,7 +571,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 		if (*bufsz < n + 1) {
 		    /* No, it can't.  Oh well, guess we'll blow up. */
 		    *bufsz = *cp = *buf = 0;
-		    advise (NULL, "eol encountered in field \"%s\"", name);
+		    inform("eol encountered in field \"%s\"", name);
 		    s->state = FMTERR;
 		    break;
 		}
@@ -595,7 +593,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
                    it had read.  It's in c, use it. */
 		*cp++ = c;
 		*bufsz = *cp = *buf = 0;
-		advise (NULL, "field name \"%s\" exceeds %d bytes", name,
+		inform("field name \"%s\" exceeds %d bytes", name,
 			NAMESZ - 2);
 		s->state = LENERR;
 		break;
@@ -605,7 +603,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    while (isspace ((unsigned char) *--cp) && cp >= name) continue;
 	    *++cp = 0;
 	    /* readpos points to the first character of the field body. */
-	    /* fall through */
+	    /* FALLTHRU */
 
 	case FLDPLUS: {
 	    /*
@@ -620,10 +618,12 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    n = 0;
 	    for (finished = 0; ! finished; ) {
 		while (c != '\n'  &&  c != EOF  &&  n++ < max) {
-		    if ((c = Getc (s)) != EOF) { *cp++ = c; }
+		    if ((c = Getc (s)) != EOF)
+                        *cp++ = c;
 		}
 
-		if (c != EOF) c = Peek (s);
+		if (c != EOF)
+                    c = Peek (s);
 		if (max < n) {
 		    /* The dest buffer is full.  Need to back the read
 		       pointer up by one because when m_getfld() is
@@ -664,7 +664,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    max = *bufsz-1;
 	    /* Back up and store the current position. */
 	    bp = --s->readpos;
-	    c = s->end - s->readpos < max  ?  s->end - s->readpos  :  max;
+            c = min(s->end - s->readpos, max);
 	    if (s->msg_style != MS_DEFAULT && c > 1) {
 		/*
 		 * packed maildrop - only take up to the (possible)
@@ -775,7 +775,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
     s = *gstate;
 
 /*
- * Figure out what the message delimitter string is for this
+ * Figure out what the message delimiter 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
@@ -793,9 +793,8 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
 	if ((c = Getc (s)) == EOF) {
 	    *cp = '\0';
 	    break;
-	} else {
-	    *cp = c;
 	}
+        *cp = c;
     }
 
     if (i == sizeof from-1  &&  strncmp (text, "From ", sizeof from-1) == 0) {
@@ -876,16 +875,15 @@ m_Eom (m_getfld_state_t s)
 	if ((c2 = Getc (s)) == EOF) {
 	    *cp = '\0';
 	    break;
-	} else {
-	    *cp = c2;
 	}
+        *cp = c2;
     }
 
     if (i != s->edelimlen  ||
         strncmp (text, (char *)s->edelim, s->edelimlen)) {
 	if (i == 0 && s->msg_style == MS_MBOX)
 	    /* the final newline in the (brain damaged) unix-format
-	     * maildrop is part of the delimitter - delete it.
+	     * maildrop is part of the delimiter - delete it.
 	     */
 	    return 1;