summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--util.c14
2 files changed, 8 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 01934c7416..b55ef7628c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 26 13:30:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * util.c (valid_filename): use our own implementation of open(),
+ close() and unlink().
+
Thu Feb 26 13:23:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (cdhash_each): resurrects internal literals.
diff --git a/util.c b/util.c
index f2b38420b8..2297e2f99f 100644
--- a/util.c
+++ b/util.c
@@ -20,14 +20,6 @@
#ifdef _WIN32
#include "missing/file.h"
#endif
-#if defined(__CYGWIN32__)
-#define _open open
-#define _close close
-#define _unlink unlink
-#define _access access
-#elif defined(_WIN32)
-#include <io.h>
-#endif
#include "ruby/util.h"
@@ -345,9 +337,9 @@ valid_filename(const char *s)
// It doesn't exist, so see if we can open it.
*/
- if ((fd = _open(s, O_CREAT|O_EXCL, 0666)) >= 0) {
- _close(fd);
- _unlink(s); /* don't leave it laying around */
+ if ((fd = open(s, O_CREAT|O_EXCL, 0666)) >= 0) {
+ close(fd);
+ unlink(s); /* don't leave it laying around */
return 1;
}
else if (errno == EEXIST) {