2 files changed, 46 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 6dc8fffe4e..6dffaa694f 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3430,6 +3430,45 @@ rb_w32_isatty(int fd)
     return 1;
 }
 
+#undef mkdir
+#undef rmdir
+int
+rb_w32_mkdir(const char *path, int mode)
+{
+    int ret = -1;
+    RUBY_CRITICAL(do {
+	if (mkdir(path) == -1)
+	    break;
+	if (chmod(path, mode) == -1) {
+	    int save_errno = errno;
+	    rmdir(path);
+	    errno = save_errno;
+	    break;
+	}
+	ret = 0;
+    } while (0));
+    return ret;
+}
+
+int
+rb_w32_rmdir(const char *path)
+{
+    DWORD attr;
+    int ret;
+    RUBY_CRITICAL({
+	attr = GetFileAttributes(path);
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+	    attr &= ~FILE_ATTRIBUTE_READONLY;
+	    SetFileAttributes(path, attr);
+	}
+	ret = rmdir(path);
+	if (ret < 0 && attr != (DWORD)-1) {
+	    SetFileAttributes(path, attr);
+	}
+    });
+    return ret;
+}
+
 //
 // Fix bcc32's stdio bug
 //
diff --git a/win32/win32.h b/win32/win32.h
index 4ca3b299bc..5fe8703d4a 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -130,6 +130,11 @@ extern "C++" {
 #undef isatty
 #define isatty(h)		rb_w32_isatty(h)
 
+#undef mkdir
+#define mkdir(p, m)		rb_w32_mkdir(p, m)
+#undef rmdir
+#define rmdir(p)		rb_w32_rmdir(p)
+
 #ifdef __MINGW32__
 struct timezone {
   int tz_minuteswest;
@@ -190,6 +195,8 @@ extern int kill(int, int);
 extern int fcntl(int, int, ...);
 extern pid_t rb_w32_getpid(void);
 extern int rb_w32_isatty(int);
+extern int rb_w32_mkdir(const char *, int);
+extern int rb_w32_rmdir(const char *);
 
 #ifdef __BORLANDC__
 extern int rb_w32_fstat(int, struct stat *);