kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) a681c484a3: [Backport #17626]

Browse source 
Fixed codepage for utime [Bug #17626]

	Should use the given codepage argument.

	Co-Authored-By: Nobuyoshi Nakada <nobu@ruby-lang.org>
	---
	 test/ruby/test_file_exhaustive.rb | 7 +++++++
	 win32/win32.c                     | 2 +-
	 2 files changed, 8 insertions(+), 1 deletion(-)
This commit is contained in:
NARUSE, Yui 2021-02-16 13:16:54 +09:00
parent 38f9c832e8
commit 551f1236a4
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/ruby/test_file_exhaustive.rb
View file

@ -679,6 +679,13 @@ class TestFileExhaustive < Test::Unit::TestCase
File.utime(t + 1, t + 2, zerofile)
assert_equal(t + 1, File.atime(zerofile))
assert_equal(t + 2, File.mtime(zerofile))
Dir.mktmpdir do |dir|
Dir.chdir do
path = "foo\u{30b3 30d4 30fc}"
File.write(path, "") rescue next
assert_equal(1, File.utime(nil, nil, path))
end
end
end
def test_utime_symlinkfile

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 41
#define RUBY_PATCHLEVEL 42
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2

2
win32/win32.c
View file

@ -7399,7 +7399,7 @@ wutimensat(int dirfd, const WCHAR *path, const struct timespec *times, int flags
static int
w32_utimensat(int dirfd, const char *path, const struct timespec *times, int flags, UINT cp)
{
WCHAR *wpath = mbstr_to_wstr(filecp(), path, -1, NULL);
WCHAR *wpath = mbstr_to_wstr(cp, path, -1, NULL);
int ret = -1;
if (wpath) {