pathcanon: remove 'flags' argument

This function was only ever called with `0` as `flags`, which disables a lot of
its logic. We can reduce the amount of ongoing code to maintain by paring this
back to just the core in use.

diff --git a/lib/ast/ast.h b/lib/ast/ast.h
index c6595850a0ae0cbdac05a1ce20c778ef59e1e673..02f0a85223edd4cb333c2a6f8762481b5f21e52c 100644 (file)
--- a/lib/ast/ast.h
+++ b/lib/ast/ast.h
@@ -22,11 +22,6 @@ extern "C" {
 #define PATH_MAX    1024
 #endif
 
-#define PATH_PHYSICAL   01
-#define PATH_DOTDOT 02
-#define PATH_EXISTS 04
-#define PATH_VERIFIED(n) (((n)&01777)<<5)
-
 #define PATH_REGULAR    010
 #define PATH_EXECUTE      001
 #define PATH_READ 004

diff --git a/lib/ast/pathaccess.c b/lib/ast/pathaccess.c
index c7c63dd48add482c8cda2f2b456f5230e5e8688b..5e1f64c5263a9ba8576aa32188660bc0642bda8b 100644 (file)
--- a/lib/ast/pathaccess.c
+++ b/lib/ast/pathaccess.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-char *pathcanon(char *path, int flags);
+char *pathcanon(char *path);
 
 char *pathaccess(char *path, const char *dirs,
                 const char *a, const char *b, int mode)
@@ -57,7 +57,7 @@ char *pathaccess(char *path, const char *dirs,
     }
     do {
        dirs = pathcat(path, dirs, sep, a, b);
-       pathcanon(path, 0);
+       pathcanon(path);
        if (!access(path, m)) {
            if ((mode & PATH_REGULAR)
                && (stat(path, &st) || S_ISDIR(st.st_mode)))

diff --git a/lib/ast/pathcanon.c b/lib/ast/pathcanon.c
index d75568fdd290257fb2a3ac8558d862c7e2200c27..2a5334cdb898b9b9d7a49714f82ef7c23141858b 100644 (file)
--- a/lib/ast/pathcanon.c
+++ b/lib/ast/pathcanon.c
@@ -19,34 +19,18 @@
  *     move ..'s to the front
  *     /.. preserved (for pdu and newcastle hacks)
  *     FS_3D handles ...
- *     if (flags&PATH_PHYSICAL) then symlinks resolved at each component
- *     if (flags&PATH_DOTDOT) then each .. checked for access
- *     if (flags&PATH_EXISTS) then path must exist at each component
- *     if (flags&PATH_VERIFIED(n)) then first n chars of path exist
- * 
- * longer pathname possible if (flags&PATH_PHYSICAL) or FS_3D ... involved
- * 0 returned on error and if (flags&(PATH_DOTDOT|PATH_EXISTS)) then path
- * will contain the components following the failure point
  */
 
 #include <ast/ast.h>
 #include <errno.h>
 #include <ast/error.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdint.h>
-#include <string.h>
 
-char *pathcanon(char *path, int flags)
-{
-    char *p;
+char *pathcanon(char *path) {
     char *r;
     char *s;
     char *t;
     int dots;
     char *phys;
-    char *v;
-    char* e = path + PATH_MAX;
     int loop;
     int oerrno;
 #if defined(FS_3D)
@@ -56,12 +40,12 @@ char *pathcanon(char *path, int flags)
     oerrno = errno;
     dots = loop = 0;
     phys = path;
-    v = path + ((flags >> 5) & 01777);
+    (void)phys;
     if (*path == '/' && *(path + 1) == '/')
        do
            path++;
        while (*path == '/' && *(path + 1) == '/');
-    p = r = s = t = path;
+    r = s = t = path;
     for (;;)
        switch (*t++ = *s++) {
        case '.':
@@ -77,17 +61,6 @@ char *pathcanon(char *path, int flags)
                t -= 2;
                break;
            case 2:
-               if ((flags & (PATH_DOTDOT | PATH_EXISTS)) == PATH_DOTDOT
-                   && (t - 2) >= v) {
-                   struct stat st;
-
-                   *(t - 2) = 0;
-                   if (stat(phys, &st)) {
-                       strcpy(path, s);
-                       return 0;
-                   }
-                   *(t - 2) = '.';
-               }
                if (t - 5 < r) {
                    if (t - 4 == r)
                        t = r + 1;
@@ -113,7 +86,7 @@ char *pathcanon(char *path, int flags)
                        r = path;
                        if (t == r + 1)
                            x = r;
-                       v = s = t = x;
+                       s = t = x;
                    } else {
                        *t = c;
                        t = o;
@@ -124,49 +97,8 @@ char *pathcanon(char *path, int flags)
 #endif
                break;
            default:
-               if ((flags & PATH_PHYSICAL) && loop < 32 && (t - 1) > path) {
-                   char buf[PATH_MAX];
-
-                   char c = *(t - 1);
-                   *(t - 1) = '\0';
-                   size_t len = pathgetlink(phys, buf, sizeof(buf));
-                   *(t - 1) = c;
-                   if (len != SIZE_MAX && len > 0) {
-                       if ((t + len + 1) >= e) { /* make sure path fits in buf */
-                           strcpy(path, s);
-                            return 0;
-                       }
-                       loop++;
-                       strcpy(buf + len, s - (*s != 0));
-                       if (*buf == '/')
-                           p = r = path;
-                       v = s = t = p;
-                       strcpy(p, buf);
-                   } else if (len == SIZE_MAX && errno == ENOENT) {
-                       if (flags & PATH_EXISTS) {
-                           strcpy(path, s);
-                           return 0;
-                       }
-                       flags &= ~(PATH_PHYSICAL | PATH_DOTDOT);
-                   }
-                   dots = 4;
-               }
                break;
            }
-           if (dots >= 4 && (flags & PATH_EXISTS) && (t - 1) >= v
-               && (t > path + 1
-                   || (t > path && *(t - 1) && *(t - 1) != '/'))) {
-               struct stat st;
-
-               *(t - 1) = 0;
-               if (stat(phys, &st)) {
-                   strcpy(path, s);
-                   return 0;
-               }
-               v = t;
-               if (*s)
-                   *(t - 1) = '/';
-           }
            if (!*s) {
                if (t > path && !*(t - 1))
                    t--;
@@ -180,7 +112,6 @@ char *pathcanon(char *path, int flags)
                return t;
            }
            dots = 0;
-           p = t;
            break;
        default:
            dots = 4;