Added tests of MMDF mailbox format to test-eom-align.

[nmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 6d883ea1ae485c99f5c76755290edf188611cd7a..eadf1d07443e71a1bc3399e33b4181d3017cd0a5 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -204,13 +204,13 @@ mnfree (struct mailname *mp)
     if (!mp)
        return;
 
     if (!mp)
        return;
 

-    mh_xfree(mp->m_text);
-    mh_xfree(mp->m_pers);
-    mh_xfree(mp->m_mbox);
-    mh_xfree(mp->m_host);
-    mh_xfree(mp->m_path);
-    mh_xfree(mp->m_gname);
-    mh_xfree(mp->m_note);
+    free(mp->m_text);
+    free(mp->m_pers);
+    free(mp->m_mbox);
+    free(mp->m_host);
+    free(mp->m_path);
+    free(mp->m_gname);
+    free(mp->m_note);

 
     free(mp);
 }
 
     free(mp);
 }


@@ -224,9 +224,7 @@ auxformat (struct mailname *mp, int extras)
 
        if (mp->m_nohost)
            strncpy (addr, FENDNULL(mp->m_mbox), sizeof(addr));
 
        if (mp->m_nohost)
            strncpy (addr, FENDNULL(mp->m_mbox), sizeof(addr));

-       else
-
-       if (mp->m_type != UUCPHOST) {
+       else if (mp->m_type != UUCPHOST) {

            if (mp->m_host)
                snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
                          FENDNULL(mp->m_mbox), mp->m_host);
            if (mp->m_host)
                snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
                          FENDNULL(mp->m_mbox), mp->m_host);


@@ -247,12 +245,10 @@ auxformat (struct mailname *mp, int extras)
            snprintf (buffer, sizeof(buffer), "%s <%s>",
                    legal_person (mp->m_pers ? mp->m_pers : mp->m_mbox),
                    addr);
            snprintf (buffer, sizeof(buffer), "%s <%s>",
                    legal_person (mp->m_pers ? mp->m_pers : mp->m_mbox),
                    addr);

-    }
+    } else if (mp->m_note)
+        snprintf (buffer, sizeof(buffer), "%s %s", addr, mp->m_note);

     else
     else

-       if (mp->m_note)
-           snprintf (buffer, sizeof(buffer), "%s %s", addr, mp->m_note);
-       else
-           strncpy (buffer, addr, sizeof(buffer));
+        strncpy (buffer, addr, sizeof(buffer));

 
     return buffer;
 }
 
     return buffer;
 }


@@ -271,7 +267,7 @@ auxformat (struct mailname *mp, int extras)
  * Check if this is my address
  */
 
  * Check if this is my address
  */
 

-int
+bool

 ismymbox (struct mailname *np)
 {
     int oops;
 ismymbox (struct mailname *np)
 {
     int oops;


@@ -298,12 +294,12 @@ ismymbox (struct mailname *np)
 
            if ((cp = getname(am)) == NULL) {
                inform("Unable to find address in local-mailbox, continuing...");
 
            if ((cp = getname(am)) == NULL) {
                inform("Unable to find address in local-mailbox, continuing...");

-               return 0;
+               return false;

            }
 
            if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
                 inform("invalid entry in local-mailbox: %s, continuing...", cp);
            }
 
            if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
                 inform("invalid entry in local-mailbox: %s, continuing...", cp);

-               return 0;
+               return false;

            }
 
            /* Sigh, it turns out that the address parser gets messed up
            }
 
            /* Sigh, it turns out that the address parser gets messed up


@@ -362,7 +358,7 @@ ismymbox (struct mailname *np)
     }
 
     if (np == NULL) /* XXX */
     }
 
     if (np == NULL) /* XXX */

-       return 0;
+       return false;

     
     /*
      * Don't perform this "local" test if we have a Local-Mailbox set
     
     /*
      * Don't perform this "local" test if we have a Local-Mailbox set


@@ -383,7 +379,7 @@ ismymbox (struct mailname *np)
            case LOCALHOST:
 local_test: ;
                if (!strcasecmp (np->m_mbox, mq.m_mbox))
            case LOCALHOST:
 local_test: ;
                if (!strcasecmp (np->m_mbox, mq.m_mbox))

-                   return 1;
+                   return true;

                break;
 
            default:
                break;
 
            default:


@@ -421,7 +417,7 @@ local_test: ;
        }
 
        if (mp->m_nohost)
        }
 
        if (mp->m_nohost)

-           return 1;
+           return true;

        if (np->m_host == NULL || mp->m_host == NULL)
            continue;
        if ((len = strlen (cp = np->m_host))
        if (np->m_host == NULL || mp->m_host == NULL)
            continue;
        if ((len = strlen (cp = np->m_host))


@@ -445,8 +441,8 @@ local_test: ;
                    continue;
                break;
        }
                    continue;
                break;
        }

-       return 1;
+       return true;

     }
 
     }
 

-    return 0;
+    return false;

 }
 }