Project

General

Profile

Backport #8070

Backport r39697

Added by luislavena (Luis Lavena) over 6 years ago. Updated over 6 years ago.

Status:
Closed
Priority:
Normal
[ruby-core:53284]

Description

Hello,

Please backport r39697 as it fixes a bug reported in #8034

Thank you


Files

backport-8034-ruby_1_9_3.diff (7.02 KB) backport-8034-ruby_1_9_3.diff luislavena (Luis Lavena), 03/14/2013 02:03 PM

Related issues

Related to Ruby master - Bug #8034: File.expand_path('something', '~') do not include home pathClosed03/06/2013Actions

Associated revisions

Revision 80961598
Added by usa (Usaku NAKAMURA) over 6 years ago

merge revision(s) 39697,39701,39716,39740,39751: [Backport #8070]

    * win32/file.c (rb_file_expand_path_internal):  Expand home directory when
      used as second parameter (dir_string).  [ruby-core:53168] [Bug #8034]

    * test/ruby/test_file_exhaustive.rb: add test to verify.

    * win32/file.c (get_user_from_path):  add internal function that retrieves
      username from supplied path (refactored).

    * win32/file.c (rb_file_expand_path_internal):  refactor expansion of user
      home to use get_user_from_path and cover dir_string corner cases.
      [ruby-core:53168] [Bug #8034]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Revision 39982
Added by usa (Usaku NAKAMURA) over 6 years ago

merge revision(s) 39697,39701,39716,39740,39751: [Backport #8070]

* win32/file.c (rb_file_expand_path_internal):  Expand home directory when
  used as second parameter (dir_string).  [ruby-core:53168] [Bug #8034]

* test/ruby/test_file_exhaustive.rb: add test to verify.

* win32/file.c (get_user_from_path):  add internal function that retrieves
  username from supplied path (refactored).

* win32/file.c (rb_file_expand_path_internal):  refactor expansion of user
  home to use get_user_from_path and cover dir_string corner cases.
  [ruby-core:53168] [Bug #8034]

History

Updated by luislavena (Luis Lavena) over 6 years ago

Hello,

As pointed out by nobu, the original revision might not be enough.

The final list of revisions required are:

r39697
r39701
r39716
r39740
r39751

To simply the process I have attached a patch with the revisions combined.

Thank you.

#2

Updated by usa (Usaku NAKAMURA) over 6 years ago

  • Status changed from Assigned to Closed
  • % Done changed from 0 to 100

This issue was solved with changeset r39982.
Luis, thank you for reporting this issue.
Your contribution to Ruby is greatly appreciated.
May Ruby be with you.


merge revision(s) 39697,39701,39716,39740,39751: [Backport #8070]

* win32/file.c (rb_file_expand_path_internal):  Expand home directory when
  used as second parameter (dir_string).  [ruby-core:53168] [Bug #8034]

* test/ruby/test_file_exhaustive.rb: add test to verify.

* win32/file.c (get_user_from_path):  add internal function that retrieves
  username from supplied path (refactored).

* win32/file.c (rb_file_expand_path_internal):  refactor expansion of user
  home to use get_user_from_path and cover dir_string corner cases.
  [ruby-core:53168] [Bug #8034]

Also available in: Atom PDF