1 files changed, 71 insertions, 80 deletions

diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb
index 8b1cba98c8..af22ed90d7 100644
--- a/lib/shell/system-command.rb
+++ b/lib/shell/system-command.rb
@@ -1,13 +1,13 @@
+# frozen_string_literal: false
 #
-#   shell/system-command.rb - 
-#   	$Release Version: 0.6.0 $
-#   	$Revision: 1.2.2.1 $
-#   	$Date: 2004/03/21 12:21:11 $
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#   shell/system-command.rb -
+#       $Release Version: 0.7 $
+#       $Revision$
+#       by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 # --
 #
-#   
+#
 #
 
 require "shell/filter"
@@ -16,13 +16,13 @@ class Shell
   class SystemCommand < Filter
     def initialize(sh, command, *opts)
       if t = opts.find{|opt| !opt.kind_of?(String) && opt.class}
-	Shell.Fail Error::TypeError, t.class, "String"
+        Shell.Fail TypeError, t.class, "String"
       end
       super(sh)
       @command = command
       @opts = opts
-      
-      @input_queue = Queue.new
+
+      @input_queue = Thread::Queue.new
       @pid = nil
 
       sh.process_controller.add_schedule(self)
@@ -42,17 +42,20 @@ class Shell
     def input=(inp)
       super
       if active?
-	start_export
+        start_export
       end
     end
 
     def start
+      notify([@command, *@opts].join(" "))
+
       @pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
-	Dir.chdir @shell.pwd
-	exec(@command, *@opts)
+        Dir.chdir @shell.pwd
+        $0 = @command
+        exec(@command, *@opts)
       }
       if @input
-	start_export
+        start_export
       end
       start_import
     end
@@ -63,105 +66,93 @@ class Shell
 
     def terminate
       begin
-	@pipe_in.close
+        @pipe_in.close
       rescue IOError
       end
       begin
-	@pipe_out.close
+        @pipe_out.close
       rescue IOError
       end
     end
 
     def kill(sig)
       if @pid
-	Process.kill(sig, @pid)
+        Process.kill(sig, @pid)
       end
     end
 
-
     def start_import
-#      Thread.critical = true
       notify "Job(%id) start imp-pipe.", @shell.debug?
-      rs = @shell.record_separator unless rs
       _eop = true
-#      Thread.critical = false
-      th = Thread.start {
-	Thread.critical = true
-	begin
-	  Thread.critical = false
-	  while l = @pipe_in.gets
-	    @input_queue.push l
-	  end
-	  _eop = false
-	rescue Errno::EPIPE
-	  _eop = false
-	ensure
-	  if _eop
-	    notify("warn: Process finishing...",
-		   "wait for Job[%id] to finish pipe importing.",
-		   "You can use Shell#transact or Shell#check_point for more safe execution.")
-#	    Tracer.on
-	    Thread.current.run
-	    redo
-	  end
-	  Thread.exclusive do
-	    notify "job(%id}) close imp-pipe.", @shell.debug?
-	    @input_queue.push :EOF
-	    @pipe_in.close
-	  end
-	end
+      Thread.start {
+        begin
+          while l = @pipe_in.gets
+            @input_queue.push l
+          end
+          _eop = false
+        rescue Errno::EPIPE
+          _eop = false
+        ensure
+          if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
+            notify("warn: Process finishing...",
+                   "wait for Job[%id] to finish pipe importing.",
+                   "You can use Shell#transact or Shell#check_point for more safe execution.")
+            redo
+          end
+          notify "job(%id}) close imp-pipe.", @shell.debug?
+          @input_queue.push :EOF
+          @pipe_in.close
+        end
       }
     end
 
     def start_export
       notify "job(%id) start exp-pipe.", @shell.debug?
       _eop = true
-      th = Thread.start{
-	Thread.critical = true
-	begin
-	  Thread.critical = false
-	  @input.each{|l| @pipe_out.print l}
-	  _eop = false
-	rescue Errno::EPIPE
-	  _eop = false
-	ensure
-	  if _eop
-	    notify("shell: warn: Process finishing...",
-		   "wait for Job(%id) to finish pipe exporting.",
-		   "You can use Shell#transact or Shell#check_point for more safe execution.")
-#	    Tracer.on
-	    redo
-	  end
-	  Thread.exclusive do
-	    notify "job(%id) close exp-pipe.", @shell.debug?
-	    @pipe_out.close
-	  end
-	end
+      Thread.start{
+        begin
+          @input.each do |l|
+            ProcessController::block_output_synchronize do
+              @pipe_out.print l
+            end
+          end
+          _eop = false
+        rescue Errno::EPIPE, Errno::EIO
+          _eop = false
+        ensure
+          if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
+            notify("shell: warn: Process finishing...",
+                   "wait for Job(%id) to finish pipe exporting.",
+                   "You can use Shell#transact or Shell#check_point for more safe execution.")
+            redo
+          end
+          notify "job(%id) close exp-pipe.", @shell.debug?
+          @pipe_out.close
+        end
       }
     end
 
     alias super_each each
     def each(rs = nil)
       while (l = @input_queue.pop) != :EOF
-	yield l
+        yield l
       end
     end
 
     # ex)
-    #    if you wish to output: 
-    #	    "shell: job(#{@command}:#{@pid}) close pipe-out."
-    #	 then 
-    #	    mes: "job(%id) close pipe-out."
+    #    if you wish to output:
+    #       "shell: job(#{@command}:#{@pid}) close pipe-out."
+    #    then
+    #       mes: "job(%id) close pipe-out."
     #    yorn: Boolean(@shell.debug? or @shell.verbose?)
-    def notify(*opts, &block)
-      Thread.exclusive do
-	@shell.notify(*opts) {|mes|
-	  yield mes if iterator?
-
-	  mes.gsub!("%id", "#{@command}:##{@pid}")
-	  mes.gsub!("%name", "#{@command}")
-	  mes.gsub!("%pid", "#{@pid}")
-	}
+    def notify(*opts)
+      @shell.notify(*opts) do |mes|
+        yield mes if iterator?
+
+        mes.gsub!("%id", "#{@command}:##{@pid}")
+        mes.gsub!("%name", "#{@command}")
+        mes.gsub!("%pid", "#{@pid}")
+        mes
       end
     end
   end