mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
[ruby-talk:219248] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e18aabc7db
commit
450fc7bb57
2 changed files with 14 additions and 5 deletions
|
@ -1,9 +1,12 @@
|
||||||
Wed Oct 18 22:58:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Wed Oct 18 23:02:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
|
* array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
|
||||||
|
|
||||||
* signal.c (Init_signal): handle SIGTERM. fixed: [ruby-list:42895]
|
* signal.c (Init_signal): handle SIGTERM. fixed: [ruby-list:42895]
|
||||||
|
|
||||||
|
* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
|
||||||
|
[ruby-talk:219248]
|
||||||
|
|
||||||
Wed Oct 18 13:25:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Wed Oct 18 13:25:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (rb_str_each_line): String#lines now works when a block
|
* string.c (rb_str_each_line): String#lines now works when a block
|
||||||
|
|
|
@ -4117,11 +4117,17 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unixtime_to_filetime(times->actime, &atime)) {
|
if (times) {
|
||||||
return -1;
|
if (unixtime_to_filetime(times->actime, &atime)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (unixtime_to_filetime(times->modtime, &mtime)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (unixtime_to_filetime(times->modtime, &mtime)) {
|
else {
|
||||||
return -1;
|
GetSystemTimeAsFileTime(&atime);
|
||||||
|
mtime = atime;
|
||||||
}
|
}
|
||||||
|
|
||||||
RUBY_CRITICAL({
|
RUBY_CRITICAL({
|
||||||
|
|
Loading…
Reference in a new issue