@@ -94,6 +94,8 @@ module Cheat run_pager puts sheet.first + ':' puts ' ' + sheet.last.gsub("\r",'').gsub("\n", "\n ").wrap + rescue Errno::EPIPE + # do nothing rescue puts "That didn't work. Maybe try `$ cheat cheat' for help?" # Fix Emacs ruby-mode highlighting bug: `" end @@ -174,6 +176,8 @@ module Cheat unless Kernel.fork # Child process STDOUT.reopen(write) STDERR.reopen(write) + read.close + write.close return end lib/cheat.rb 06d0679bc505777a6b981f529ce035d28ae7d5e3 Kevin Ballard kevin@sb.org http://github.com/nex3/cheat/commit/b35f2288ee74bf15286faafd76297a94cebafeb3 b35f2288ee74bf15286faafd76297a94cebafeb3 2008-03-18T21:42:44-07:00 2008-03-18T21:42:44-07:00 Fix cheat hanging if the pager is quit before consuming all input An easy test of this is with `cheat iana_port_list`. If less is quit immediately, cheat will hang forever due to the improperly closed pipe. But when the pipe is closed properly, it will get an Errno::EPIPE instead, so we have to handle both conditions. 86dae84630b9f560bf9125365e739a16f08d9515 Kevin Ballard kevin@sb.org