Removed obsolete comment about use of getcpy().

[nmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 70ddb8db0d3e3481f3fbee01fd3457efaadc10d0..bb6c4f0bc1df16df35c5bf851cfc144b63a1da37 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -149,7 +149,7 @@ getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
     mp->m_next = NULL;
     mp->m_text = getcpy (str);
     if (pers)
     mp->m_next = NULL;
     mp->m_text = getcpy (str);
     if (pers)

-       mp->m_pers = getcpy (pers);
+       mp->m_pers = mh_xstrdup(pers);

 
     if (mbox == NULL) {
        mp->m_type = BADHOST;
 
     if (mbox == NULL) {
        mp->m_type = BADHOST;


@@ -157,19 +157,19 @@ getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
        mp->m_ingrp = ingrp;
        mp->m_gname = getcpy (grp);
        if (note)
        mp->m_ingrp = ingrp;
        mp->m_gname = getcpy (grp);
        if (note)

-           mp->m_note = getcpy (note);
+           mp->m_note = mh_xstrdup(note);

        return mp;
     }
 
     if (host) {
        mp->m_mbox = getcpy (mbox);
        return mp;
     }
 
     if (host) {
        mp->m_mbox = getcpy (mbox);

-       mp->m_host = getcpy (host);
+       mp->m_host = mh_xstrdup(host);

        mp->m_type =
            strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST;
     } else {
        if ((pp = strchr(mbox, '!'))) {
            *pp++ = '\0';
        mp->m_type =
            strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST;
     } else {
        if ((pp = strchr(mbox, '!'))) {
            *pp++ = '\0';

-           mp->m_mbox = getcpy (pp);
+           mp->m_mbox = mh_xstrdup(pp);

            mp->m_host = getcpy (mbox);
            mp->m_type = UUCPHOST;
        } else {
            mp->m_host = getcpy (mbox);
            mp->m_type = UUCPHOST;
        } else {


@@ -189,12 +189,12 @@ getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
        to support wild-card matching. */
 
     if (route)
        to support wild-card matching. */
 
     if (route)

-       mp->m_path = getcpy (route);
+       mp->m_path = mh_xstrdup(route);

     mp->m_ingrp = ingrp;
     if (grp)
     mp->m_ingrp = ingrp;
     if (grp)

-       mp->m_gname = getcpy (grp);
+       mp->m_gname = mh_xstrdup(grp);

     if (note)
     if (note)

-       mp->m_note = getcpy (note);
+       mp->m_note = mh_xstrdup(note);

 
     return mp;
 }
 
     return mp;
 }


@@ -206,22 +206,15 @@ mnfree (struct mailname *mp)
     if (!mp)
        return;
 
     if (!mp)
        return;
 

-    if (mp->m_text)
-       free (mp->m_text);
-    if (mp->m_pers)
-       free (mp->m_pers);
-    if (mp->m_mbox)
-       free (mp->m_mbox);
-    if (mp->m_host)
-       free (mp->m_host);
-    if (mp->m_path)
-       free (mp->m_path);
-    if (mp->m_gname)
-       free (mp->m_gname);
-    if (mp->m_note)
-       free (mp->m_note);
-
-    free ((char *) mp);
+    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);

 }
 
 
 }
 
 


@@ -286,9 +279,9 @@ int
 ismymbox (struct mailname *np)
 {
     int oops;
 ismymbox (struct mailname *np)
 {
     int oops;

-    register int len, i;
-    register char *cp;
-    register char *pp;
+    int len, i;
+    char *cp;
+    char *pp;

     char buffer[BUFSIZ];
     struct mailname *mp;
     static char *am = NULL;
     char buffer[BUFSIZ];
     struct mailname *mp;
     static char *am = NULL;