[ruby-cvs:56821] naruse:r49671 (ruby_2_2): merge revision(s) 49618, 49640: [Backport #10858]

naruse at ruby-lang.org naruse at ruby-lang.org
Sat Feb 21 12:47:37 JST 2015


naruse	2015-02-21 12:47:36 +0900 (Sat, 21 Feb 2015)

  New Revision: 49671

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49671

  Log:
    merge revision(s) 49618,49640: [Backport #10858]
    
    * win32/file.c (rb_file_expand_path_internal): do not make invalid
      (or ADS) path if the path has a drive letter, the result also
      should have be under it.  [ruby-core:68130] [Bug #10858]
    
    * win32/file.c (rb_file_expand_path_internal): neither the drive
      of base directory nor the current drive are involved in the
      result if different than the drive of path.
      [ruby-core:68130] [Bug #10858]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_file_exhaustive.rb
    branches/ruby_2_2/version.h
    branches/ruby_2_2/win32/file.c


More information about the ruby-cvs mailing list