kgio 1.2.0 → 1.2.1

data/.document

@@ -6,4 +6,8 @@ ChangeLog
 ISSUES
 HACKING
 lib
+ext/kgio/accept.c
+ext/kgio/connect.c
 ext/kgio/kgio_ext.c
+ext/kgio/read_write.c
+ext/kgio/wait.c

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.2.0.GIT
+DEF_VER=v1.2.1.GIT
 
 LF='
 '

data/GNUmakefile

@@ -155,7 +155,7 @@ ext := ext/kgio/kgio_ext.$(DLEXT)
 ext/kgio/Makefile: ext/kgio/extconf.rb
 	cd $(@D) && $(RUBY) extconf.rb
 
-$(ext): ext/kgio/kgio_ext.c ext/kgio/Makefile
+$(ext): $(wildcard ext/kgio/*.[ch] ext/kgio/*/*.h) ext/kgio/Makefile
 	$(MAKE) -C $(@D)
 
 all:: test

data/ext/kgio/accept.c

@@ -283,7 +283,7 @@ static VALUE get_nonblock(VALUE mod)
  * call-seq:
  *
  *	Kgio.accept_cloexec = true
- *	Kgio.accept_clocexec = false
+ *	Kgio.accept_cloexec = false
  *
  * Sets whether or not Kgio::Socket objects created by
  * TCPServer#kgio_accept,
@@ -341,9 +341,10 @@ static VALUE set_nonblock(VALUE mod, VALUE boolean)
 	return Qnil;
 }
 
-void init_kgio_accept(VALUE mKgio)
+void init_kgio_accept(void)
 {
 	VALUE cUNIXServer, cTCPServer;
+	VALUE mKgio = rb_define_module("Kgio");
 
 	localhost = rb_const_get(mKgio, rb_intern("LOCALHOST"));
 	cKgio_Socket = rb_const_get(mKgio, rb_intern("Socket"));

data/ext/kgio/connect.c

@@ -223,8 +223,9 @@ static VALUE kgio_start(VALUE klass, VALUE addr)
 	return stream_connect(klass, addr, 0);
 }
 
-void init_kgio_connect(VALUE mKgio)
+void init_kgio_connect(void)
 {
+	VALUE mKgio = rb_define_module("Kgio");
 	VALUE cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
 	VALUE mSocketMethods = rb_const_get(mKgio, rb_intern("SocketMethods"));
 	VALUE cKgio_Socket, cTCPSocket, cUNIXSocket;

data/ext/kgio/kgio.h

@@ -29,10 +29,10 @@ struct io_args {
 	int fd;
 };
 
-void init_kgio_wait(VALUE mKgio);
-void init_kgio_read_write(VALUE mKgio);
-void init_kgio_accept(VALUE mKgio);
-void init_kgio_connect(VALUE mKgio);
+void init_kgio_wait(void);
+void init_kgio_read_write(void);
+void init_kgio_accept(void);
+void init_kgio_connect(void);
 
 void kgio_wait_writable(VALUE io, int fd);
 void kgio_wait_readable(VALUE io, int fd);

data/ext/kgio/kgio_ext.c

@@ -2,10 +2,8 @@
 
 void Init_kgio_ext(void)
 {
-	VALUE mKgio = rb_const_get(rb_cObject, rb_intern("Kgio"));
-
-	init_kgio_wait(mKgio);
-	init_kgio_read_write(mKgio);
-	init_kgio_connect(mKgio);
-	init_kgio_accept(mKgio);
+	init_kgio_wait();
+	init_kgio_read_write();
+	init_kgio_connect();
+	init_kgio_accept();
 }

data/ext/kgio/missing/accept4.h

@@ -33,8 +33,12 @@ accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)
 		if ((flags & SOCK_NONBLOCK) == SOCK_NONBLOCK) {
 			int fl = fcntl(fd, F_GETFL);
 
-			if ((fl & O_NONBLOCK) == 0)
-				(void)fcntl(fd, F_SETFL, fl | O_NONBLOCK);
+			/*
+			 * unconditional, OSX 10.4 (and maybe other *BSDs)
+			 * F_GETFL returns a false O_NONBLOCK with TCP sockets
+			 * (but not UNIX sockets) [ruby-talk:274079]
+			 */
+			(void)fcntl(fd, F_SETFL, fl | O_NONBLOCK);
 		}
 
 		/*

data/ext/kgio/read_write.c

@@ -340,9 +340,10 @@ static VALUE kgio_trysend(VALUE io, VALUE str)
 #  define kgio_trysend kgio_trywrite
 #endif /* ! USE_MSG_DONTWAIT */
 
-void init_kgio_read_write(VALUE mKgio)
+void init_kgio_read_write(void)
 {
 	VALUE mPipeMethods, mSocketMethods;
+	VALUE mKgio = rb_define_module("Kgio");
 
 	mKgio_WaitReadable = rb_const_get(mKgio, rb_intern("WaitReadable"));
 	mKgio_WaitWritable = rb_const_get(mKgio, rb_intern("WaitWritable"));

data/ext/kgio/wait.c

@@ -106,8 +106,10 @@ static VALUE wait_rd(VALUE mod)
 	return io_wait_rd ? ID2SYM(io_wait_rd) : Qnil;
 }
 
-void init_kgio_wait(VALUE mKgio)
+void init_kgio_wait(void)
 {
+	VALUE mKgio = rb_define_module("Kgio");
+
 	rb_define_singleton_method(mKgio, "wait_readable=", set_wait_rd, 1);
 	rb_define_singleton_method(mKgio, "wait_writable=", set_wait_wr, 1);
 	rb_define_singleton_method(mKgio, "wait_readable", wait_rd, 0);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +00:00
+date: 2010-10-07 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +38,11 @@ extra_rdoc_files:
 - ISSUES
 - HACKING
 - lib/kgio.rb
+- ext/kgio/accept.c
+- ext/kgio/connect.c
 - ext/kgio/kgio_ext.c
+- ext/kgio/read_write.c
+- ext/kgio/wait.c
 files: 
 - .document
 - .gitignore