diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-04-15 02:33:08 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-04-15 17:14:29 +0900 |
| commit | a0040af6715d85f416f1282588974e151a8164eb (patch) | |
| tree | 5b52c278c428449b6cda0aec888bb72f8bc8af5f /win32 | |
| parent | a0eb4b14d68f77b7efa560e0c1b7d261654c586e (diff) | |
[Win32] Fix mode of character/pipe device stat [Bug #18732]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5803
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 22 |
1 files changed, 16 insertions, 6 deletions
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) /* 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) 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) 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) 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) 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; |