Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index 5a9529ded7b129d06a3676fbea39d0e02e523250..871ad22d7ccddec2ec61b160b97d0a86fa82cbd2 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 
 #define        CWD     "./"
 #define        NCWD    (sizeof(CWD) - 1)
 
 #define        CWD     "./"
 #define        NCWD    (sizeof(CWD) - 1)


@@ -33,7 +34,7 @@ pluspath(char *name)
 char *
 path(char *name, int flag)
 {
 char *
 path(char *name, int flag)
 {

-    register char *cp, *ep;
+    char *cp, *ep;

 
     if ((cp = expath (name, flag))
            && (ep = cp + strlen (cp) - 1) > cp
 
     if ((cp = expath (name, flag))
            && (ep = cp + strlen (cp) - 1) > cp


@@ -47,7 +48,7 @@ path(char *name, int flag)
 static char *
 expath (char *name, int flag)
 {
 static char *
 expath (char *name, int flag)
 {

-    register char *cp, *ep;
+    char *cp, *ep;

     char buffer[BUFSIZ];
 
     if (flag == TSUBCWF) {
     char buffer[BUFSIZ];
 
     if (flag == TSUBCWF) {


@@ -57,7 +58,7 @@ expath (char *name, int flag)
        snprintf (buffer, sizeof(buffer), "%s/", m_maildir (""));
        if (ssequal (buffer, name)) {
            cp = name;
        snprintf (buffer, sizeof(buffer), "%s/", m_maildir (""));
        if (ssequal (buffer, name)) {
            cp = name;

-           name = getcpy (name + strlen (buffer));
+           name = mh_xstrdup(name + strlen(buffer));

            free (cp);
        }
        flag = TFOLDER;
            free (cp);
        }
        flag = TFOLDER;


@@ -105,7 +106,7 @@ expath (char *name, int flag)
 static void
 compath (char *f)
 {
 static void
 compath (char *f)
 {

-    register char *cp, *dp;
+    char *cp, *dp;

 
     if (*f != '/')
        return;
 
     if (*f != '/')
        return;