akr	2011-07-24 20:04:11 +0900 (Sun, 24 Jul 2011)

  New Revision: 32656

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32656

  Log:
    * ext/socket/extconf.rb: fix the recvmsg test.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/socket/extconf.rb
    trunk/ChangeLog
    trunk/ext/socket/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32655)
+++ ChangeLog	(revision 32656)
@@ -1,3 +1,7 @@
+Sun Jul 24 20:02:31 2011  Tanaka Akira  <akr@f...>
+
+	* ext/socket/extconf.rb: fix the recvmsg test.
+
 Sun Jul 24 08:42:51 2011  Tanaka Akira  <akr@f...>
 
 	* ext/socket/extconf.rb: test recvmsg allocates file descriptors for
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 32655)
+++ ext/socket/extconf.rb	(revision 32656)
@@ -147,7 +147,7 @@
     } s_cmsg, r_cmsg;
     struct iovec s_iov, r_iov;
     char s_buf[1], r_buf[1];
-    struct stat statbuf;
+    struct stat s_statbuf, r_statbuf;
 
     s_fd = 0; /* stdin */
 
@@ -198,13 +198,23 @@
 
     if (r_msg.msg_controllen < CMSG_LEN(sizeof(int))) exit(EXIT_FAILURE);
     if (r_cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(int))) exit(EXIT_FAILURE);
-    memcpy((char *)&r_fd, CMSG_DATA(&s_cmsg.hdr), sizeof(int));
+    memcpy((char *)&r_fd, CMSG_DATA(&r_cmsg.hdr), sizeof(int));
 
     if (r_fd < 0) exit(EXIT_FAILURE);
 
-    ret = fstat(r_fd, &statbuf);
+    if (r_fd == s_fd) exit(EXIT_FAILURE);
+
+    ret = fstat(s_fd, &s_statbuf);
     if (ret == -1) { exit(EXIT_FAILURE); }
 
+    ret = fstat(r_fd, &r_statbuf);
+    if (ret == -1) { exit(EXIT_FAILURE); }
+
+    if (s_statbuf.st_dev != r_statbuf.st_dev ||
+        s_statbuf.st_ino != r_statbuf.st_ino) {
+        exit(EXIT_FAILURE);
+    }
+
     return EXIT_SUCCESS;
 }
 EOF
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32655)
+++ ruby_1_9_3/ChangeLog	(revision 32656)
@@ -1,3 +1,7 @@
+Sun Jul 24 20:02:31 2011  Tanaka Akira  <akr@f...>
+
+	* ext/socket/extconf.rb: fix the recvmsg test.
+
 Sun Jul 24 08:42:51 2011  Tanaka Akira  <akr@f...>
 
 	* ext/socket/extconf.rb: test recvmsg allocates file descriptors for
Index: ruby_1_9_3/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_3/ext/socket/extconf.rb	(revision 32655)
+++ ruby_1_9_3/ext/socket/extconf.rb	(revision 32656)
@@ -147,7 +147,7 @@
     } s_cmsg, r_cmsg;
     struct iovec s_iov, r_iov;
     char s_buf[1], r_buf[1];
-    struct stat statbuf;
+    struct stat s_statbuf, r_statbuf;
 
     s_fd = 0; /* stdin */
 
@@ -198,13 +198,23 @@
 
     if (r_msg.msg_controllen < CMSG_LEN(sizeof(int))) exit(EXIT_FAILURE);
     if (r_cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(int))) exit(EXIT_FAILURE);
-    memcpy((char *)&r_fd, CMSG_DATA(&s_cmsg.hdr), sizeof(int));
+    memcpy((char *)&r_fd, CMSG_DATA(&r_cmsg.hdr), sizeof(int));
 
     if (r_fd < 0) exit(EXIT_FAILURE);
 
-    ret = fstat(r_fd, &statbuf);
+    if (r_fd == s_fd) exit(EXIT_FAILURE);
+
+    ret = fstat(s_fd, &s_statbuf);
     if (ret == -1) { exit(EXIT_FAILURE); }
 
+    ret = fstat(r_fd, &r_statbuf);
+    if (ret == -1) { exit(EXIT_FAILURE); }
+
+    if (s_statbuf.st_dev != r_statbuf.st_dev ||
+        s_statbuf.st_ino != r_statbuf.st_ino) {
+        exit(EXIT_FAILURE);
+    }
+
     return EXIT_SUCCESS;
 }
 EOF

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