pajoye                                   Thu, 27 Aug 2009 09:39:01 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287800

Log:
- Fix for #48746, fix mounted volume and junctions when used from vista or 
later, they are actually prepended with \??\

Bug: http://bugs.php.net/48746 (Assigned) Unable to browse directories within 
Junction Points
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
    U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c

Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2009-08-27 
08:50:07 UTC (rev 287799)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2009-08-27 
09:39:01 UTC (rev 287800)
@@ -723,6 +723,11 @@
                                        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 */

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2009-08-27 08:50:07 UTC (rev 
287799)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2009-08-27 09:39:01 UTC (rev 
287800)
@@ -723,6 +723,11 @@
                                        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 */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to