X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..62b9266aa31b2baced3252987b256b4e43ec9573:/sbr/m_maildir.c

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 846268ac..5edc9360 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -5,8 +5,12 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "getfolder.h"
+#include "context_find.h"
+#include "path.h"
+#include "h/utils.h"
+#include "m_maildir.h"
 
 #define	CWD	"./"
 #define	DOT	"."
@@ -21,6 +25,7 @@ static char mailfold[BUFSIZ];
 static char *exmaildir (char *);
 
 
+/* Returns static char[], never NULL. */
 char *
 m_maildir (char *folder)
 {
@@ -35,6 +40,7 @@ m_maildir (char *folder)
 }
 
 
+/* Return value must be free(3)'d. */
 char *
 m_mailpath (char *folder)
 {
@@ -47,7 +53,7 @@ m_mailpath (char *folder)
 	    && strcmp (folder, DOTDOT)
 	    && !has_prefix(folder, PWD)) {
 	strncpy (maildir, mailfold, sizeof(maildir));	/* preserve... */
-	cp = getcpy (m_maildir (folder));
+	cp = mh_xstrdup(m_maildir(folder));
 	strncpy (mailfold, maildir, sizeof(mailfold));
     } else {
 	cp = path (folder, TFOLDER);
@@ -57,6 +63,7 @@ m_mailpath (char *folder)
 }
 
 
+/* Returns static char[], never NULL. */
 static char *
 exmaildir (char *folder)
 {
@@ -83,7 +90,9 @@ exmaildir (char *folder)
 	}
 	cp = stpcpy(cp, pp);
     } else {
-	cp = stpcpy(cp, path("./", TFOLDER));
+        char *p = path("./", TFOLDER);
+	cp = stpcpy(cp, p);
+        free(p);
     }
     if (cp[-1] != '/')
 	*cp++ = '/';