Completely reworked the path convertion functions

[mmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 690b55b..32b7f15 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                                continue;
                        case FILESW:
                                if (filep > NFOLDERS)
@@ -137,7 +137,7 @@ main(int argc, char **argv)
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               files[filep++] = path(cp, TFILE);
+                               files[filep++] = getcpy(expanddir(cp));
                                continue;
 
                        case RPROCSW:
@@ -154,10 +154,9 @@ main(int argc, char **argv)
                        if (foldp > NFOLDERS)
                                adios(NULL, "only %d folders allowed!",
                                                NFOLDERS);
-                       folders[foldp++].f_name =
-                               pluspath(cp);
+                       folders[foldp++].f_name = getcpy(expandfol(cp));
                } else
-                               app_msgarg(&msgs, cp);
+                       app_msgarg(&msgs, cp);
        }
 
        if (foldp == 0)
@@ -187,8 +186,8 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(FCUR);
-       strncpy(maildir, m_maildir(folder), sizeof(maildir));
+               folder = getcurfol();
+       strncpy(maildir, toabsdir(folder), sizeof(maildir));
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");
@@ -275,8 +274,8 @@ opnfolds(struct st_fold *folders, int nfolders)
        register struct msgs *mp;
 
        for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-               chdir(m_maildir(""));
-               strncpy(nmaildir, m_maildir(fp->f_name), sizeof(nmaildir));
+               chdir(toabsdir("+"));
+               strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
 
                create_folder(nmaildir, 0, done);