We don't want to use copy() anymore; but kept it for concat() only

[mmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 83b002a..676ff23 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -64,7 +64,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();
@@ -124,7 +124,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 {
                        if (msg)
                                adios(NULL, "only one message at a time!");
@@ -135,9 +135,6 @@ main(int argc, char **argv)
 
        cwd = getcpy(pwd());
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
-
        if (form && (folder || msg))
                        adios(NULL, "can't mix forms and folders/msgs");
 
@@ -148,8 +145,8 @@ main(int argc, char **argv)
                if (!msg)
                        msg = "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");