diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 05:50:58 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 05:50:58 +0000 |
| commit | 3c555c92f17125eca6ad5dbf91d9b979d567a1e5 (patch) | |
| tree | 0820cee63380c29032b3db855f0fd5fef135f10d /ext | |
| parent | 1178844958750b4143105200ea68610e44d9f5ed (diff) | |
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_3@54360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index dcf2498daa..542cd02ed6 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -893,13 +893,27 @@ sock_gethostname(VALUE obj) # define RUBY_MAX_HOST_NAME_LEN 1024 #endif - char buf[RUBY_MAX_HOST_NAME_LEN+1]; + long len = RUBY_MAX_HOST_NAME_LEN; + VALUE name; - 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 |