ruby-changes:71740
From: Nobuyoshi <ko1@a...>
Date: Fri, 15 Apr 2022 17:14:49 +0900 (JST)
Subject: [ruby-changes:71740] a0040af671 (master): [Win32] Fix mode of character/pipe device stat [Bug #18732]
https://git.ruby-lang.org/ruby.git/commit/?id=a0040af671 From a0040af6715d85f416f1282588974e151a8164eb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Fri, 15 Apr 2022 02:33:08 +0900 Subject: [Win32] Fix mode of character/pipe device stat [Bug #18732] --- test/ruby/test_file_exhaustive.rb | 33 ++++++++++++++++++++++++++++----- win32/win32.c | 22 ++++++++++++++++------ 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index a4f968be5f..d3916b25a2 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -173,9 +173,7 @@ class TestFileExhaustive < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L173 end def chardev - return @chardev if defined? @chardev - @chardev = File::NULL == "/dev/null" ? "/dev/null" : nil - @chardev + File::NULL end def blockdev @@ -332,7 +330,7 @@ class TestFileExhaustive < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L330 assert_file.not_chardev?(regular_file) assert_file.not_chardev?(utf8_file) assert_file.not_chardev?(nofile) - assert_file.chardev?(chardev) if chardev + assert_file.chardev?(chardev) end def test_exist_p @@ -1513,6 +1511,31 @@ class TestFileExhaustive < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L1511 assert_equal(File.executable?(f), test(?x, f), f) assert_equal(File.executable_real?(f), test(?X, f), f) assert_equal(File.zero?(f), test(?z, f), f) + + stat = File.stat(f) + assert_equal(stat.atime, File.atime(f), f) + assert_equal(stat.ctime, File.ctime(f), f) + assert_equal(stat.mtime, File.mtime(f), f) + assert_equal(stat.blockdev?, File.blockdev?(f), f) + assert_equal(stat.chardev?, File.chardev?(f), f) + assert_equal(stat.directory?, File.directory?(f), f) + assert_equal(stat.file?, File.file?(f), f) + assert_equal(stat.setgid?, File.setgid?(f), f) + assert_equal(stat.grpowned?, File.grpowned?(f), f) + assert_equal(stat.sticky?, File.sticky?(f), f) + assert_equal(File.lstat(f).symlink?, File.symlink?(f), f) + assert_equal(stat.owned?, File.owned?(f), f) + assert_equal(stat.pipe?, File.pipe?(f), f) + assert_equal(stat.readable?, File.readable?(f), f) + assert_equal(stat.readable_real?, File.readable_real?(f), f) + assert_equal(stat.size?, File.size?(f), f) + assert_equal(stat.socket?, File.socket?(f), f) + assert_equal(stat.setuid?, File.setuid?(f), f) + assert_equal(stat.writable?, File.writable?(f), f) + assert_equal(stat.writable_real?, File.writable_real?(f), f) + assert_equal(stat.executable?, File.executable?(f), f) + assert_equal(stat.executable_real?, File.executable_real?(f), f) + assert_equal(stat.zero?, File.zero?(f), f) end assert_equal(false, test(?-, @dir, fn1)) assert_equal(true, test(?-, fn1, fn1)) @@ -1622,7 +1645,7 @@ class TestFileExhaustive < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L1645 def test_stat_chardev_p assert_not_predicate(File::Stat.new(@dir), :chardev?) assert_not_predicate(File::Stat.new(regular_file), :chardev?) - assert_predicate(File::Stat.new(chardev), :chardev?) if chardev + assert_predicate(File::Stat.new(chardev), :chardev?) end def test_stat_readable_p diff --git a/win32/win32.c b/win32/win32.c index 7f879b397f..ea9624876c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5613,10 +5613,8 @@ filetime_to_nsec(const FILETIME *ft) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5613 /* License: Ruby's */ static unsigned -fileattr_to_unixmode(DWORD attr, const WCHAR *path) +fileattr_to_unixmode(DWORD attr, const WCHAR *path, unsigned mode) { - unsigned mode = 0; - if (attr & FILE_ATTRIBUTE_READONLY) { mode |= S_IREAD; } @@ -5624,7 +5622,10 @@ fileattr_to_unixmode(DWORD attr, const WCHAR *path) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5622 mode |= S_IREAD | S_IWRITE | S_IWUSR; } - if (attr & FILE_ATTRIBUTE_REPARSE_POINT) { + if (mode & S_IFMT) { + /* format is already set */ + } + else if (attr & FILE_ATTRIBUTE_REPARSE_POINT) { if (rb_w32_reparse_symlink_p(path)) mode |= S_IFLNK | S_IEXEC; else @@ -5719,7 +5720,7 @@ stat_by_find(const WCHAR *path, struct stati128 *st) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5720 return -1; } FindClose(h); - st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path); + st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path, 0); st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime); st->st_atimensec = filetime_to_nsec(&wfd.ftLastAccessTime); st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime); @@ -5752,6 +5753,15 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5753 if (f != INVALID_HANDLE_VALUE) { DWORD attr = stati128_handle(f, st); const DWORD len = get_final_path(f, finalname, numberof(finalname), 0); + unsigned mode = 0; + switch (GetFileType(f)) { + case FILE_TYPE_CHAR: + mode = S_IFCHR; + break; + case FILE_TYPE_PIPE: + mode = S_IFIFO; + break; + } CloseHandle(f); if (attr & FILE_ATTRIBUTE_REPARSE_POINT) { /* TODO: size in which encoding? */ @@ -5763,7 +5773,7 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5773 if (attr & FILE_ATTRIBUTE_DIRECTORY) { if (check_valid_dir(path)) return -1; } - st->st_mode = fileattr_to_unixmode(attr, path); + st->st_mode = fileattr_to_unixmode(attr, path, mode); if (len) { finalname[min(len, numberof(finalname)-1)] = L'\0'; path = finalname; -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/