win32-xpath 1.0.3 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 685daea6a90d6d67f915aeb1595dd45fc636701b
-  data.tar.gz: 7af2b9489ed6e8cd5d97003f95633a9b48b53ee1
+SHA256:
+  metadata.gz: 8f386aff8075f1869d7b1d5931145726e2f741a192c96a8ecb214adb95e57775
+  data.tar.gz: 5964f619e3c44bfcd183a9b9368dad576dc72ae5dba21b566fe372a9645d7a12
 SHA512:
-  metadata.gz: 63dbc8982a5433a9a9a2c409817f46c91fe9f80165d36d70a096be99a0539bc7b563e480c179db8498fa895e615b96ac4e57b742fb72e591ea56def8d03a7091
-  data.tar.gz: 5b5b8e65792411768a15b7804043b8f3e42f6f8e06c2e885edeb06f34d807c633cd146ba1f95f2ffc16f74f33e68f3e1bb7991c90351997fd2133dd804d7cb40
+  metadata.gz: 62429d580dafba1c74a90ba822365738ecadc6f00d231cb31e2a1665a955eb249dbe355914cce275613f3724aeba45aa11371470fc59b03b358a17defb20b6b6
+  data.tar.gz: f2d0ee1f647ea21b18854d19a1490dbf51e0335fd25925d4c08c4f6a21240c7a9ee400123a4cf554131cf154350d2f517440e9adc6801c72be886500e268bd41

data/CHANGES.md

@@ -0,0 +1,37 @@
+## 1.1.2 - 8-Aug-2021
+* The relative path directory argument now accepts anything that responds
+  to the to_path method.
+* Now skips taint checking tests on Ruby 2.7+
+* Added a .gitignore file.
+
+## 1.1.1 - 3-Mar-2019
+* Switched RSTRING_PTR to StringValueCStr internally because apparently I
+  I didn't get the memo on null termination changes.
+* Fixed a warning caused by rb_funcall by switching it to rb_funcall2.
+* Fixed a bug where it would try to expand tildes for paths in 8.3 format.
+  Now tildes are only expanded if they are the first character in the path.
+* Updated the cert.
+* Updated the appveyor file to include Ruby 2.3, 2.4 and 2.5.
+* Added a win32-xpath.rb file for convenience.
+
+## 1.1.0 - 11-Jun-2016
+* Changed license to Apache 2.0.
+* Use PathCchXXX functions wherever I could that had not already been
+  put into place.
+* Removed the "futzing" directory and contents.
+* Added an appveyor.yml file.
+
+## 1.0.4 - 26-Nov-2015
+* This gem is now signed.
+
+## 1.0.3 - 3-Jul-2015
+* Use PathCchXXX functions where available to improve long path handling.
+
+## 1.0.2 - 17-Jun-2015
+* Deal with non-standard swprintf issues so that it works with mingw compiler.
+
+## 1.0.1 - 2-Apr-2015
+* Altered internal handling of native C function failures.
+
+## 1.0.0 - 26-Feb-2015
+* Initial release

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org' do
+  gemspec
+end

data/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/MANIFEST.md

@@ -0,0 +1,14 @@
+* appveyor.yml
+* bench/bench_win32_xpath.rb
+* CHANGES.md
+* certs/djberg96_pub.pem
+* ext/extconf.rb
+* ext/win32/xpath.c
+* Gemfile
+* lib/win32-xpath.rb
+* LICENSE
+* MANIFEST.md
+* Rakefile
+* README.md
+* test/test_win32_xpath.rb
+* win32-xpath.gemspec

data/README.md

@@ -0,0 +1,64 @@
+## Description
+A custom `File.expand_path` method for Ruby on Windows that's much faster and works better.
+
+## Installation
+`gem install win32-xpath`
+
+## Synopsis
+```ruby
+require 'win32/xpath'
+
+# That's it, you are now using this library when you call File.expand_path
+```
+
+## Features
+* A 5x average performance boost over MRI's current method.
+* Support for ~user expansion.
+
+## Known Issues
+* This library does not support drive-current paths for the 2nd argument.
+* This library does not support alt-stream name autocorrection.
+* This library does not convert short paths to long paths.
+
+It is very unlikely you will ever be affected by any of these things.
+Drive-current paths are a relic of DOS 1.0, but even so this library
+will handle them in the first argument.
+
+I don't support alt-stream mangling because I don't believe it's the
+job of this method to peform autocorrection. Even in MRI it only works
+for the default $DATA stream, and then only for a certain type of
+syntax error. I do not know when or why it was added.
+
+Failure to convert short paths to long paths is irrelevant since that
+has nothing to do with relative versus absolute paths.
+
+One possible "real" issue is that on Windows 7 or earlier you will be
+limited to 260 character paths. This is a limitation of the shlwapi.h
+functions that I use internally.
+
+If you discover any other issues, please report them on the project
+page at https://github.com/djberg96/win32-xpath.
+
+## Mingw and Devkit
+Make sure you have a recent version of the Devkit installed if you're
+using the one-click installer. If you see this warning then you need
+to upgrade your Devkit.
+
+`"implicit declaration of function 'ConvertSidToStringSidW'"`
+
+## Acknowledgements
+Park Heesob for encoding advice and help.
+
+## License
+Apache-2.0
+
+## Copyright
+(C) 2003-2019 Daniel J. Berger, All Rights Reserved
+    
+## Warranty
+This package is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantability and fitness for a particular purpose.
+
+## Author
+Daniel Berger

data/Rakefile

@@ -7,6 +7,7 @@ include RbConfig
 CLEAN.include(
   '**/*.gem',               # Gem files
   '**/*.rbc',               # Rubinius
+  '**/*.lock',              # Bundler
   '**/*.o',                 # C object file
   '**/*.log',               # Ruby extension build log
   '**/Makefile',            # C Makefile
@@ -35,8 +36,9 @@ namespace :gem do
   desc "Build the win32-xpath gem"
   task :create => [:clean] do
     require 'rubygems/package'
-    spec = eval(IO.read('win32-xpath.gemspec'))
-    Gem::Package.build(spec)
+    spec = Gem::Specification.load('win32-xpath.gemspec')
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+    Gem::Package.build(spec, true)
   end
 
   task "Install the win32-xpath gem"

data/appveyor.yml

@@ -0,0 +1,36 @@
+version: '{build}'
+branches:
+  only:
+  - master
+  - appveyor
+skip_tags: true
+environment:
+  matrix:
+  - ruby_version: 22-x64
+    ruby_dir: 2.2.0
+  - ruby_version: 23-x64
+    ruby_dir: 2.3.0
+  - ruby_version: 24-x64
+    ruby_dir: 2.4.0
+  - ruby_version: 25-x64
+    ruby_dir: 2.5.0
+install:
+- ps: >-
+    $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
+
+    $tpath = "C:\Ruby" + $env:ruby_version + "\lib\ruby\" + $env:ruby_dir + "\test"
+
+    if ((test-path $tpath) -eq $True){ rm -recurse -force $tpath }
+
+    gem update --system > $null
+
+    if ((gem query -i test-unit -v ">= 3.0") -eq $False){ gem install test-unit --no-document }
+cache:
+- C:\Ruby22-x64\lib\ruby\gems\2.2.0
+- C:\Ruby23-x64\lib\ruby\gems\2.3.0
+- C:\Ruby24-x64\lib\ruby\gems\2.4.0
+- C:\Ruby25-x64\lib\ruby\gems\2.5.0
+build: off
+test_script:
+- cmd: rake
+deploy: off

data/bench/bench_win32_xpath.rb

@@ -1,6 +1,6 @@
 require 'benchmark'
 
-MAX = 100000
+MAX = 200000
 puts "\nOld File.expand_path"
 
 Benchmark.bm(30) do |x|

data/certs/djberg96_pub.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+/3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+-----END CERTIFICATE-----

data/ext/win32/xpath.c

@@ -10,9 +10,10 @@
 
 #ifdef HAVE_PATHCCH_H
 #include <pathcch.h>
-#endif
-
+#define MAX_WPATH PATHCCH_MAX_CCH
+#else
 #define MAX_WPATH MAX_PATH * sizeof(wchar_t)
+#endif
 
 // Equivalent to raise SystemCallError.new(string, errnum)
 void rb_raise_syserr(const char* msg, DWORD errnum){
@@ -119,6 +120,9 @@ wchar_t* expand_tilde(){
     wchar_t* temp;
     const wchar_t* env2 = L"HOMEPATH";
     env = L"HOMEDRIVE";
+#ifdef HAVE_PATHCCH_H
+    HRESULT hr;
+#endif
 
     // If neither are found then raise an error
     size =  GetEnvironmentVariableW(env, NULL, 0);
@@ -140,8 +144,20 @@ wchar_t* expand_tilde(){
       rb_raise_syserr("GetEnvironmentVariable", GetLastError());
     }
 
-    if(!PathAppendW(home, temp))
+#ifdef HAVE_PATHCCH_H
+    hr = PathCchAppendEx(home, MAX_WPATH, temp, 1);
+    if(hr != S_OK){
+      ruby_xfree(home);
+      ruby_xfree(temp);
+      rb_raise_syserr("PathCchAppendEx", hr);
+    }
+#else
+    if(!PathAppendW(home, temp)){
+      ruby_xfree(home);
+      ruby_xfree(temp);
       rb_raise_syserr("PathAppend", GetLastError());
+    }
+#endif
   }
   else{
     home = (wchar_t*)ruby_xmalloc(MAX_WPATH);
@@ -185,12 +201,16 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   rb_scan_args(argc, argv, "11", &v_path_orig, &v_dir_orig);
 
   if (rb_respond_to(v_path_orig, rb_intern("to_path")))
-    v_path_orig = rb_funcall(v_path_orig, rb_intern("to_path"), 0, NULL);
+    v_path_orig = rb_funcall2(v_path_orig, rb_intern("to_path"), 0, NULL);
 
   SafeStringValue(v_path_orig);
 
-  if (!NIL_P(v_dir_orig))
+  if (!NIL_P(v_dir_orig)){
+    if (rb_respond_to(v_dir_orig, rb_intern("to_path")))
+      v_dir_orig = rb_funcall2(v_dir_orig, rb_intern("to_path"), 0, NULL);
+
     SafeStringValue(v_dir_orig);
+  }
 
   // Dup and prep string for modification
   path_encoding = rb_enc_get(v_path_orig);
@@ -204,13 +224,13 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     rb_econv_close(ec);
   }
   
-  rb_str_modify_expand(v_path, MAX_PATH);
+  rb_str_modify_expand(v_path, MAX_WPATH);
 
   // Make our path a wide string for later functions
-  length = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_path), -1, NULL, 0);
+  length = MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_path), -1, NULL, 0);
   path = (wchar_t*)ruby_xmalloc(length * sizeof(wchar_t));
 
-  if(!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_path), -1, path, length)){
+  if(!MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_path), -1, path, length)){
     ruby_xfree(path);
     rb_raise_syserr("MultibyteToWideChar", GetLastError());
   }
@@ -219,8 +239,8 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   while(wcsstr(path, L"/"))
     path[wcscspn(path, L"/")] = L'\\';
 
-  // Handle ~ expansion.
-  if (ptr = wcschr(path, L'~')){
+  // Handle ~ expansion if first character.
+  if ( (ptr = wcschr(path, L'~')) && ((int)(ptr - path) == 0) ){
     wchar_t* home;
 
     // Handle both ~/user and ~user syntax
@@ -229,17 +249,15 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     }
     else{
 #ifdef HAVE_PATHCCHAPPENDEX
-      HRESULT result;
-      wchar_t buffer[PATHCCH_MAX_CCH];
-
-      wcscpy_s(buffer, PATHCCH_MAX_CCH, expand_tilde(path));
-      
-      result = PathCchAppendEx(buffer, MAX_PATH, ++ptr, PATHCCH_ALLOW_LONG_PATHS);
+      HRESULT hr;
+      home = expand_tilde(path);
 
-      if (result != S_OK)
-        rb_raise_syserr("PathCchAppend", result);
+      hr = PathCchAppendEx(home, MAX_WPATH, ++ptr, 1);
 
-      home = &buffer[0];
+      if(hr != S_OK){
+        ruby_xfree(home);
+        rb_raise_syserr("PathCchAppendEx", hr);
+      }
 #else
       home = expand_tilde(path);
 
@@ -258,6 +276,9 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     wchar_t* dir;
     VALUE v_dir;
     rb_encoding* dir_encoding;
+#ifdef HAVE_PATHCCH_H
+    HRESULT hr;
+#endif
 
     dir_encoding = rb_enc_get(v_dir_orig);
 
@@ -272,12 +293,12 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     }
 
     // Prep string for modification
-    rb_str_modify_expand(v_dir, MAX_PATH);
+    rb_str_modify_expand(v_dir, MAX_WPATH);
 
-    length = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, NULL, 0);
-    dir = (wchar_t*)ruby_xmalloc(MAX_PATH * sizeof(wchar_t));
+    length = MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_dir), -1, NULL, 0);
+    dir = (wchar_t*)ruby_xmalloc(MAX_WPATH * sizeof(wchar_t));
 
-    if (!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, dir, length)){
+    if (!MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_dir), -1, dir, length)){
       ruby_xfree(dir);
       rb_raise_syserr("MultibyteToWideChar", GetLastError());
     }
@@ -285,17 +306,27 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     while (wcsstr(dir, L"/"))
       dir[wcscspn(dir, L"/")] = L'\\';
 
-    if (ptr = wcschr(dir, L'~')){
+    // Check for tilde in first character
+    if ( (ptr = wcschr(dir, L'~')) && ((int)(ptr - dir) == 0) ){
       if (ptr[1] && ptr[1] != L'\\'){
         dir = find_user(++ptr);
       }
       else{
         dir = expand_tilde();
 
+#ifdef HAVE_PATHCCH_H
+        hr = PathCchAppendEx(dir, MAX_WPATH, ++ptr, 1);
+
+        if(hr != S_OK){
+          ruby_xfree(dir);
+          rb_raise_syserr("PathCchAppendEx", hr);
+        }
+#else
         if (!PathAppendW(dir, ++ptr)){
           ruby_xfree(dir);
           rb_raise_syserr("PathAppend", GetLastError());
         }
+#endif
       }
     }
 
@@ -303,10 +334,20 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
       path = dir;
 
     if (PathIsRelativeW(path)){ 
+
+#ifdef HAVE_PATHCCH_H
+      hr = PathCchAppendEx(dir, MAX_WPATH, path, 1);
+
+      if(hr != S_OK){
+        ruby_xfree(dir);
+        rb_raise_syserr("PathCchAppendEx", hr);
+      }
+#else
       if(!PathAppendW(dir, path)){
         ruby_xfree(dir);
         rb_raise_syserr("PathAppend", GetLastError());
       }
+#endif
 
       // Remove leading slashes from relative paths
       if (dir[0] == L'\\')
@@ -350,7 +391,11 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   }
 
   // Strip all trailing backslashes
+#ifdef HAVE_PATHCCH_H
+  while (PathCchRemoveBackslash(path, wcslen(path)+1) == S_OK);
+#else
   while (!*PathRemoveBackslashW(path));
+#endif
 
   // First call, get the length
   length = GetFullPathNameW(path, 0, buffer, NULL);

data/lib/win32-xpath.rb

@@ -0,0 +1 @@
+require 'win32/xpath'

data/test/test_win32_xpath.rb

@@ -11,7 +11,7 @@ class Test_XPath < Test::Unit::TestCase
 
   def setup
     @pwd = Dir.pwd
-    @tmp = Dir.tmpdir
+    @tmp = 'C:/Temp'
     @root =  'C:/'
     @drive = ENV['HOMEDRIVE']
     @home = ENV['HOME'].tr('\\', '/')
@@ -65,6 +65,12 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal(File.join(@root, 'foo.rb'), File.expand_path("#{@root}foo.rb/"))
   end
 
+  test "removes trailing slashes from relative path" do
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo/"))
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo//"))
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo\\\\\\"))
+  end
+
   test "removes trailing spaces from absolute path" do
     assert_equal(File.join(@root, 'foo'), File.expand_path("#{@root}foo  "))
   end
@@ -86,6 +92,7 @@ class Test_XPath < Test::Unit::TestCase
   end
 
   test "returns tainted strings or not" do
+    omit_if(RUBY_VERSION.to_f >= 2.7, "skipping taint checks on Ruby 2.7+")
     assert_true(File.expand_path('foo').tainted?)
     assert_true(File.expand_path('foo'.taint).tainted?)
     assert_true(File.expand_path('/foo').tainted?)
@@ -112,6 +119,11 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal("#{@home}/foo", File.expand_path('foo', '~'))
   end
 
+  test "doesn't attempt to expand a tilde unless it's the first character" do
+    assert_equal("C:/Progra~1", File.expand_path("C:/Progra~1"))
+    assert_equal("C:/Progra~1", File.expand_path("C:/Progra~1", "C:/Progra~1"))
+  end
+
   test "does not modify a HOME string argument" do
     str = "~/a"
     assert_equal("#{@home}/a", File.expand_path(str))
@@ -168,12 +180,18 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal("./a/b/../c", str)
   end
 
-  test "accepts objects that have a to_path method" do
+  test "accepts objects that have a to_path method for main argument" do
     klass = Class.new{ def to_path; "a/b/c"; end }
     obj = klass.new
     assert_equal("#{@pwd}/a/b/c", File.expand_path(obj))
   end
 
+  test "accepts objects that have a to_path method for relative dir argument" do
+    klass = Class.new{ def to_path; "bar"; end }
+    obj = klass.new
+    assert_equal("#{@pwd}/bar/foo", File.expand_path('foo', obj))
+  end
+
   test "works with unicode characters" do
     assert_equal("#{@pwd}/Ελλάσ", File.expand_path("Ελλάσ"))
   end

data/win32-xpath.gemspec

@@ -1,21 +1,29 @@
 require 'rubygems'
 
 Gem::Specification.new do |spec|
-  spec.name      = 'win32-xpath'
-  spec.version   = '1.0.3'
-  spec.author    = 'Daniel J. Berger'
-  spec.license   = 'Artistic 2.0'
-  spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://github.com/djberg96/win32-xpath'
-  spec.summary   = 'Revamped File.expand_path for Windows'
-  spec.test_file = 'test/test_win32_xpath.rb'
-  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
-
-  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+  spec.name       = 'win32-xpath'
+  spec.version    = '1.1.2'
+  spec.author     = 'Daniel J. Berger'
+  spec.license    = 'Apache-2.0'
+  spec.email      = 'djberg96@gmail.com'
+  spec.homepage   = 'http://github.com/djberg96/win32-xpath'
+  spec.summary    = 'Revamped File.expand_path for Windows'
+  spec.test_file  = 'test/test_win32_xpath.rb'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.cert_chain = Dir['certs/*']
 
   spec.extensions = ['ext/extconf.rb']
   spec.add_development_dependency('rake')
-  spec.add_development_dependency('test-unit', '>= 3.0.0')
+  spec.add_development_dependency('test-unit', '~> 3.4')
+
+  spec.metadata = {
+    'homepage_uri'      => 'https://github.com/djberg96/win32-xpath',
+    'bug_tracker_uri'   => 'https://github.com/djberg96/win32-xpath/issues',
+    'changelog_uri'     => 'https://github.com/djberg96/win32-xpath/blob/main/CHANGES.md',
+    'documentation_uri' => 'https://github.com/djberg96/win32-xpath/wiki',
+    'source_code_uri'   => 'https://github.com/djberg96/win32-xpath',
+    'wiki_uri'          => 'https://github.com/djberg96/win32-xpath/wiki'
+  }
 
   spec.description = <<-EOF
     The win32-xpath library provides a revamped File.expand_path method

metadata

@@ -1,14 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: win32-xpath
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.2
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+  A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+  u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+  75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+  6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+  iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+  ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+  74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+  058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+  AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+  YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+  /3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+  h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+  6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+  ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+  1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+  DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+  ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+  WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+  -----END CERTIFICATE-----
+date:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +55,16 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
 description: |2
       The win32-xpath library provides a revamped File.expand_path method
       for MS Windows. It is significantly faster, and supports ~user
@@ -46,27 +73,39 @@ email: djberg96@gmail.com
 executables: []
 extensions:
 - ext/extconf.rb
-extra_rdoc_files:
-- README
-- CHANGES
-- MANIFEST
+extra_rdoc_files: []
 files:
-- CHANGES
-- MANIFEST
-- README
-- Rakefile
+- appveyor.yml
+- bench
 - bench/bench_win32_xpath.rb
+- certs
+- certs/djberg96_pub.pem
+- CHANGES.md
+- ext
 - ext/extconf.rb
+- ext/win32
 - ext/win32/xpath.c
-- futzing/futz.rb
-- futzing/test.rb
+- Gemfile
+- lib
+- lib/win32-xpath.rb
+- LICENSE
+- MANIFEST.md
+- Rakefile
+- README.md
+- test
 - test/test_win32_xpath.rb
 - win32-xpath.gemspec
 homepage: http://github.com/djberg96/win32-xpath
 licenses:
-- Artistic 2.0
-metadata: {}
-post_install_message: 
+- Apache-2.0
+metadata:
+  homepage_uri: https://github.com/djberg96/win32-xpath
+  bug_tracker_uri: https://github.com/djberg96/win32-xpath/issues
+  changelog_uri: https://github.com/djberg96/win32-xpath/blob/main/CHANGES.md
+  documentation_uri: https://github.com/djberg96/win32-xpath/wiki
+  source_code_uri: https://github.com/djberg96/win32-xpath
+  wiki_uri: https://github.com/djberg96/win32-xpath/wiki
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: Revamped File.expand_path for Windows
 test_files:

data/CHANGES

@@ -1,11 +0,0 @@
-= 1.0.3 - 3-Jul-2015
-* Use PathCchXXX functions where available to improve long path handling.
-
-= 1.0.2 - 17-Jun-2015
-* Deal with non-standard swprintf issues so that it works with mingw compiler.
-
-= 1.0.1 - 2-Apr-2015
-* Altered internal handling of native C function failures.
-
-= 1.0.0 - 26-Feb-2015
-* Initial release

data/MANIFEST

@@ -1,9 +0,0 @@
-bench/bench_win32_xpath.rb
-CHANGES
-ext/extconf.rb
-ext/win32/xpath.c
-futzing/futz.rb
-Rakefile
-README
-test/test_win32_xpath.rb
-win32-xpath.gemspec

data/README

@@ -1,65 +0,0 @@
-= Description
-  A custom File.expand_path method for Ruby on Windows that's much
-  faster and works better.
-
-= Installation
-  gem install win32-xpath
-
-= Synopsis
-  require 'win32/xpath'
-
-  # That's it, you are now using this library when you call File.expand_path
-
-= Features
-  * A 5x average performance boost over MRI's current method.
-  * Support for ~user expansion.
-
-= Known Issues
-  * This library does not support drive-current paths for the 2nd argument.
-  * This library does not support alt-stream name autocorrection.
-
-  It is very unlikely you will ever be affected by either of these things.
-  Drive-current paths are a relic of DOS 1.0, but even so this library
-  will handle them in the first argument.
-
-  I don't support alt-stream mangling because I don't believe it's the
-  job of this method to peform autocorrection. Even in MRI it only works
-  for the default $DATA stream, and then only for a certain type of
-  syntax error. I do not know when or why it was added.
-
-  One possible "real" issue is that on Windows 7 or earlier you will be
-  limited to 260 character paths. This is a limitation of the shlwapi.h
-  functions that I use internally.
-
-  If you discover any other issues, please report them on the project
-  page at https://github.com/djberg96/win32-xpath.
-
-= Mingw and Devkit
-  Make sure you have a recent version of the Devkit installed if you're
-  using the one-click installer. If you see this warning then you need
-  to upgrade your Devkit.
-
-  "implicit declaration of function 'ConvertSidToStringSidW'"
-
-= Acknowledgements
-  Park Heesob for encoding advice and help.
-
-== License
-  Artistic 2.0
-
-== Contributions
-  Although this library is free, please consider having your company
-  setup a gittip if used by your company professionally.
-
-  http://www.gittip.com/djberg96/
-    
-== Copyright
-  (C) 2003-2015 Daniel J. Berger, All Rights Reserved
-    
-== Warranty
-  This package is provided "as is" and without any express or
-  implied warranties, including, without limitation, the implied
-  warranties of merchantability and fitness for a particular purpose.
-
-= Author
-  Daniel Berger

data/futzing/futz.rb

@@ -1,71 +0,0 @@
-require 'win32/xpath'
-require 'tmpdir'
-
-#p File.expand_path("~djberge", "foo")
-#p File.expand_path("~/foo")
-#p File.expand_path("", "~djberge")
-#p File.expand_path("~djberge")
-#p File.expand_path("~djberge/foo/bar")
-#p File.expand_path("~bogus")
-
-ENV['HOME'] = nil
-ENV['USERPROFILE'] = nil
-ENV['HOMEDRIVE'] = "D:/"
-#ENV['USERPROFILE'] = "C:/bogus"
-p File.expand_path("~")
-
-#p File.expand_path("foo", "~")
-#p File.expand_path("foo", "~")
-#p File.expand_path("", "~")
-#p File.expand_path("", "~")
-#p File.expand_path("foo", "~/bar")
-#p File.expand_path("foo", "~/bar")
-#p File.expand_path("")
-#p File.expand_path("C:/foo/bar")
-#p File.expand_path("C:/foo/bar///")
-#p File.expand_path('foo', Dir.tmpdir)
-#p File.expand_path("C:/foo/bar", "D:/foo")
-#p File.expand_path("foo")
-#p File.expand_path("foo", "bar")
-
-#ENV['HOME'] = nil
-#ENV['USERPROFILE'] = nil
-#p File.expand_path("~")
-
-#path = "../a"
-#tmp = Dir.tmpdir
-
-#p path
-#p tmp
-
-#100.times{
-#  File.expand_path(path, tmp)
-#  File.expand_path('foo', tmp)
-#}
-
-#p path
-#p tmp
-
-#p File.expand_path('../a', tmp)
-
-#p File.expand_path('../a', 'foo')
-#p File.expand_path('../a', 'foo')
-#p File.expand_path('../a', 'C:/foo')
-#p File.expand_path('../a', 'C:/foo')
-
-
-=begin
-p File.expand_path("/foo").tainted?
-p File.expand_path("foo").tainted? # True
-p File.expand_path("foo".taint).tainted? # True
-p File.expand_path("C:/foo").tainted? # False
-p File.expand_path("C:/foo".taint).tainted? # True
-=end
-
-=begin
-p File.expand_path("~")
-p File.expand_path("~/foo")
-p File.expand_path("//foo/bar")
-p File.expand_path("//foo/bar//")
-p File.expand_path("//foo/bar//")
-=end

data/futzing/test.rb

@@ -1,90 +0,0 @@
-require 'ffi'
-
-class Windows
-  extend FFI::Library
-  typedef :ulong, :dword
-
-  ffi_lib :shlwapi
-
-  attach_function :PathCanonicalizeA, [:buffer_out, :string], :bool
-  attach_function :PathStripToRootA, [:pointer], :bool
-  attach_function :PathIsRelativeA, [:string], :bool
-  attach_function :PathAppendA, [:buffer_out, :string], :bool
-  attach_function :PathSkipRootA, [:string], :string
-  attach_function :PathIsNetworkPathA, [:string], :bool
-
-  ffi_lib :kernel32
-  attach_function :GetFullPathNameA, [:string, :dword, :buffer_out, :pointer], :dword
-
-  def xpath(path, dir=nil)
-    path = path.tr("/", "\\")
-
-    buf = 0.chr * 512
-
-    p path
-    p PathIsRelativeA(path)
-
-    if !PathCanonicalizeA(buf, path)
-      raise
-    end
-
-    p buf.strip
-
-    #p dir
-    #p path
-
-    #regex = /\A(\w):([^\\]+)(.*)/i
-=begin
-    if m = regex.match(path)
-      drive = m.captures[0]
-      path = m.captures[1..-1].join
-      p drive
-      p path
-    end
-=end
-
-    #p PathIsNetworkPathA(path)
-    #p PathSkipRootA(path)
-    #p PathIsRelativeA(path)
-
-=begin
-    buf = 0.chr * 1024
-
-    if GetFullPathNameA(path, buf.size, buf, nil) == 0
-      raise SystemCallError.new('GetFullPathName', FFI.errno)
-    end
-
-    p buf.strip
-=end
-
-=begin
-    ptr = FFI::MemoryPointer.from_string(path)
-
-    p PathIsRelativeA(path)
-
-    unless PathStripToRootA(ptr)
-      raise SystemCallError.new('PathStripToRoot', FFI.errno)
-    end
-
-    p ptr.read_string
-=end
-
-=begin
-    unless PathCanonicalizeA(buf, path)
-      raise SystemCallError.new('PathCanonicalize', FFI.errno)
-    end
-
-    buf.strip
-=end
-  end
-end
-
-if $0 == __FILE__
-  Windows.new.xpath("/../../a", "foo")
-  #p Windows.new.xpath("C:/foo/../bar")
-  #p Windows.new.xpath("C:foo")
-  #Windows.new.xpath("C:foo")
-  #Windows.new.xpath("C:foo/bar")
-  #Windows.new.xpath("C:/foo")
-  #Windows.new.xpath("foo")
-end