Completely reworked the path convertion functions

[mmh] / uip / mark.c

diff --git a/uip/mark.c b/uip/mark.c
index bdd02ad..5fd27f6 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -59,7 +59,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex(argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
@@ -134,9 +134,9 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else
-                               app_msgarg(&msgs, cp);
+                       app_msgarg(&msgs, cp);
        }
 
        /*
@@ -151,13 +151,11 @@ main(int argc, char **argv)
                        listsw++;
        }
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
        if (!msgs.size)
                app_msgarg(&msgs, listsw ? "all" :"cur");
        if (!folder)
-               folder = getfolder(1);
-       maildir = m_maildir(folder);
+               folder = getcurfol();
+       maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");