Fix Process.exec spec failures

jfirebaugh · Apr 3, 2012 · 09f2432 · 09f2432
1 parent 717d560
commit 09f2432
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 22 deletions.
diff --git a/kernel/common/process18.rb b/kernel/common/process18.rb
@@ -2,10 +2,11 @@ module Process
   def self.exec(cmd, *args)
     if args.empty? and cmd.kind_of? String
       raise Errno::ENOENT if cmd.empty?
-      if /([*?{}\[\]<>()~&|$;'`"\n\s]|[^\w-])/o.match(cmd)
+      if /([*?{}\[\]<>()~&|$;'`"\n])/o.match(cmd)
         Process.perform_exec "/bin/sh", ["sh", "-c", cmd]
       else
-        Process.perform_exec cmd, [cmd]
+        args = cmd.split(' ')
+        Process.perform_exec args.first, args
       end
     else
       if cmd.kind_of? Array

diff --git a/kernel/common/process19.rb b/kernel/common/process19.rb
@@ -32,10 +32,11 @@ def self.exec(environment_or_cmd, *args)
 
     if args.empty? and cmd.kind_of? String
       raise Errno::ENOENT if cmd.empty?
-      if /([*?{}\[\]<>()~&|$;'`"\n\s]|[^\w-])/o.match(cmd)
+      if /([*?{}\[\]<>()~&|$;'`"\n])/o.match(cmd)
         Process.perform_exec "/bin/sh", ["sh", "-c", cmd]
       else
-        Process.perform_exec cmd, [cmd]
+        args = cmd.split(' ')
+        Process.perform_exec args.first, args
       end
     else
       if cmd.kind_of? Array

diff --git a/spec/tags/18/ruby/core/kernel/exec_tags.txt b/spec/tags/18/ruby/core/kernel/exec_tags.txt
diff --git a/spec/tags/18/ruby/core/process/exec_tags.txt b/spec/tags/18/ruby/core/process/exec_tags.txt
diff --git a/spec/tags/19/ruby/core/kernel/exec_tags.txt b/spec/tags/19/ruby/core/kernel/exec_tags.txt
diff --git a/spec/tags/19/ruby/core/process/exec_tags.txt b/spec/tags/19/ruby/core/process/exec_tags.txt