diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 08:45:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-27 08:45:26 +0000 |
commit | 12331d4939f431e84ed7ca26efc53d7dcf861cf0 (patch) | |
tree | d0fde81060e1c6b4c5207c7d2fc0d5c50e4f05dd /file.c | |
parent | c660a9c466dc6368bae07f2c3b1451b8102fa3c0 (diff) |
* file.c (file_load_ok): checks if regular file, except for the
platform disallows to open directories, e.g. cygwin.
[ruby-dev:38097], [Bug #1221]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -4521,13 +4521,19 @@ rb_path_check(const char *path) static int file_load_ok(const char *path) { - struct stat st; - int ret, fd = open(path, O_RDONLY); + int ret = 1; + int fd = open(path, O_RDONLY); if (fd == -1) return 0; - ret = fstat(fd, &st); +#if !(defined DOSISH || defined __CYGWIN__) + { + struct stat st; + if (fstat(fd, &st) || !S_ISREG(st.st_mode)) { + ret = 0; + } + } +#endif (void)close(fd); - if (ret) return 0; - return S_ISREG(st.st_mode); + return ret; } static int |