posix-spawn 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f593fc74a9f8637ea2c1dbfa897a805d6f87c0fe
-  data.tar.gz: 89a1a14ec837e06d68e85af34e56e956a976df30
+  metadata.gz: 5e7aaeb2727c0c2d0d4b1055fee451289ddd510b
+  data.tar.gz: 87bcf9d8cc5cd759a6dc985a683b2a6d44dd8152
 SHA512:
-  metadata.gz: 33b05adfe9baf71faabd10e25e434c03e6aac674b4d9d05a6b79e1f8972a34aeacba3bb7b40598355fc9aa4c455049eeb0b3f6c00f7790d906f1ef01bb1799fe
-  data.tar.gz: 75ab91856b7ee41fad74bf2be66096d2667f8fbe888d5c7d67ab364c5033438ceb8e1f1a6b0e9f99cd120da4b65ca9486f2177b1bf4aa51ad7463229102e6dc1
+  metadata.gz: 4f94bf7abd676780045ffb4c7d010cb0cc626d1fe6bbe84fab3126c4764a14f3828266db52f5ffa1eed5827ce0cac988b53f443bf9fed2bfd37110f6b55092f5
+  data.tar.gz: 20f06443465c1b96e06f988ca0c9b74df329cb13bbc0cb132217fa9453d35680e539de59492bfb2fe65bdd37c5c3d2b36a970899fd5fe860a04c0a9206530a09

data/COPYING

@@ -20,9 +20,3 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER  IN  AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN  THE
 SOFTWARE.
-
-A small portion of the environ dup'ing code in ext/posix-spawn.c
-was taken from glibc <http://www.gnu.org/s/libc/> and is maybe
-Copyright (c) 2011 by The Free Software Foundation or maybe
-by others mentioned in the glibc LICENSES file. glibc is
-distributed under the terms of the LGPL license.

data/ext/posix-spawn.c

@@ -269,27 +269,22 @@ each_env_check_i(VALUE key, VALUE val, VALUE arg)
 static int
 each_env_i(VALUE key, VALUE val, VALUE arg)
 {
-	char *name = StringValuePtr(key);
-	size_t len = strlen(name);
+	const char *name = StringValuePtr(key);
+	const size_t name_len = strlen(name);
 
-	/*
-	 * Delete any existing values for this variable before inserting the new value.
-	 * This implementation was copied from glibc's unsetenv().
-	 */
-	char **ep = (char **)arg;
-	while (*ep != NULL)
-		if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-		{
-			/* Found it.  Remove this pointer by moving later ones back.  */
-			char **dp = ep;
-
-			do
-				dp[0] = dp[1];
-			while (*dp++);
-			/* Continue the loop in case NAME appears again.  */
+	char **envp = (char **)arg;
+	size_t i, j;
+
+	for (i = 0; envp[i];) {
+		const char *ev = envp[i];
+
+		if (strlen(ev) > name_len && !memcmp(ev, name, name_len) && ev[name_len] == '=') {
+			for (j = i; envp[j]; ++j)
+				envp[j] = envp[j + 1];
+			continue;
 		}
-		else
-			++ep;
+		i++;
+	}
 
 	/*
 	 * Insert the new value if we have one. We can assume there is space
@@ -301,15 +296,15 @@ each_env_i(VALUE key, VALUE val, VALUE arg)
 		char *cval = StringValuePtr(val);
 
 		size_t cval_len = strlen(cval);
-		size_t ep_len = len + 1 + cval_len + 1; /* +2 for null terminator and '=' separator */
+		size_t ep_len = name_len + 1 + cval_len + 1; /* +2 for null terminator and '=' separator */
 
 		/* find the last entry */
 		while (*ep != NULL) ++ep;
 		*ep = malloc(ep_len);
 
-		strncpy(*ep, name, len);
-		(*ep)[len] = '=';
-		strncpy(*ep + len + 1, cval, cval_len);
+		strncpy(*ep, name, name_len);
+		(*ep)[name_len] = '=';
+		strncpy(*ep + name_len + 1, cval, cval_len);
 		(*ep)[ep_len-1] = 0;
 	}
 
@@ -373,6 +368,7 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 
 		if (RHASH_SIZE(env) > 0) {
 			int size = 0;
+			char **new_env;
 
 			char **curr = environ;
 			if (curr) {
@@ -387,7 +383,7 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 				size = 0;
 			}
 
-			char **new_env = calloc(size+RHASH_SIZE(env)+1, sizeof(char*));
+			new_env = calloc(size+RHASH_SIZE(env)+1, sizeof(char*));
 			for (i = 0; i < size; i++) {
 				new_env[i] = strdup(environ[i]);
 			}

data/lib/posix/spawn/child.rb

@@ -158,7 +158,7 @@ module POSIX
 
         # grab exit status
         @status = waitpid(pid)
-      rescue Object => boom
+      rescue Object
         [stdin, stdout, stderr].each { |fd| fd.close rescue nil }
         if @status.nil?
           if !@pgroup_kill
@@ -197,7 +197,6 @@ module POSIX
       def read_and_write(input, stdin, stdout, stderr, timeout=nil, max=nil)
         max = nil if max && max <= 0
         @out, @err = '', ''
-        offset = 0
 
         # force all string and IO encodings to BINARY under 1.9 for now
         if @out.respond_to?(:force_encoding) and stdin.respond_to?(:set_encoding)

data/lib/posix/spawn/version.rb

@@ -1,5 +1,5 @@
 module POSIX
   module Spawn
-    VERSION = '0.3.11'
+    VERSION = '0.3.12'
   end
 end

data/posix-spawn.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.authors = ['Ryan Tomayko', 'Aman Gupta']
   s.email = ['r@tomayko.com', 'aman@tmm1.net']
-  s.licenses = ['MIT', 'LGPL']
+  s.licenses = ['MIT']
 
   s.add_development_dependency 'rake-compiler', '0.7.6'
   s.add_development_dependency 'minitest', '>= 4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posix-spawn
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -75,7 +75,6 @@ files:
 homepage: https://github.com/rtomayko/posix-spawn
 licenses:
 - MIT
-- LGPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -93,8 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: posix_spawnp(2) for ruby
 test_files: []
+has_rdoc: