- Fix for #48746, fix mounted volume and junctions when used from vista or later...

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index bb1e3299547be91a859abc5f38f5bc37ca980cc9..a2bcd78ffd17ae0e62a09fcf16f579c45bf4d26a 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -723,6 +723,11 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
                                        rname_off += 4;
                                        rname_len -= 4;
                                }
+                               if(reparsetarget[rname_off] == L'\\' && reparsetarget[rname_off + 1] == L'?' &&
+                                       reparsetarget[rname_off + 2] == L'?' && reparsetarget[rname_off + 3] == L'\\') {
+                                       rname_off += 4;
+                                       rname_len -= 4;
+                               }
                        }
 
                        /* Convert wide string to narrow string */