diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
2 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Jun 1 11:33:32 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_getcwd): set errno if not set. + fixed [ruby-list:42346] + Sat May 27 22:46:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (proc_invoke): save and restore block in the current frame. diff --git a/win32/win32.c b/win32/win32.c index 9e448564fc..999ff68044 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2935,18 +2935,25 @@ rb_w32_getcwd(char *buffer, int size) { int length; char *bp; + int save_errno = errno; #undef getcwd #ifndef __BORLANDC__ #define getcwd _getcwd #endif + errno = 0; + SetLastError(0); if (getcwd(buffer, size) == NULL) { + if (!errno) + errno = GetLastError() ? map_errno(GetLastError()) : ERANGE; return NULL; } length = strlen(buffer); if (length >= size) { + errno = ERANGE; return NULL; } + errno = save_errno; for (bp = buffer; *bp != '\0'; bp = CharNext(bp)) { if (*bp == '\\') { |