From: nobu@... Date: 2014-03-18T07:56:18+00:00 Subject: [ruby-core:61573] [ruby-trunk - Bug #9618] Pathname#cleanpath creates mixed path separators Issue #9618 has been updated by Nobuyoshi Nakada. pathname.rb: separators * ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all separators File::SEPARATOR from File::ALT_SEPARATOR. [ruby-core:61402] [Bug #9618] * ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto. Modified ext/pathname/lib/pathname.rb diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 20c92e2..e64432e 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -113,6 +113,7 @@ class Pathname end end end + pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR if /#{SEPARATOR_PAT}/o =~ File.basename(pre) names.shift while names[0] == '..' end @@ -161,6 +162,7 @@ class Pathname pre, base = r names.unshift base if base != '.' end + pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR if /#{SEPARATOR_PAT}/o =~ File.basename(pre) names.shift while names[0] == '..' end Modified test/pathname/test_pathname.rb diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index ed79b5b..a74dad1 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -88,6 +88,10 @@ class TestPathname < Test::Unit::TestCase defassert(:cleanpath_aggressive, '/', '///a/../..') end + if DOSISH + defassert(:cleanpath_aggressive, 'c:/foo/bar', 'c:\\foo\\bar') + end + def cleanpath_conservative(path) Pathname.new(path).cleanpath(true).to_s end @@ -124,6 +128,10 @@ class TestPathname < Test::Unit::TestCase defassert(:cleanpath_conservative, '/a', '/../.././../a') defassert(:cleanpath_conservative, 'a/b/../../../../c/../d', 'a/b/../../../../c/../d') + if DOSISH + defassert(:cleanpath_conservative, 'c:/foo/bar', 'c:\\foo\\bar') + end + if DOSISH_UNC defassert(:cleanpath_conservative, '//', '//') else ~~~ ---------------------------------------- Bug #9618: Pathname#cleanpath creates mixed path separators https://bugs.ruby-lang.org/issues/9618#change-45858 * Author: Daniel Rikowski * Status: Open * Priority: Low * Assignee: cruby-windows * Category: platform/windows * Target version: * ruby -v: ruby 2.0.0p451 (2014-02-24) [i386-mingw32] * Backport: 1.9.3: UNKNOWN, 2.0.0: UNKNOWN, 2.1: UNKNOWN ---------------------------------------- When using `Pathname#cleanpath` with a Windows path the resulting path contains a mixture of slashes and backslashes. ~~~ require 'pathname' path = Pathname.new('c:\projects\ruby\bug\test.rb') path.to_s # => "c:\\projects\\ruby\\bug\\test.rb" path.cleanpath.to_s # => "c:\\projects/ruby/bug/test.rb" ~~~ I'd expect `cleanpath` to use the same path separator for all path segments. The problem doesn't happen on non-Windows platforms because there backslashes are not detected as path separators. The problem is that the first path segment is added verbatim and only subsequent segments are joined by `File::join`. Personally I'd prefer it to use `File::SEPARATOR` **only**, regardless of any original separator(s). That way it would blend with the current 'normalizing' behaviour of `cleanpath`, which then could be also used to normalize any existing separator weirdness and - for example - make a path compatible with `Dir.glob` (which can't use backslashes) -- https://bugs.ruby-lang.org/