Merge branch-2-1

[netatalk.git] / bin / ad / ad_util.c

diff --git a/bin/ad/ad_util.c b/bin/ad/ad_util.c
index d4d7ab12189d50a800e1397c103ad82b8531daac..8ed6585748c55e6494416588405194011c21e7c7 100644 (file)
--- a/bin/ad/ad_util.c
+++ b/bin/ad/ad_util.c
@@ -47,6 +47,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
+#include <libgen.h>
 
 #include <atalk/util.h>
 #include <atalk/cnid.h>
@@ -198,24 +199,44 @@ char *utompath(const struct volinfo *volinfo, const char *upath)
 static bstring rel_path_in_vol(const char *path, const char *volpath)
 {
     EC_INIT;
+    int cwd = -1;
+    bstring fpath = NULL;
+    char *dname = NULL;
+    struct stat st;
 
     if (path == NULL || volpath == NULL)
         return NULL;
 
-    bstring fpath = NULL;
+    EC_NEG1_LOG(cwd = open(".", O_RDONLY));
+
+    EC_ZERO_LOGSTR(lstat(path, &st), "lstat(%s): %s", path, strerror(errno));
+    switch (S_IFMT & st.st_mode) {
 
-    /* Make path absolute by concetanating for case (a) */
-    if (path[0] != '/') {
+    case S_IFREG:
+    case S_IFLNK:
+        EC_NULL_LOG(dname = strdup(path));
+        EC_ZERO_LOGSTR(chdir(dirname(dname)), "chdir(%s): %s", dirname, strerror(errno));
+        free(dname);
+        dname = NULL;
         EC_NULL(fpath = bfromcstr(getcwdpath()));
-        if (bchar(fpath, blength(fpath) - 1) != '/')
-            EC_ZERO(bcatcstr(fpath, "/"));
-        EC_ZERO(bcatcstr(fpath, path));
-        BSTRING_STRIP_SLASH(fpath);
-    } else {
-        EC_NULL(fpath = bfromcstr(path));
         BSTRING_STRIP_SLASH(fpath);
+        EC_ZERO(bcatcstr(fpath, "/"));
+        EC_NULL_LOG(dname = strdup(path));
+        EC_ZERO(bcatcstr(fpath, basename(dname)));
+        break;
+
+    case S_IFDIR:
+        EC_ZERO_LOGSTR(chdir(path), "chdir(%s): %s", path, strerror(errno));
+        EC_NULL(fpath = bfromcstr(getcwdpath()));
+        break;
+
+    default:
+        SLOG("special: %s", path);
+        EC_FAIL;
     }
 
+    BSTRING_STRIP_SLASH(fpath);
+
     /*
      * Now we have eg:
      *   fpath:   /Volume/netatalk/dir/bla
@@ -223,11 +244,16 @@ static bstring rel_path_in_vol(const char *path, const char *volpath)
      * we want: "dir/bla"
      */
     EC_ZERO(bdelete(fpath, 0, strlen(volpath)));
-    return fpath;
 
 EC_CLEANUP:
-    bdestroy(fpath);
-    return NULL;
+    if (dname) free(dname);
+    if (cwd != -1) {
+        fchdir(cwd);
+        close(cwd);
+    }
+    if (ret != 0)
+        return NULL;
+    return fpath;
 }
 
 /*!
@@ -292,12 +318,8 @@ int convert_dots_encoding(const afpvol_t *svol, const afpvol_t *dvol, char *path
  * (b) absolute:
  *     "/afp_volume/dir/subdir"
  *
- * 1) start recursive CNID search with
- *    a) DID:2 / "topdir"
- *    b) DID:2 / "dir"
- * 2) ...until we have the CNID for
- *    a) "/afp_volume/topdir/dir"
- *    b) "/afp_volume/dir" (no recursion required)
+ * path MUST be pointing inside vol, this is usually the case as vol has been build from
+ * path using loadvolinfo and friends.
  *
  * @param vol  (r) pointer to afpvol_t
  * @param path (r) path, see above
@@ -317,26 +339,30 @@ cnid_t cnid_for_path(const afpvol_t *vol,
     struct bstrList *l = NULL;
     struct stat st;
 
-    cnid = *did = htonl(2);
+    *did = htonl(1);
+    cnid = htonl(2);
 
     EC_NULL(rpath = rel_path_in_vol(path, vol->volinfo.v_path));
     EC_NULL(statpath = bfromcstr(vol->volinfo.v_path));
 
     l = bsplit(rpath, '/');
-    for(int i = 0; i < l->qty ; i++) {
+    for (int i = 0; i < l->qty ; i++) {
         *did = cnid;
         EC_ZERO(bconcat(statpath, l->entry[i]));
-        EC_ZERO_LOG(stat(cfrombstr(statpath), &st));
+        EC_ZERO_LOGSTR(lstat(cfrombstr(statpath), &st),
+                       "lstat(rpath: %s, elem: %s): %s: %s",
+                       cfrombstr(rpath), cfrombstr(l->entry[i]),
+                       cfrombstr(statpath), strerror(errno));
 
-        cnid = cnid_add(vol->volume.v_cdb,
+        if ((cnid = cnid_add(vol->volume.v_cdb,
                         &st,
                         *did,
                         cfrombstr(l->entry[i]),
                         blength(l->entry[i]),
-                        0);
-
-        EC_ZERO(bcatcstr(statpath, "/"));
-        
+                             0)) == CNID_INVALID) {
+            EC_FAIL;
+        }
+        EC_ZERO(bcatcstr(statpath, "/"));        
     }
 
 EC_CLEANUP:
@@ -349,4 +375,72 @@ EC_CLEANUP:
     return cnid;
 }
 
+/*!
+ * Resolves CNID of a given paths parent directory
+ *
+ * path might be:
+ * (a) relative:
+ *     "dir/subdir" with cwd: "/afp_volume/topdir"
+ * (b) absolute:
+ *     "/afp_volume/dir/subdir"
+ *
+ * path MUST be pointing inside vol, this is usually the case as vol has been build from
+ * path using loadvolinfo and friends.
+ *
+ * @param vol  (r) pointer to afpvol_t
+ * @param path (r) path, see above
+ * @param did  (rw) parent CNID of returned CNID
+ *
+ * @returns CNID of path
+ */
+cnid_t cnid_for_paths_parent(const afpvol_t *vol,
+                             const char *path,
+                             cnid_t *did)
+{
+    EC_INIT;
+
+    cnid_t cnid;
+    bstring rpath = NULL;
+    bstring statpath = NULL;
+    struct bstrList *l = NULL;
+    struct stat st;
+
+    *did = htonl(1);
+    cnid = htonl(2);
+
+    EC_NULL(rpath = rel_path_in_vol(path, vol->volinfo.v_path));
+    EC_NULL(statpath = bfromcstr(vol->volinfo.v_path));
+
+    l = bsplit(rpath, '/');
+    if (l->qty == 1)
+        /* only one path element, means parent dir cnid is volume root = 2 */
+        goto EC_CLEANUP;
+    for (int i = 0; i < (l->qty - 1); i++) {
+        *did = cnid;
+        EC_ZERO(bconcat(statpath, l->entry[i]));
+        EC_ZERO_LOGSTR(lstat(cfrombstr(statpath), &st),
+                       "lstat(rpath: %s, elem: %s): %s: %s",
+                       cfrombstr(rpath), cfrombstr(l->entry[i]),
+                       cfrombstr(statpath), strerror(errno));
+
+        if ((cnid = cnid_add(vol->volume.v_cdb,
+                        &st,
+                        *did,
+                        cfrombstr(l->entry[i]),
+                        blength(l->entry[i]),
+                             0)) == CNID_INVALID) {
+            EC_FAIL;
+        }
+        EC_ZERO(bcatcstr(statpath, "/"));        
+    }
+
+EC_CLEANUP:
+    bdestroy(rpath);
+    bstrListDestroy(l);
+    bdestroy(statpath);
+    if (ret != 0)
+        return CNID_INVALID;
+
+    return cnid;
+}