diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-26 04:31:21 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-26 04:31:21 +0000 |
commit | 5fb7052bb9dacd30f2a5e4241c87613009135dfe (patch) | |
tree | 7a5314ab4d0eccbc6d439eb8aebcc6de5103cc6d | |
parent | 905c1579174296a9c876a20e93b1fe540ed7adbe (diff) |
* util.c (valid_filename): use our own implementation of open(),
close() and unlink().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | util.c | 14 |
2 files changed, 8 insertions, 11 deletions
@@ -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. @@ -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) { |