Use C's `++', `+=', etc., not the longhand.

[nmh] / sbr / mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index ebd130d2dfe30706112f407495a0c36f8127275e..4d04abb682d324d21a884ba64704736a2841602a 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -1,6 +1,4 @@
-
-/*
- * mf.c -- mail filter subroutines
+/* mf.c -- mail filter subroutines
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -23,39 +21,11 @@ static int route (char *);
 static int my_lex (char *);
 
 
-int
-isfrom(const char *string)
-{
-    return (strncmp (string, "From ", 5) == 0
-           || strncmp (string, ">From ", 6) == 0);
-}
-
-
-int
-lequal (const char *a, const char *b)
-{
-    char c1, c2;
-
-    for (; *a; a++, b++) {
-       if (*b == 0)
-           return FALSE;
-        c1 = toupper((unsigned char)*a);
-        c2 = toupper((unsigned char)*b);
-        if (c1 != c2)
-            return FALSE;
-    }
-
-    return (*b == 0);
-}
-
-
 static int
 isat (const char *p)
 {
-    return (strncmp (p, " AT ", 4)
-           && strncmp (p, " At ", 4)
-           && strncmp (p, " aT ", 4)
-           && strncmp (p, " at ", 4) ? FALSE : TRUE);
+    return has_prefix(p, " AT ") || has_prefix(p, " At ") ||
+        has_prefix(p, " aT ") || has_prefix(p, " at ");
 }
 
 
@@ -290,6 +260,7 @@ again: ;
                strcpy (err, "extraneous semi-colon");
                return NOTOK;
            }
+           /* FALLTHRU */
        case LX_COMA: 
             mh_xfree(note);
             note = NULL;
@@ -393,6 +364,7 @@ again: ;
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }
+                   /* FALLTHRU */
                case LX_COMA: 
                case LX_END: 
                    return OK;
@@ -534,7 +506,7 @@ domain (char *buffer)
 static int
 route (char *buffer)
 {
-    path = strdup ("@");
+    path = mh_xstrdup ("@");
 
     for (;;) {
        switch (my_lex (buffer)) {
@@ -625,6 +597,7 @@ my_lex (char *buffer)
                    continue;
                case '(': 
                    i++;
+                   /* FALLTHRU */
                default: 
                    ADDCHR(c);
                    continue;
@@ -652,6 +625,7 @@ my_lex (char *buffer)
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }
+                   /* FALLTHRU */
                default: 
                    ADDCHR(c);
                    continue;
@@ -675,6 +649,7 @@ my_lex (char *buffer)
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }
+                   /* FALLTHRU */
                default: 
                    ADDCHR(c);
                    continue;
@@ -739,59 +714,3 @@ legal_person (const char *p)
 
     return (char *) p;
 }
-
-
-int
-mfgets (FILE *in, char **bp)
-{
-    int i;
-    char *cp, *dp, *ep;
-    static int len = 0;
-    static char *pp = NULL;
-
-    if (pp == NULL)
-       pp = mh_xmalloc ((size_t) (len = BUFSIZ));
-
-    for (ep = (cp = pp) + len - 2;;) {
-       switch (i = getc (in)) {
-           case EOF: 
-       eol:    ;
-               if (cp != pp) {
-                   *cp = 0;
-                   *bp = pp;
-                   return OK;
-               }
-       eoh:    ;
-               *bp = NULL;
-               free (pp);
-               pp = NULL;
-               return DONE;
-
-           case 0: 
-               continue;
-
-           case '\n': 
-               if (cp == pp)   /* end of headers, gobble it */
-                   goto eoh;
-               switch (i = getc (in)) {
-                   default:    /* end of line */
-                   case '\n':  /* end of headers, save for next call */
-                       ungetc (i, in);
-                       goto eol;
-
-                   case ' ':   /* continue headers */
-                   case '\t': 
-                       *cp++ = '\n';
-                       break;
-               }               /* fall into default case */
-
-           default: 
-               *cp++ = i;
-               break;
-       }
-       if (cp >= ep) {
-           dp = mh_xrealloc (pp, (size_t) (len += BUFSIZ));
-           cp += dp - pp, ep = (pp = cp) + len - 2;
-       }
-    }
-}