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

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index cd352a40939fe0a02dd78c696f13727fe8946def..6f8438d0b8a882566fb98871df75eb6e704904ff 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -275,11 +275,13 @@ static void
 opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 {
     char nmaildir[BUFSIZ];
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-       chdir (m_maildir (""));
+       if (chdir (m_maildir ("")) < 0) {
+           advise (m_maildir (""), "chdir");
+       }
        strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
 
        /*
@@ -302,7 +304,9 @@ opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
            fp->f_mp = src_folder;
        }
 
-       chdir (maildir);
+       if (maildir[0] != '\0'  &&  chdir (maildir) < 0) {
+           advise (maildir, "chdir");
+       }
     }
 }
 
@@ -315,8 +319,8 @@ opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 static void
 clsfolds (struct st_fold *folders, int nfolders)
 {
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        mp = fp->f_mp;