naruse	2018-03-28 22:43:23 +0900 (Wed, 28 Mar 2018)

  New Revision: 63009

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63009

  Log:
    merge revision(s) 63000:
    
    unixsocket.c: abstract namespace
    
    * ext/socket/unixsocket.c (unixsock_path_value): fix r62991 for
      Linux abstract namespace.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/ext/socket/unixsocket.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 63008)
+++ ruby_2_5/version.h	(revision 63009)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.1"
 #define RUBY_RELEASE_DATE "2018-03-28"
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_5/ext/socket/unixsocket.c
===================================================================
--- ruby_2_5/ext/socket/unixsocket.c	(revision 63008)
+++ ruby_2_5/ext/socket/unixsocket.c	(revision 63009)
@@ -25,6 +25,28 @@ unixsock_connect_internal(VALUE a) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/ext/socket/unixsocket.c#L25
 			        arg->sockaddrlen, 0);
 }
 
+static VALUE
+unixsock_path_value(VALUE path)
+{
+#ifdef __linux__
+#define TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE 0
+
+    VALUE name = path;
+#if TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE
+    const int isstr = !NIL_P(name = rb_check_string_type(name));
+#else
+    const int isstr = RB_TYPE_P(name, T_STRING);
+#endif
+    if (isstr) {
+        if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') {
+            rb_check_safe_obj(name);
+            return name;             /* ignore encoding */
+        }
+    }
+#endif
+    return rb_get_path(path);
+}
+
 VALUE
 rsock_init_unixsock(VALUE sock, VALUE path, int server)
 {
@@ -33,7 +55,7 @@ rsock_init_unixsock(VALUE sock, VALUE pa https://github.com/ruby/ruby/blob/trunk/ruby_2_5/ext/socket/unixsocket.c#L55
     int fd, status;
     rb_io_t *fptr;
 
-    FilePathValue(path);
+    path = unixsock_path_value(path);
 
     INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
     if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 63008)
+++ ruby_2_5	(revision 63009)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63000

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/