summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-14 14:52:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-14 14:52:55 +0000
commit6b98c4fe173f845922fbc5b4db49903a3ba1db96 (patch)
treefc8fdd2e8603ce6a4fc42817098e2cae928f3737
parent14491b8bbc8d44a4a6a34a22fa17025dc45081a5 (diff)
downloadruby-6b98c4fe173f845922fbc5b4db49903a3ba1db96.tar.gz
ruby-6b98c4fe173f845922fbc5b4db49903a3ba1db96.tar.xz
ruby-6b98c4fe173f845922fbc5b4db49903a3ba1db96.zip
* file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
[ruby-dev:27699] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--file.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/file.c b/file.c
index 9bfa4473f..41f2c1055 100644
--- a/file.c
+++ b/file.c
@@ -2009,13 +2009,11 @@ rb_file_s_readlink(VALUE klass, VALUE path)
rb_secure(2);
FilePathValue(path);
buf = xmalloc(size);
- for (;;) {
- rv = readlink(RSTRING(path)->ptr, buf, size);
-#ifndef _AIX
- if (rv != size) break;
-#else
- if (rv > 0 || errno != ERANGE) break;
+ while ((rv = readlink(RSTRING(path)->ptr, buf, size)) == size
+#ifdef _AIX
+ || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
#endif
+ ) {
size *= 2;
buf = xrealloc(buf, size);
}