Completely reworked the path convertion functions

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 666228b..3f940f7 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -168,7 +168,7 @@ main(int argc, char **argv)
                                                adios(NULL, "only one file at a time!");
                                        if (!(cp = *argp++) || *cp == '-')
                                                adios(NULL, "missing argument to %s", argp[-2]);
-                                       file = path(cp, TFILE);
+                                       file = getcpy(expanddir(cp));
                                        continue;
                                case FILTSW:
                                        if (!(cp = *argp++) || *cp == '-')
@@ -233,7 +233,7 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else {
                        msgs[msgp++] = cp;
                }
@@ -245,7 +245,7 @@ main(int argc, char **argv)
                adios(NULL, "can't mix files and folders/msgs");
 
 #ifdef MHE
-       strncpy(drft, buildsw ? m_maildir("draft")
+       strncpy(drft, buildsw ? toabsdir("draft")
                : m_draft("new"), sizeof(drft));
 #else
        strncpy(drft, m_draft("new"), sizeof(drft));
@@ -263,8 +263,8 @@ main(int argc, char **argv)
                if (!msgp)
                        msgs[msgp++] = "cur";
                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");