sendfile 0.9.2 → 0.9.3

data/ChangeLog

@@ -1,3 +1,9 @@
+* sendfile 0.9.3 - 2008.11.30 <toby@cbcg.net>
+
+  - Included sys/stat.h regardless of platform to fix compilation on 
+    OS X 10.5 (credit: Damon Morda <dmorda@andrew.cmu.edu>)
+  - Source formatting clean-up
+
 * sendfile 0.9.2 - 2006.03.27 <toby@cbcg.net>
 
   - Fixed typo: s/rv_sys_fail/rb_sys_fail

data/LICENSE

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005 Tobias DiPasquale
+Copyright (c) 2005,2008 Tobias DiPasquale
 
 Permission is hereby granted, free of charge, to any person obtaining a 
 copy of this software and associated documentation files (the "Software"),

data/ext/sendfile.c

@@ -1,7 +1,7 @@
 /*
  * ------------------------------------------------------------------------
  *
- * Copyright (c) 2005 Tobias DiPasquale
+ * Copyright (c) 2005,2008 Tobias DiPasquale
  *
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,8 @@
  *
  * $Id: sendfile.c,v 1.4 2006/03/27 19:14:53 codeslinger Exp $
  */
+#include <sys/stat.h>
+#include <sys/types.h>
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
@@ -38,59 +40,53 @@
 
 #if defined(RUBY_PLATFORM_FREEBSD)
 # include <sys/socket.h>
-# include <sys/stat.h>
-# include <sys/types.h>
 # include <sys/uio.h>
 #elif defined(RUBY_PLATFORM_LINUX)
 # include <sys/sendfile.h>
-# include <sys/stat.h>
-# include <sys/types.h>
 # include <unistd.h>
 #elif defined(RUBY_PLATFORM_SOLARIS)
 # include <sys/sendfile.h>
-# include <sys/stat.h>
-# include <sys/types.h>
 #endif
 
 #define SENDFILE_PAUSE_SEC 	0
 #define SENDFILE_PAUSE_USEC	500
 
 #if defined(RUBY_PLATFORM_FREEBSD)
-static off_t __sendfile( int out, int in, off_t off, size_t count, struct timeval *tv)
+static off_t __sendfile(int out, int in, off_t off, size_t count, struct timeval *tv)
 {
 	int rv;
 	off_t written, initial = off;
 
 	while (1) {
 		TRAP_BEG;
-		rv = sendfile( in, out, off, count, NULL, &written, 0);
+		rv = sendfile(in, out, off, count, NULL, &written, 0);
 		TRAP_END;
 		off += written;
 		count -= written;
 		if (rv < 0 && errno != EAGAIN)
-			rb_sys_fail( "sendfile");
+			rb_sys_fail("sendfile");
 		if (!rv)
 			break;
-		rb_thread_select( 0, NULL, NULL, NULL, tv);
+		rb_thread_select(0, NULL, NULL, NULL, tv);
 	}
 	return off - initial;
 }
 #else
-static size_t __sendfile( int out, int in, off_t off, size_t count, struct timeval *tv)
+static size_t __sendfile(int out, int in, off_t off, size_t count, struct timeval *tv)
 {
 	ssize_t rv, remaining = count;
 	
 	while (1) {
 		TRAP_BEG;
-		rv = sendfile( out, in, &off, remaining);
+		rv = sendfile(out, in, &off, remaining);
 		TRAP_END;
 		if (rv < 0 && errno != EAGAIN)
-			rb_sys_fail( "sendfile");
+			rb_sys_fail("sendfile");
 		if (rv > 0)
 			remaining -= rv;
 		if (!remaining)
 			break;
-		rb_thread_select( 0, NULL, NULL, NULL, tv);
+		rb_thread_select(0, NULL, NULL, NULL, tv);
 	}
 	return count;
 }
@@ -110,7 +106,7 @@ static size_t __sendfile( int out, int in, off_t off, size_t count, struct timev
  * exception on error. (check man sendfile(2) on your platform for 
  * information on what errors could result and how to handle them)
  */
-static VALUE rb_io_sendfile( int argc, VALUE *argv, VALUE self)
+static VALUE rb_io_sendfile(int argc, VALUE *argv, VALUE self)
 {
 	int i, o;
 	size_t c;
@@ -120,42 +116,42 @@ static VALUE rb_io_sendfile( int argc, VALUE *argv, VALUE self)
 	struct timeval _sendfile_sleep;
 
 	/* get fds for files involved to pass to sendfile(2) */
-	rb_scan_args( argc, argv, "12", &in, &offset, &count);
-	if (TYPE( in) != T_FILE)
-		rb_raise( rb_eArgError, "invalid first argument\n");
-	GetOpenFile( self, optr);
-	GetOpenFile( in, iptr);
-	o = fileno( optr->f);
-	i = fileno( iptr->f);
+	rb_scan_args(argc, argv, "12", &in, &offset, &count);
+	if (TYPE(in) != T_FILE)
+		rb_raise(rb_eArgError, "invalid first argument\n");
+	GetOpenFile(self, optr);
+	GetOpenFile(in, iptr);
+	o = fileno(optr->f);
+	i = fileno(iptr->f);
 
 	_sendfile_sleep.tv_sec = SENDFILE_PAUSE_SEC;
 	_sendfile_sleep.tv_usec = SENDFILE_PAUSE_USEC;
 	
 	/* determine offset and count parameters */
-	off = (NIL_P( offset)) ? 0 : NUM2ULONG( offset);
-	if (NIL_P( count)) {
+	off = (NIL_P(offset)) ? 0 : NUM2ULONG(offset);
+	if (NIL_P(count)) {
 		/* FreeBSD's sendfile() can take 0 as an indication to send
 		 * until end of file, but Linux and Solaris can't, and anyway 
 		 * we need the file size to ensure we send it all in the case
 		 * of a non-blocking fd */
 		struct stat s;
-		if (fstat( i, &s) == -1)
-			rb_sys_fail( "sendfile");
+		if (fstat(i, &s) == -1)
+			rb_sys_fail("sendfile");
 		c = s.st_size;
 		c -= off;
 	} else {
-		c = NUM2ULONG( count);
+		c = NUM2ULONG(count);
 	}
 
 	/* now send the file */
-	return INT2FIX( __sendfile( o, i, off, c, &_sendfile_sleep));
+	return INT2FIX(__sendfile(o, i, off, c, &_sendfile_sleep));
 }
 
 /* Interface to the UNIX sendfile(2) system call. Should work on FreeBSD,
  * Linux and Solaris systems that support the sendfile(2) system call.
  */
-void Init_sendfile( void)
+void Init_sendfile(void)
 {
-	rb_define_method( rb_cIO, "sendfile", rb_io_sendfile, -1);
+	rb_define_method(rb_cIO, "sendfile", rb_io_sendfile, -1);
 }
 

data/sendfile.gemspec

@@ -2,7 +2,7 @@
 
 spec = Gem::Specification.new do |gs|
 	gs.name = 'sendfile'
-	gs.version = '0.9.2'
+	gs.version = '0.9.3'
 	gs.summary = 'Ruby interface to sendfile(2) system call'
 	gs.description = <<-EOF
 Allows Ruby programs to access sendfile(2) functionality on 
@@ -14,12 +14,12 @@ EOF
 	gs.rubyforge_project = 'ruby-sendfile'
 
 	gs.autorequire = 'sendfile'
-	gs.files = File.read( 'FILES').split( $/)
+	gs.files = File.read('FILES').split($/)
 	gs.test_files = Dir.glob 'test/test_*.rb'
 	gs.extensions << 'ext/extconf.rb'
 
 	gs.has_rdoc = true
-	gs.extra_rdoc_files = %w( README )
+	gs.extra_rdoc_files = %w(README)
 	gs.required_ruby_version = '>= 1.8.0'
 end
 

metadata

@@ -1,32 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: sendfile
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2006-03-27 00:00:00 -05:00
-summary: Ruby interface to sendfile(2) system call
-require_paths: 
-- lib
-email: toby@cbcg.net
-homepage: 
-rubyforge_project: ruby-sendfile
-description: Allows Ruby programs to access sendfile(2) functionality on  any IO object. Works on Linux, Solaris and FreeBSD with  blocking and non-blocking sockets.
-autorequire: sendfile
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 0.9.3
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Toby DiPasquale
+autorequire: sendfile
+bindir: bin
+cert_chain: []
+
+date: 2008-11-30 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: Allows Ruby programs to access sendfile(2) functionality on  any IO object. Works on Linux, Solaris and FreeBSD with  blocking and non-blocking sockets.
+email: toby@cbcg.net
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- README
 files: 
 - FILES
 - README
@@ -38,17 +32,31 @@ files:
 - test/large.gz
 - test/small
 - sendfile.gemspec
-test_files: 
-- test/test_sendfile.rb
+has_rdoc: true
+homepage: 
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-sendfile
+rubygems_version: 1.3.0
+signing_key: 
+specification_version: 2
+summary: Ruby interface to sendfile(2) system call
+test_files: 
+- test/test_sendfile.rb