rel_path_for vol was not working for files because of chdir

diff --git a/bin/ad/ad_util.c b/bin/ad/ad_util.c
index 08904b3150fd0f96a47df2d567a39492237bcba2..24bee8ad8761530d5f87a75f04c90c3ee296b885 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>
@@ -200,12 +201,14 @@ static bstring rel_path_in_vol(const char *path, const char *volpath)
     EC_INIT;
     int cwd = -1;
     bstring fpath = NULL;
+    char *dname = NULL;
 
     if (path == NULL || volpath == NULL)
         return NULL;
 
     EC_NEG1_LOG(cwd = open(".", O_RDONLY));
-    EC_ZERO_LOGSTR(chdir(path), "chdir(%s): %s", path, strerror(errno));
+    EC_NULL_LOG(dname = strdup(path));
+    EC_ZERO_LOGSTR(chdir(dirname(dname)), "chdir(%s): %s", dirname, strerror(errno));
     EC_NULL(fpath = bfromcstr(getcwdpath()));
     BSTRING_STRIP_SLASH(fpath);
 
@@ -218,6 +221,7 @@ static bstring rel_path_in_vol(const char *path, const char *volpath)
     EC_ZERO(bdelete(fpath, 0, strlen(volpath)));
 
 EC_CLEANUP:
+    if (dname) free(dname);
     if (cwd != -1)
         fchdir(cwd);
     if (ret != 0)