From c57a9083ae1e9f51d3624a0ae3ba93676c60dc5d Mon Sep 17 00:00:00 2001 From: eban Date: Sat, 24 Feb 2001 17:51:02 +0000 Subject: * file.c (rb_file_s_rename): avoid Cygwin's bug. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad174b802..1cd0944e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Feb 25 02:45:30 2001 WATANABE Hirofumi + + * file.c (rb_file_s_rename): avoid Cygwin's bug. + Sat Feb 24 22:14:00 2001 WATANABE Hirofumi * win32/win32.c (myrename): fix error handling. diff --git a/file.c b/file.c index c4e6781ae..c8970f787 100644 --- a/file.c +++ b/file.c @@ -1252,8 +1252,13 @@ rb_file_s_rename(obj, from, to) Check_SafeStr(from); Check_SafeStr(to); - if (rename(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0) + if (rename(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0) { +#if defined __CYGWIN__ + extern unsigned long __attribute__((stdcall)) GetLastError(); + errno = GetLastError(); /* This is a Cygwin bug */ +#endif rb_sys_fail(RSTRING(from)->ptr); + } return INT2FIX(0); } -- cgit