s/pfolder/curfolder/g

[mmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 14ecdaa..9bb61f5 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -50,7 +50,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();
@@ -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)
@@ -120,16 +120,13 @@ main(int argc, char **argv)
                free(cp);
        }
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
-
        /* default is to pack whole folder */
        if (!msgs.size)
                app_msgarg(&msgs, "all");
 
        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 ");
@@ -172,7 +169,7 @@ main(int argc, char **argv)
        /* close and unlock maildrop file */
        mbx_close(file, md);
 
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        if (mp->hghsel != mp->curmsg)
                seq_setcur(mp, mp->lowsel);
        seq_save(mp);