X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bf3160aa94f981374f0c6353344fd68a4e1daa12..1d3b1bec14ae6bd849053c9746e7da552bf539fa:/sbr/path.c

diff --git a/sbr/path.c b/sbr/path.c
index bf9283a3..278a101f 100644
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -5,8 +5,8 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "h/utils.h"
 #include "m_maildir.h"
 
 #define	CWD	"./"
@@ -22,26 +22,31 @@ static char *pwds;
 static char *expath(char *,int);
 static void compath(char *);
 
+
+/* Return value must be free(3)'d. */
 char *
 pluspath(char *name)
 {
 	return path(name + 1, *name == '+' ? TFOLDER : TSUBCWF);
 }
 
+
+/* Return value must be free(3)'d. */
 char *
 path(char *name, int flag)
 {
-    char *cp, *ep;
+    char *p, *last;
 
-    if ((cp = expath (name, flag))
-	    && (ep = cp + strlen (cp) - 1) > cp
-	    && *ep == '/')
-	*ep = '\0';
+    p = expath(name, flag);
+    last = p + strlen(p) - 1;
+    if (last > p && *last == '/')
+	*last = '\0';
 
-    return cp;
+    return p;
 }
 
 
+/* Return value must be free(3)'d. */
 static char *
 expath (char *name, int flag)
 {