From 7c346a46d34332e52baa762f2e0dca978db5f8cf Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 24 Apr 2012 12:59:32 +0000 Subject: * ext/socket/raddrinfo.c (init_unix_addrinfo): show actual path length when it is too long for Unix socket. * ext/socket/unixsocket.c (rsock_init_unixsock): ditto. * ext/socket/socket.c (sock_s_pack_sockaddr_un): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/unixsocket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/socket/unixsocket.c') diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index afa47d54f6..24721fbe3d 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -40,8 +40,8 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server) MEMZERO(&sockaddr, struct sockaddr_un, 1); sockaddr.sun_family = AF_UNIX; if (sizeof(sockaddr.sun_path) <= (size_t)RSTRING_LEN(path)) { - rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)", - (int)sizeof(sockaddr.sun_path)-1); + rb_raise(rb_eArgError, "too long unix socket path (%ldbytes given but %dbytes max)", + RSTRING_LEN(path), (int)sizeof(sockaddr.sun_path)-1); } memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path)); -- cgit v1.2.3