Completely reworked the path convertion functions

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 42e0ee0..3510120 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -238,7 +238,7 @@ do_cache:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);

-                               file = *cp == '-' ? cp : path(cp, TFILE);
+                               file = *cp == '-' ? cp : getcpy(expanddir(cp));

                                continue;
 
                        case FORMSW:
                                continue;
 
                        case FORMSW:

@@ -284,7 +284,7 @@ do_cache:
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else

-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));

                } else
                        app_msgarg(&msgs, cp);
        }
                } else
                        app_msgarg(&msgs, cp);
        }

@@ -328,7 +328,7 @@ do_cache:
        /* Check for private cache location */
        if (!(cache_private = context_find(nmhprivcache)))
                cache_private = ".cache";
        /* Check for private cache location */
        if (!(cache_private = context_find(nmhprivcache)))
                cache_private = ".cache";

-       cache_private = getcpy(m_maildir(cache_private));
+       cache_private = getcpy(toabsdir(cache_private));

 
        /*
        ** Check for storage directory.  If specified,
 
        /*
        ** Check for storage directory.  If specified,

@@ -338,7 +338,7 @@ do_cache:
        if ((cp = context_find(nmhstorage)) && *cp)
                tmp = concat(cp, "/", invo_name, NULL);
        else
        if ((cp = context_find(nmhstorage)) && *cp)
                tmp = concat(cp, "/", invo_name, NULL);
        else

-               tmp = add(m_maildir(invo_name), NULL);
+               tmp = getcpy(toabsdir(invo_name));

 
        if (file && msgs.size)
                adios(NULL, "cannot specify msg and file at same time!");
 
        if (file && msgs.size)
                adios(NULL, "cannot specify msg and file at same time!");

@@ -360,8 +360,8 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
                if (!msgs.size)
                        app_msgarg(&msgs, "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");
 
                if (chdir(maildir) == NOTOK)
                        adios(maildir, "unable to change directory to");