pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / sbr / mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index 37fcf7b955607d1aba08a880bb4dc1cce4755690..d99d2b387d8ad2d245751d32ede9c34d742fcc42 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -8,15 +8,12 @@
  */
 
 #include <h/mf.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <h/utils.h>
 
 /*
  * static prototypes
  */
-static char *getcpy (char *);
-static int isat (char *);
+static int isat (const char *);
 static int parse_address (void);
 static int phrase (char *);
 static int route_addr (char *);
@@ -26,27 +23,8 @@ static int route (char *);
 static int my_lex (char *);
 
 
-static char *
-getcpy (char *s)
-{
-    register char *p;
-
-    if (!s) {
-/* causes compiles to blow up because the symbol _cleanup is undefined 
-   where did this ever come from? */
-       /* _cleanup(); */
-       abort();
-       for(;;)
-           pause();
-    }
-    p = mh_xmalloc ((size_t) (strlen (s) + 2));
-    strcpy (p, s);
-    return p;
-}
-
-
 int
-isfrom(char *string)
+isfrom(const char *string)
 {
     return (strncmp (string, "From ", 5) == 0
            || strncmp (string, ">From ", 6) == 0);
@@ -54,7 +32,7 @@ isfrom(char *string)
 
 
 int
-lequal (char *a, char *b)
+lequal (const char *a, const char *b)
 {
     for (; *a; a++, b++)
        if (*b == 0)
@@ -73,7 +51,7 @@ lequal (char *a, char *b)
 
 
 static int
-isat (char *p)
+isat (const char *p)
 {
     return (strncmp (p, " AT ", 4)
            && strncmp (p, " At ", 4)
@@ -197,7 +175,7 @@ static struct adrx  adrxs2;
 
 
 struct adrx *
-getadrx (char *addrs)
+getadrx (const char *addrs)
 {
     register char *bp;
     register struct adrx *adrxp = &adrxs2;
@@ -218,7 +196,7 @@ getadrx (char *addrs)
     err[0] = 0;
 
     if (dp == NULL) {
-       dp = cp = getcpy (addrs ? addrs : "");
+       dp = cp = strdup (addrs ? addrs : "");
        glevel = 0;
     }
     else
@@ -252,6 +230,15 @@ getadrx (char *addrs)
            break;
        }
 
+    /*
+     * Reject the address if key fields contain 8bit characters
+     */
+
+    if (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
+       contains8bit(path, NULL) || contains8bit(grp, NULL)) {
+       strcpy(err, "Address contains 8-bit characters");
+    }
+
     if (err[0])
        for (;;) {
            switch (last_lex) {
@@ -299,7 +286,7 @@ again: ;
     switch (my_lex (buffer)) {
        case LX_ATOM: 
        case LX_QSTR: 
-           pers = getcpy (buffer);
+           pers = strdup (buffer);
            break;
 
        case LX_SEMI: 
@@ -553,7 +540,7 @@ domain (char *buffer)
 static int
 route (char *buffer)
 {
-    path = getcpy ("@");
+    path = strdup ("@");
 
     for (;;) {
        switch (my_lex (buffer)) {
@@ -652,7 +639,7 @@ my_lex (char *buffer)
                    if (--i < 0) {
                        *bp = 0;
                        note = note ? add (buffer, add (" ", note))
-                           : getcpy (buffer);
+                           : strdup (buffer);
                        return my_lex (buffer);
                    }
            }
@@ -741,14 +728,14 @@ got_atom: ;
 
 
 char *
-legal_person (char *p)
+legal_person (const char *p)
 {
     int i;
-    register char *cp;
+    register const char *cp;
     static char buffer[BUFSIZ];
 
     if (*p == '"')
-       return p;
+       return (char *) p;
     for (cp = p; *cp; cp++)
        for (i = 0; special[i].lx_chr; i++)
            if (*cp == special[i].lx_chr) {
@@ -756,7 +743,7 @@ legal_person (char *p)
                return buffer;
            }
 
-    return p;
+    return (char *) p;
 }