don't change of directory anymore

[src/app-framework-main.git] / src / wgt.c

diff --git a/src/wgt.c b/src/wgt.c
index 9c3cd6e..980719b 100644 (file)
--- a/src/wgt.c
+++ b/src/wgt.c
@@ -36,6 +36,7 @@ struct wgt {
        char **locales;
 };
 
+/* a valid subpath is a relative path not looking deeper than root using .. */
 static int validsubpath(const char *subpath)
 {
        int l = 0, i = 0;
@@ -63,7 +64,8 @@ static int validsubpath(const char *subpath)
                default:
                        while(subpath[i] && subpath[i] != '/')
                                i++;
-                       l++;
+                       if (l >= 0)
+                               l++;
                case '/':
                        break;
                }
@@ -130,12 +132,10 @@ int wgt_connectat(struct wgt *wgt, int dirfd, const char *pathname)
 
        assert(wgt);
 
-       rfd = dirfd;
-       if (pathname) {
-               rfd = openat(rfd, pathname, O_PATH|O_DIRECTORY);
-               if (rfd < 0)
-                       return rfd;
-       }
+       rfd = (pathname && *pathname) ? openat(dirfd, pathname, O_PATH|O_DIRECTORY) : dup(dirfd);
+       if (rfd < 0)
+               return rfd;
+
        if (wgt->rootfd >= 0)
                close(wgt->rootfd);
        wgt->rootfd = rfd;
@@ -147,6 +147,18 @@ int wgt_connect(struct wgt *wgt, const char *pathname)
        return wgt_connectat(wgt, AT_FDCWD, pathname);
 }
 
+struct wgt *wgt_createat(int dirfd, const char *pathname)
+{
+       struct wgt *wgt = wgt_create();
+       if (wgt) {
+               if (wgt_connectat(wgt, dirfd, pathname)) {
+                       wgt_unref(wgt);
+                       wgt = NULL;
+               }
+       }
+       return wgt;
+}
+
 int wgt_is_connected(struct wgt *wgt)
 {
        assert(wgt);
@@ -293,3 +305,27 @@ int wgt_locales_open_read(struct wgt *wgt, const char *filename)
 }
 
 
+#if defined(TEST_wgt_validsubpath)
+#include <stdio.h>
+void t(const char *subpath, int validity) {
+  printf("%s -> %d = %d, %s\n", subpath, validity, validsubpath(subpath), validsubpath(subpath)==validity ? "ok" : "NOT OK");
+}
+int main() {
+  t("/",0);
+  t("..",0);
+  t(".",1);
+  t("../a",0);
+  t("a/..",1);
+  t("a/../////..",0);
+  t("a/../b/..",1);
+  t("a/b/c/..",1);
+  t("a/b/c/../..",1);
+  t("a/b/c/../../..",1);
+  t("a/b/c/../../../.",1);
+  t("./..a/././..b/..c/./.././.././../.",1);
+  t("./..a/././..b/..c/./.././.././.././..",0);
+  t("./..a//.//./..b/..c/./.././/./././///.././.././a/a/a/a/a",1);
+  return 0;
+}
+#endif
+