Changeset 1213

Timestamp:

10/16/09 03:17:43 (5 weeks ago)

Author:

vasi

Message:

No zombies

Files:

• bin/sshjour (modified) (3 diffs)

bin/sshjour

@@ -1 +1 @@
 #!/usr/bin/ruby
 
+# Bonjour host + port; fallback host + port
 host, port, alternative, altport = ARGV
 host = host + '.local'
 
+# Default to fallback
 found, fport = alternative, altport
 
@@ -9 +11 @@
 IO.popen('-') do |pipe|
         if pipe # parent
-                fork { sleep 1; Process.kill 'ALRM', pipe.pid rescue nil } # timeout
+                # Timeout if reading hangs
+                alarm = fork do
+                        begin
+                                sleep 1
+                                Process.kill 'ALRM', pipe.pid
+                        rescue Exception => e
+                                # That's ok!
+                        end
+                end
                 key = pipe.read
                 
+                # No zombie
+                Process.kill('INT', alarm)
+                Process.wait(alarm)
+                
+                # Did we succeed, or timeout, or what?
                 Process.wait(pipe.pid)
                 if $?.success?
+                        # Is it the key we're looking for?
                         known = IO.readlines(ENV['HOME'] + '/.ssh/known_hosts')
                         found, fport = host, port if known.include?(key)
                 end
-        else
+        else # child
                 $stderr.close
                 exec 'ssh-keyscan', host
@@ -28 +44 @@
 end
 
-#puts found
+# Make ourself into a connection
 exec('nc', found, fport || '22')