aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-18 01:19:13 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-18 01:19:13 +0000
commita857b11dedf7a94d622d1ae73d3e7fb2a4043ff0 (patch)
treefefeade81e4c3a3ebbc0d6fc913d57e54ce22a9e /file.c
parent64a08a5421ff6e8007342d17a81497517aea9c89 (diff)
downloadruby-a857b11dedf7a94d622d1ae73d3e7fb2a4043ff0.tar.gz
* file.c (rb_file_identical_p): simplify ifdefs
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/file.c b/file.c
index f668820d2e..8e7b863c1b 100644
--- a/file.c
+++ b/file.c
@@ -1932,7 +1932,7 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
static VALUE
rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
{
-#ifndef DOSISH
+#ifndef _WIN32
struct stat st1, st2;
if (rb_stat(fname1, &st1) < 0) return Qfalse;
@@ -1940,12 +1940,9 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
if (st1.st_dev != st2.st_dev) return Qfalse;
if (st1.st_ino != st2.st_ino) return Qfalse;
#else
-# ifdef _WIN32
BY_HANDLE_FILE_INFORMATION st1, st2;
HANDLE f1 = 0, f2 = 0;
-# endif
-# ifdef _WIN32
f1 = w32_io_info(&fname1, &st1);
if (f1 == INVALID_HANDLE_VALUE) return Qfalse;
if (f1) {
@@ -1965,15 +1962,6 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
st1.nFileIndexLow == st2.nFileIndexLow)
return Qtrue;
if (!f1 || !f2) return Qfalse;
-# else
- FilePathValue(fname1);
- fname1 = rb_str_new4(fname1);
- fname1 = rb_str_encode_ospath(fname1);
- FilePathValue(fname2);
- fname2 = rb_str_encode_ospath(fname2);
- if (access(RSTRING_PTR(fname1), 0)) return Qfalse;
- if (access(RSTRING_PTR(fname2), 0)) return Qfalse;
-# endif
fname1 = rb_file_expand_path(fname1, Qnil);
fname2 = rb_file_expand_path(fname2, Qnil);
if (RSTRING_LEN(fname1) != RSTRING_LEN(fname2)) return Qfalse;