Windows: Fix Parent(path) computation to permit mp and symlink creation

The parent path computation was leaving trailing slashes on the
path names which prevented the creation of mount points and symlinks
when UNC paths were used that contained mount points.

LICENSE MIT

Change-Id: I50cba9cb8a2b0ad45f84995d05f368052be683cc
Reviewed-on: http://gerrit.openafs.org/2886
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Rod Widdowson <rdw@steadingsoftware.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c
index c4a7edaac277202a757708e1a67db9c4b76a1bd0..892d0348d22a97e76b00408132ea960758f68e88 100644 (file)
--- a/src/WINNT/afsd/fs.c
+++ b/src/WINNT/afsd/fs.c
@@ -293,7 +293,12 @@ Parent(char *apath)
     }
     tp = strrchr(tspace, '\\');
     if (tp) {
-       *(tp+1) = 0;    /* lv trailing slash so Parent("k:\foo") is "k:\" not "k:" */
+        if (tp - tspace > 2 &&
+            tspace[1] == ':' &&
+            &tspace[2] == tp)
+           *(tp+1) = 0;        /* lv trailing slash so Parent("k:\foo") is "k:\" not "k:" */
+        else
+            *tp = 0;
     }
     else {
        fs_ExtractDriveLetter(apath, tspace);

diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c
index 43f0bf7ed1a467a0c68eb4764d12f532e4a88f42..50b47e63ca31af5daa11a4095014854bf0080160 100644 (file)
--- a/src/WINNT/afsd/symlink.c
+++ b/src/WINNT/afsd/symlink.c
@@ -256,13 +256,18 @@ static BOOL IsAdmin (void)
 }
 
 /* return a static pointer to a buffer */
-static char *Parent(apath)
-char *apath; {
+static char *Parent(char *apath)
+{
     char *tp;
     strcpy(tspace, apath);
     tp = strrchr(tspace, '\\');
     if (tp) {
-       *(tp+1) = 0;    /* lv trailing slash so Parent("k:\foo") is "k:\" not "k:" */
+        if (tp - tspace > 2 &&
+            tspace[1] == ':' &&
+            &tspace[2] == tp)
+           *(tp+1) = 0;        /* lv trailing slash so Parent("k:\foo") is "k:\" not "k:" */
+        else
+            *tp = 0;
     }
     else {
        fs_ExtractDriveLetter(apath, tspace);