merge revision(s) 53677: [Backport #11877]

        * ext/socket/socket.c (sock_gethostname): support unlimited size
          hostname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 6 deletions

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 05924323ba..13006abdb3 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1000,14 +1000,28 @@ sock_gethostname(VALUE obj)
 #ifndef HOST_NAME_MAX
 #  define HOST_NAME_MAX 1024
 #endif
-    char buf[HOST_NAME_MAX+1];
+    long len = HOST_NAME_MAX;
+    VALUE name;
 
     rb_secure(3);
-    if (gethostname(buf, (int)sizeof buf - 1) < 0)
-	rb_sys_fail("gethostname(3)");
-
-    buf[sizeof buf - 1] = '\0';
-    return rb_str_new2(buf);
+    name = rb_str_new(0, len);
+    while (gethostname(RSTRING_PTR(name), len) < 0) {
+	int e = errno;
+	switch (e) {
+	  case ENAMETOOLONG:
+#ifdef __linux__
+	  case EINVAL:
+	    /* glibc before version 2.1 uses EINVAL instead of ENAMETOOLONG */
+#endif
+	    break;
+	  default:
+	    rb_syserr_fail(e, "gethostname(3)");
+	}
+	rb_str_modify_expand(name, len);
+	len += len;
+    }
+    rb_str_resize(name, strlen(RSTRING_PTR(name)));
+    return name;
 }
 #else
 #ifdef HAVE_UNAME