From 4ccfb2743f38d54eeecc5a229b3a8edf2eb84f3c Mon Sep 17 00:00:00 2001 From: shugo Date: Thu, 31 Jan 2013 04:59:31 +0000 Subject: * ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return sizeof(sa_familiy_t) if path is empty. see "Autobind Feature" in unix(7) for details. * ext/socket/lib/socket.rb (unix_socket_abstract_name?): treat an empty path as an abstract name. * test/socket/test_unix.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/raddrinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ext/socket/raddrinfo.c') diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 79943c79e2..a730a1b4c4 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -446,7 +446,11 @@ socklen_t rsock_unix_sockaddr_len(VALUE path) { #ifdef __linux__ - if (RSTRING_PTR(path)[0] == '\0') { + if (RSTRING_LEN(path) == 0) { + /* autobind; see unix(7) for details. */ + return (socklen_t) sizeof(sa_family_t); + } + else if (RSTRING_PTR(path)[0] == '\0') { /* abstract namespace; see unix(7) for details. */ return (socklen_t) offsetof(struct sockaddr_un, sun_path) + RSTRING_LEN(path); -- cgit v1.2.3