From d1efa4d03cdd29577db476fd4121a07263f19c67 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Nov 2005 14:52:55 +0000 Subject: * 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/branches/ruby_1_8@9537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index da722d1e4..2f67f4a63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 14 23:49:57 2005 Nobuyoshi Nakada + + * file.c (rb_file_s_readlink): ERANGE will occur only on GPFS. + [ruby-dev:27699] + Mon Nov 14 17:36:22 2005 Yukihiro Matsumoto * array.c (rb_ary_first): RDoc update from Daniel Berger diff --git a/file.c b/file.c index decb5ba81..8db72a089 100644 --- a/file.c +++ b/file.c @@ -2051,13 +2051,11 @@ rb_file_s_readlink(klass, path) SafeStringValue(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); } -- cgit