strindex.c: Move interface to own file.

[nmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index 7621aa52990fffc62adeed6116be441aafdee25b..a6568db8df52ec828bfb376f238d9e5a32dbb636 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -5,8 +5,12 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "ssequal.h"
+#include "getfolder.h"
+#include "path.h"
+#include "h/utils.h"
+#include "m_maildir.h"

 
 #define        CWD     "./"
 #define        DOT     "."
 
 #define        CWD     "./"
 #define        DOT     "."


@@ -21,26 +25,31 @@ static char *pwds;
 static char *expath(char *,int);
 static void compath(char *);
 
 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);
 }
 
 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 *
 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)
 {
 static char *
 expath (char *name, int flag)
 {


@@ -77,9 +86,8 @@ expath (char *name, int flag)
     ep = pwds + strlen (pwds);
     if ((cp = strrchr(pwds, '/')) == NULL)
        cp = ep;
     ep = pwds + strlen (pwds);
     if ((cp = strrchr(pwds, '/')) == NULL)
        cp = ep;

-    else
-       if (cp == pwds)
-           cp++;
+    else if (cp == pwds)
+        cp++;

 
     if (has_prefix(name, CWD))
        name += LEN(CWD);
 
     if (has_prefix(name, CWD))
        name += LEN(CWD);


@@ -107,59 +115,60 @@ compath (char *f)
     if (*f != '/')
        return;
 
     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 (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;
-           }
-           break;
-       }
-       else
+    for (cp = f; *cp;) {
+       if (*cp != '/') {

            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;
+        }
+    }

 }
 }