[前][次][番号順一覧][スレッド一覧]

ruby-changes:10792

From: akr <ko1@a...>
Date: Mon, 16 Feb 2009 23:34:12 +0900 (JST)
Subject: [ruby-changes:10792] Ruby:r22359 (trunk): * ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove

akr	2009-02-16 23:34:01 +0900 (Mon, 16 Feb 2009)

  New Revision: 22359

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

  Log:
    * ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
      the last padding to prevent sendmsg failure in test_udp_server in
      test/socket/test_socket.rb.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22358)
+++ ChangeLog	(revision 22359)
@@ -1,3 +1,9 @@
+Mon Feb 16 23:14:51 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
+	  the last padding to prevent sendmsg failure in test_udp_server in
+	  test/socket/test_socket.rb.
+
 Mon Feb 16 21:59:32 2009  Alexander Zavorine  <alexandre.zavorine@n...>
 
 	* symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 22358)
+++ ext/socket/ancdata.c	(revision 22359)
@@ -927,9 +927,11 @@
             MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
 	    last_pad = cspace - cmh->cmsg_len;
         }
+#if !defined(__OpenBSD__)
 	if (last_pad) {
 	    rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
 	}
+#endif
 #else
 	rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
 #endif

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

[前][次][番号順一覧][スレッド一覧]