summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-01 02:34:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-01 02:34:30 +0000
commitf85ebe0963bca1dd2a578a666b5b43684391c5b4 (patch)
tree8861089be926486d951841d0c892014441a0cf79 /win32
parente0337774ed9bef3a491863290bc01476aa5b9743 (diff)
* win32/win32.c (rb_w32_getcwd): set errno if not set.
fixed [ruby-list:42346] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c7
1 files changed, 7 insertions, 0 deletions
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 == '\\') {