1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support

Browse Source 
hostnames longer than 64 characters if the system supports it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
charliesome 2014-07-25 04:17:50 +00:00
parent 97e37d6805
commit 73ac899b7f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jul 25 13:18:00 2014 Will Farrington <wfarrington@digitalocean.com>
* ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support
hostnames longer than 64 characters if the system supports it.
Fri Jul 25 12:21:11 2014 Santiago Pastorino <santiago@wyeworks.com> Fri Jul 25 12:21:11 2014 Santiago Pastorino <santiago@wyeworks.com>
* compile.c (defined_expr): make the condition if the receiver * compile.c (defined_expr): make the condition if the receiver

11
ext/socket/socket.c
View File

@ -1023,10 +1023,15 @@ sock_sysaccept(VALUE sock)
static VALUE static VALUE
sock_gethostname(VALUE obj) sock_gethostname(VALUE obj)
{ {
#ifndef HOST_NAME_MAX #if defined(NI_MAXHOST)
# define HOST_NAME_MAX 1024 # define RUBY_MAX_HOST_NAME_LEN NI_MAXHOST
#elif defined(HOST_NAME_MAX)
# define RUBY_MAX_HOST_NAME_LEN HOST_NAME_MAX
#else
# define RUBY_MAX_HOST_NAME_LEN 1024
#endif #endif
char buf[HOST_NAME_MAX+1];
char buf[RUBY_MAX_HOST_NAME_LEN+1];
rb_secure(3); rb_secure(3);
if (gethostname(buf, (int)sizeof buf - 1) < 0) if (gethostname(buf, (int)sizeof buf - 1) < 0)