mhlsbr.c: Don't strchr(3) non-string NUL-less buffer.

[nmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index bf9283a30437bf4464b75f0dcae48e930a76a063..9f70bc16af2dc92dae795bbb1a7120e6cf288cb1 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -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)
 {