From e3a9a19d95016a10eb55afb083b73155cf0b6f69 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 7 Nov 2014 10:52:37 +0100 Subject: [PATCH] Make it possible to cleanPath() absolute Windows paths --- lib/private/files/filesystem.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index f5be7a0cc05..1ebc79086dd 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -695,13 +695,22 @@ class Filesystem { * @param bool $stripTrailingSlash * @return string */ - public static function normalizePath($path, $stripTrailingSlash = true) { + public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) { if ($path == '') { return '/'; } + //no windows style slashes $path = str_replace('\\', '/', $path); + // When normalizing an absolute path, we need to ensure that the drive-letter + // is still at the beginning on windows + $windows_drive_letter = ''; + if ($isAbsolutePath && \OC_Util::runningOnWindows() && preg_match('#^([a-zA-Z])$#', $path[0]) && $path[1] == ':' && $path[2] == '/') { + $windows_drive_letter = substr($path, 0, 2); + $path = substr($path, 2); + } + //add leading slash if ($path[0] !== '/') { $path = '/' . $path; @@ -730,7 +739,7 @@ class Filesystem { //normalize unicode if possible $path = \OC_Util::normalizeUnicode($path); - return $path; + return $windows_drive_letter . $path; } /** -- 2.39.5