From 556a7ac35fb1e64c35c56d9c09f2c6f6ee0a1209 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 6 Nov 2005 11:18:57 +0000 Subject: [PATCH] * file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if buffer size is less than required. fixed: [ruby-dev:27634] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5a1bc8e600..6fc178b9c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 6 20:13:27 2005 Nobuyoshi Nakada + + * file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if + buffer size is less than required. fixed: [ruby-dev:27634] + Sat Nov 5 13:42:50 2005 Nobuyoshi Nakada * configure.in, cygwin/GNUmakefile.in (mingw): use def file to alias diff --git a/file.c b/file.c index c1a69575f6..38db9d84ba 100644 --- a/file.c +++ b/file.c @@ -1982,7 +1982,13 @@ rb_file_s_readlink(VALUE klass, VALUE path) rb_secure(2); FilePathValue(path); buf = xmalloc(size); - while ((rv = readlink(StringValueCStr(path), buf, size)) == size) { + for (;;) { + rv = readlink(RSTRING(path)->ptr, buf, size); +#ifndef _AIX + if (rv != size) break; +#else + if (rv > 0 || errno != ERANGE) break; +#endif size *= 2; buf = xrealloc(buf, size); }