X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a14191c0a0ad15bb8f35b49748c75c1e0a8c2f4..47e4d2685ab31e71336a7806fdc3dcd2a107f60f:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index d5d32b17..6dd1850d 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhlsbr.c -- main routines for nmh message lister
+/* mhlsbr.c -- main routines for nmh message lister
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -22,7 +20,7 @@
  * set, then addresses get split wrong (not at the spaces between commas).
  * To fix this correctly, putstr() should know about "atomic" strings that
  * must NOT be broken across lines.  That's too difficult for right now
- * (it turns out that there are a number of degernate cases), so in
+ * (it turns out that there are a number of degenerate cases), so in
  * oneline(), instead of
  *
  *       (*onelp == '\n' && !onelp[1])
@@ -461,10 +459,10 @@ mhl (int argc, char **argv)
 		    continue;
 
 		case BITSTUFFSW: 
-		    dashstuff = 1;	/* trinary logic */
+		    dashstuff = 1;	/* ternary logic */
 		    continue;
 		case NBITSTUFFSW: 
-		    dashstuff = -1;	/* trinary logic */
+		    dashstuff = -1;	/* ternary logic */
 		    continue;
 
 		case NBODYSW: 
@@ -850,15 +848,14 @@ parse (void)
 
     for (cp = result; *parptr && (cp - result < NAMESZ); parptr++) {
 	c = *parptr;
-	if (isalnum (c)
-		|| c == '.'
-		|| c == '-'
-		|| c == '_'
-		|| c =='['
-		|| c == ']')
-	    *cp++ = c;
-	else
+	if (!isalnum (c)
+		&& c != '.'
+		&& c != '-'
+		&& c != '_'
+		&& c !='['
+		&& c != ']')
 	    break;
+        *cp++ = c;
     }
     *cp = '\0';
 
@@ -938,7 +935,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 {
     int state, bucket;
     struct mcomp *c1, *c2, *c3;
-    char **ip, name[NAMESZ], buf[BUFSIZ];
+    char **ip, name[NAMESZ], buf[NMH_BUFSIZ];
     m_getfld_state_t gstate = 0;
 
     compile_filterargs();
@@ -1433,11 +1430,10 @@ oneline (char *stuff, unsigned long flags)
 		    *onelp++ = 0;
 		    break;
 		}
-		else
-		    if (!spc) {
-			*cp++ = ' ';
-			spc++;
-		    }
+                if (!spc) {
+                    *cp++ = ' ';
+                    spc++;
+                }
 	    }
 	    else {
 		*cp++ = *onelp;