X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3bc058fd4a216b5eed88562eb3581a1fc766e613..c576ad2674c37a1c63f004c71049998f38854c64:/sbr/path.c

diff --git a/sbr/path.c b/sbr/path.c
index fca85229..9f70bc16 100644
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -1,6 +1,4 @@
-
-/*
- * path.c -- return a pathname
+/* path.c -- return a pathname
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,13 +7,12 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 #define	CWD	"./"
-#define	NCWD	(sizeof(CWD) - 1)
 #define	DOT	"."
 #define	DOTDOT	".."
 #define	PWD	"../"
-#define	NPWD	(sizeof(PWD) - 1)
 
 static char *pwds;
 
@@ -25,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)
 {
@@ -66,10 +68,10 @@ expath (char *name, int flag)
 
     if (*name == '/'
 	    || (flag == TFOLDER
-		&& (strncmp (name, CWD, NCWD)
+		&& (!has_prefix(name, CWD)
 		    && strcmp (name, DOT)
 		    && strcmp (name, DOTDOT)
-		    && strncmp (name, PWD, NPWD))))
+		    && !has_prefix(name, PWD))))
 	return mh_xstrdup(name);
 
     if (pwds == NULL)
@@ -81,20 +83,19 @@ expath (char *name, int flag)
     ep = pwds + strlen (pwds);
     if ((cp = strrchr(pwds, '/')) == NULL)
 	cp = ep;
-    else
-	if (cp == pwds)
-	    cp++;
+    else if (cp == pwds)
+        cp++;
 
-    if (strncmp (name, CWD, NCWD) == 0)
-	name += NCWD;
+    if (has_prefix(name, CWD))
+	name += LEN(CWD);
 
     if (strcmp (name, DOTDOT) == 0 || strcmp (name, PWD) == 0) {
 	snprintf (buffer, sizeof(buffer), "%.*s", (int)(cp - pwds), pwds);
 	return mh_xstrdup(buffer);
     }
 
-    if (strncmp (name, PWD, NPWD) == 0)
-	name += NPWD;
+    if (has_prefix(name, PWD))
+	name += LEN(PWD);
     else
 	cp = ep;
 
@@ -111,59 +112,60 @@ compath (char *f)
     if (*f != '/')
 	return;
 
-    for (cp = f; *cp;)
-	if (*cp == '/') {
-	    switch (*++cp) {
-		case 0: 
-		    if (--cp > f)
-			*cp = '\0';
-		    break;
-
-		case '/': 
-		    for (dp = cp; *dp == '/'; dp++)
-			continue;
-		    strcpy (cp--, dp);
-		    continue;
-
-		case '.': 
-		    if (strcmp (cp, DOT) == 0) {
-			if (cp > f + 1)
-			    cp--;
-			*cp = '\0';
-			break;
-		    }
-		    if (strcmp (cp, DOTDOT) == 0) {
-			for (cp -= 2; cp > f; cp--)
-			    if (*cp == '/')
-				break;
-			if (cp <= f)
-			    cp = f + 1;
-			*cp = '\0';
-			break;
-		    }
-		    if (strncmp (cp, PWD, NPWD) == 0) {
-			for (dp = cp - 2; dp > f; dp--)
-			    if (*dp == '/')
-				break;
-			if (dp <= f)
-			    dp = f;
-			strcpy (dp, cp + NPWD - 1);
-			cp = dp;
-			continue;
-		    }
-		    if (strncmp (cp, CWD, NCWD) == 0) {
-			strcpy (cp - 1, cp + NCWD - 1);
-			cp--;
-			continue;
-		    }
-		    continue;
-
-		default: 
-		    cp++;
-		    continue;
-	    }
-	    break;
-	}
-	else
+    for (cp = f; *cp;) {
+	if (*cp != '/') {
 	    cp++;
+            continue;
+        }
+
+        switch (*++cp) {
+            case 0: 
+                if (--cp > f)
+                    *cp = '\0';
+                return;
+
+            case '/': 
+                for (dp = cp; *dp == '/'; dp++)
+                    continue;
+                strcpy (cp--, dp);
+                continue;
+
+            case '.': 
+                if (strcmp (cp, DOT) == 0) {
+                    if (cp > f + 1)
+                        cp--;
+                    *cp = '\0';
+                    return;
+                }
+                if (strcmp (cp, DOTDOT) == 0) {
+                    for (cp -= 2; cp > f; cp--)
+                        if (*cp == '/')
+                            break;
+                    if (cp <= f)
+                        cp = f + 1;
+                    *cp = '\0';
+                    return;
+                }
+                if (has_prefix(cp, PWD)) {
+                    for (dp = cp - 2; dp > f; dp--)
+                        if (*dp == '/')
+                            break;
+                    if (dp <= f)
+                        dp = f;
+                    strcpy (dp, cp + LEN(PWD) - 1);
+                    cp = dp;
+                    continue;
+                }
+                if (has_prefix(cp, CWD)) {
+                    strcpy (cp - 1, cp + LEN(CWD) - 1);
+                    cp--;
+                    continue;
+                }
+                continue;
+
+            default: 
+                cp++;
+                continue;
+        }
+    }
 }