Introduced FDEF and FCUR for speaking arguments to getfolder().

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 9ad2877..002bb67 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -109,7 +109,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();
@@ -265,7 +265,7 @@ main(int argc, char **argv)
                if (!msgp)
                        msgs[msgp++] = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)
@@ -385,7 +385,7 @@ mhl_draft(int out, char *digest, int volume, int issue,
        if (pipe(pd) == NOTOK)
                adios("pipe", "unable to create");
 
-       vec[0] = r1bindex(mhlproc, '/');
+       vec[0] = mhbasename(mhlproc);
 
        for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
                sleep(5);