From 338ec3cee73f58091927d9282070efd0da0cca36 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 28 Feb 2013 13:29:55 +0000 Subject: [PATCH] * ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix domain socket filename is bigger than sizeof(sun_path). This limit is not rigid on some platforms such as Darwin and SunOS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/socket/raddrinfo.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57beea86fc..28ddbbbfb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 28 22:23:27 2013 Tanaka Akira + + * ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix + domain socket filename is bigger than sizeof(sun_path). + This limit is not rigid on some platforms such as Darwin and SunOS. + Thu Feb 28 21:33:01 2013 WATANABE Hirofumi * configure.in(AC_DISABLE_OPTION_CHECKING): avoid warning "WARNING: diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 52169d3ec7..569456cae3 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -1048,9 +1048,6 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) while (s < e) rb_str_catf(ret, ":%02x", (unsigned char)*s++); } - if (addr->sun_path + sizeof(addr->sun_path) < (char*)&rai->addr + rai->sockaddr_len) - rb_str_catf(ret, "(sockaddr %d bytes too long)", - (int)(rai->sockaddr_len - (addr->sun_path + sizeof(addr->sun_path) - (char*)&rai->addr))); } break; }