Completely reworked the path convertion functions

[mmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 5e17147..b48a92d 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -98,14 +98,14 @@ main(int argc, char **argv)
                if (*cp == '+' || *cp == '@') {
                        if (folder)
                                adios(NULL, "only one folder at a time!");
-                       folder = pluspath(cp);
+                       folder = getcpy(expandfol(cp));
                } else
                        app_msgarg(&msgs, cp);
        }
 
        if (!file)
                file = "./msgbox";
-       file = path(file, TFILE);
+       file = getcpy(expanddir(file));
 
        /*
        ** Check if file to be created (or appended to)
@@ -125,8 +125,8 @@ main(int argc, char **argv)
                app_msgarg(&msgs, "all");
 
        if (!folder)
-               folder = getfolder(FCUR);
-       maildir = m_maildir(folder);
+               folder = getcurfol();
+       maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to ");