mhparam: Remove `libdir', deprecated in 1.7.

[nmh] / sbr / mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index 33eed0d1e578ef4e4298ac83f06fc38c5cbbe275..86104de23d6c4482c0b0e710da14aa332188c09d 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -5,6 +5,7 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

+#include <h/mh.h>

 #include <h/mf.h>
 #include <h/utils.h>
 
 #include <h/mf.h>
 #include <h/utils.h>
 


@@ -89,8 +90,6 @@ isat (const char *p)
  *
  */
 
  *
  */
 

-#define        QUOTE   '\\'
-

 #define        LX_END   0
 #define        LX_ERR   1
 #define        LX_ATOM  2
 #define        LX_END   0
 #define        LX_ERR   1
 #define        LX_ATOM  2


@@ -119,7 +118,7 @@ static struct specials special[] = {
     { '@',   LX_AT },
     { '(',   LX_ERR },
     { ')',   LX_ERR },
     { '@',   LX_AT },
     { '(',   LX_ERR },
     { ')',   LX_ERR },

-    { QUOTE, LX_ERR },
+    { '\\',  LX_ERR },

     { '"',   LX_ERR },
     { '[',   LX_ERR },
     { ']',   LX_ERR },
     { '"',   LX_ERR },
     { '[',   LX_ERR },
     { ']',   LX_ERR },


@@ -136,7 +135,7 @@ static char *ap = NULL;
 static char *pers = NULL;
 static char *mbox = NULL;
 static char *host = NULL;
 static char *pers = NULL;
 static char *mbox = NULL;
 static char *host = NULL;

-static char *path = NULL;
+static char *routepath = NULL;

 static char *grp = NULL;
 static char *note = NULL;
 static char err[BUFSIZ];
 static char *grp = NULL;
 static char *note = NULL;
 static char err[BUFSIZ];


@@ -149,77 +148,51 @@ static struct adrx  adrxs2;
 struct adrx *
 getadrx (const char *addrs, int eai)
 {
 struct adrx *
 getadrx (const char *addrs, int eai)
 {

+    int parse;

     char *bp;
     struct adrx *adrxp = &adrxs2;
 
     mh_xfree(pers);
     mh_xfree(mbox);
     mh_xfree(host);
     char *bp;
     struct adrx *adrxp = &adrxs2;
 
     mh_xfree(pers);
     mh_xfree(mbox);
     mh_xfree(host);

-    mh_xfree(path);
+    mh_xfree(routepath);

     mh_xfree(grp);
     mh_xfree(note);
     mh_xfree(grp);
     mh_xfree(note);

-    pers = mbox = host = path = grp = note = NULL;
+    pers = mbox = host = routepath = grp = note = NULL;

     err[0] = 0;
 
     if (dp == NULL) {
     err[0] = 0;
 
     if (dp == NULL) {

-       dp = cp = strdup (addrs ? addrs : "");
+       dp = cp = strdup (FENDNULL(addrs));

        glevel = 0;
        glevel = 0;

+    } else if (cp == NULL) {
+        free (dp);
+        dp = NULL;
+        return NULL;

     }
     }

-    else
-       if (cp == NULL) {
-           free (dp);
-           dp = NULL;
-           return NULL;
-       }
-
-    switch (parse_address ()) {
-       case DONE:
-           free (dp);
-           dp = cp = NULL;
-           return NULL;
-
-       case OK:
-           switch (last_lex) {
-               case LX_COMA:
-               case LX_END:
-                   break;
-
-               default:        /* catch trailing comments */
-                   bp = cp;
-                   my_lex (adr);
-                   cp = bp;
-                   break;
-           }
-           break;
-
-       default:
-           break;
-       }

 
 

-    if (! eai) {
-        /*
-         * 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");
-        }
+    parse = parse_address();
+    if (parse == DONE) {
+        free(dp);
+        dp = cp = NULL;
+        return NULL;
+    }
+    if (parse == OK && last_lex != LX_COMA && last_lex != LX_END) {
+        /* catch trailing comments */
+        bp = cp;
+        my_lex(adr);
+        cp = bp;

     }
 
     }
 

+    /* Reject the address if key fields contain 8bit characters. */
+    if (!eai &&
+        (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
+        contains8bit(routepath, NULL) || contains8bit(grp, NULL)))
+        strcpy(err, "Address contains 8-bit characters");
+

     if (err[0])
     if (err[0])

-       for (;;) {
-           switch (last_lex) {
-               case LX_COMA: 
-               case LX_END: 
-                   break;
+        while (last_lex != LX_COMA && last_lex != LX_END)
+            my_lex(adr);

 
 

-               default: 
-                   my_lex (adr);
-                   continue;
-           }
-           break;
-       }

     while (isspace ((unsigned char) *ap))
        ap++;
     if (cp)
     while (isspace ((unsigned char) *ap))
        ap++;
     if (cp)


@@ -234,7 +207,7 @@ getadrx (const char *addrs, int eai)
     adrxp->pers = pers;
     adrxp->mbox = mbox;
     adrxp->host = host;
     adrxp->pers = pers;
     adrxp->mbox = mbox;
     adrxp->host = host;

-    adrxp->path = path;
+    adrxp->path = routepath;

     adrxp->grp = grp;
     adrxp->ingrp = ingrp;
     adrxp->note = note;
     adrxp->grp = grp;
     adrxp->ingrp = ingrp;
     adrxp->note = note;


@@ -366,7 +339,7 @@ again: ;
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }

-                   /* FALLTHRU */
+                   return OK;

                case LX_COMA: 
                case LX_END: 
                    return OK;
                case LX_COMA: 
                case LX_END: 
                    return OK;


@@ -398,16 +371,12 @@ again: ;
 static int
 phrase (char *buffer)
 {
 static int
 phrase (char *buffer)
 {

-    for (;;)
-       switch (my_lex (buffer)) {
-           case LX_ATOM: 
-           case LX_QSTR: 
-               pers = add (buffer, add (" ", pers));
-               continue;
+    int lex;

 
 

-           default: 
-               return OK;
-       }
+    while ((lex = my_lex(buffer)) == LX_ATOM || lex == LX_QSTR)
+        pers = add(buffer, add(" ", pers));
+
+    return OK;

 }
 
 
 }
 
 


@@ -508,13 +477,13 @@ domain (char *buffer)
 static int
 route (char *buffer)
 {
 static int
 route (char *buffer)
 {

-    path = mh_xstrdup ("@");
+    routepath = mh_xstrdup ("@");

 
     for (;;) {
        switch (my_lex (buffer)) {
            case LX_ATOM: 
            case LX_DLIT: 
 
     for (;;) {
        switch (my_lex (buffer)) {
            case LX_ATOM: 
            case LX_DLIT: 

-               path = add (buffer, path);
+               routepath = add (buffer, routepath);

                break;
 
            default: 
                break;
 
            default: 


@@ -523,14 +492,14 @@ route (char *buffer)
        }
        switch (my_lex (buffer)) {
            case LX_COMA: 
        }
        switch (my_lex (buffer)) {
            case LX_COMA: 

-               path = add (buffer, path);
+               routepath = add (buffer, routepath);

                for (;;) {
                    switch (my_lex (buffer)) {
                        case LX_COMA: 
                            continue;
 
                        case LX_AT: 
                for (;;) {
                    switch (my_lex (buffer)) {
                        case LX_COMA: 
                            continue;
 
                        case LX_AT: 

-                           path = add (buffer, path);
+                           routepath = add (buffer, routepath);

                            break;
 
                        default: 
                            break;
 
                        default: 


@@ -543,11 +512,11 @@ route (char *buffer)
 
            case LX_AT:         /* XXX */
            case LX_DOT: 
 
            case LX_AT:         /* XXX */
            case LX_DOT: 

-               path = add (buffer, path);
+               routepath = add (buffer, routepath);

                continue;
 
            case LX_COLN: 
                continue;
 
            case LX_COLN: 

-               path = add (buffer, path);
+               routepath = add (buffer, routepath);

                return OK;
 
            default: 
                return OK;
 
            default: 


@@ -589,7 +558,7 @@ my_lex (char *buffer)
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);

-               case QUOTE: 
+               case '\\': 

                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;


@@ -621,7 +590,7 @@ my_lex (char *buffer)
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);

-               case QUOTE: 
+               case '\\': 

                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;


@@ -645,7 +614,7 @@ my_lex (char *buffer)
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);
                case 0: 
                    cp = NULL;
                    return (last_lex = LX_ERR);

-               case QUOTE: 
+               case '\\': 

                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;