Improved pluspath() and used it instead of path() where appropriate.

[mmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index 8802eaa..3dd552c 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -100,8 +100,9 @@ expath(char *name, int type)
        char buffer[BUFSIZ];
 
        if (type == TSUBCWF) {
-               /* @folder to +folder */
-               snprintf(buffer, sizeof(buffer), "%s/%s", getfolder(1), name);
+               /* convert TSUBCWF to TFOLDER */
+               snprintf(buffer, sizeof(buffer), "%s/%s",
+                               getfolder(FCUR), name);
                name = m_mailpath(buffer);
                packpath(name);
                snprintf(buffer, sizeof(buffer), "%s/", m_maildir(""));
@@ -165,7 +166,7 @@ expath(char *name, int type)
 
 
 /*
-**
+** Return a path name
 */
 char *
 path(char *name, int type)
@@ -188,5 +189,12 @@ path(char *name, int type)
 char *
 pluspath(char *name)
 {
-       return path(name+1, (*name == '+') ? TFOLDER : TSUBCWF);
+       switch (*name) {
+       case '+':
+               return path(name+1, TFOLDER);
+       case '@':
+               return path(name+1, TSUBCWF);
+       default:
+               return path(name, TFILE);
+       }
 }