Completely reworked the path convertion functions

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index aef291a..d85ad61 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -229,17 +229,17 @@ main(int argc, char **argv)
                                foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
                        }
                        if (*cp == '+' || *cp == '@') {
-                               foldersToDo[numfolders++] = pluspath(cp);
+                               foldersToDo[numfolders++] = getcpy(expandfol(cp));
                        } else
                                foldersToDo[numfolders++] = cp;
                }
        }
 
        /* get current folder */
-       strncpy(curfolder, getfolder(FCUR), sizeof(curfolder));
+       strncpy(curfolder, getcurfol(), sizeof(curfolder));
 
        /* get nmh base directory */
-       nmhdir = m_maildir("");
+       nmhdir = toabsdir("+");
 
        /*
        ** If we didn't specify any sequences, we search