From f50c13da99266c8486d1d59942179a65251457dc Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 19 Aug 2006 02:29:18 +0000 Subject: * file.c (rb_file_s_rename): use errno if set properly. fixed: [ruby-dev:29293] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9139d82967..d77c8852e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada + + * file.c (rb_file_s_rename): use errno if set properly. + fixed: [ruby-dev:29293] + Fri Aug 18 01:05:57 2006 Yukihiro Matsumoto * lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a diff --git a/file.c b/file.c index f1527a0407..00bc40cd7f 100644 --- a/file.c +++ b/file.c @@ -2180,10 +2180,16 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to) FilePathValue(to); src = StringValueCStr(from); dst = StringValueCStr(to); +#if defined __CYGWIN__ + errno = 0; +#endif if (rename(src, dst) < 0) { #if defined __CYGWIN__ extern unsigned long __attribute__((stdcall)) GetLastError(void); - errno = GetLastError(); /* This is a Cygwin bug */ + if (errno == 0) { /* This is a bug of old Cygwin */ + /* incorrect as cygwin errno, but the last resort */ + errno = GetLastError(); + } #elif defined DOSISH && !defined _WIN32 if (errno == EEXIST #if defined (__EMX__) -- cgit v1.2.3