Fixed bug when arguments include stdin: lolcat file1 - file2 > file3

Jacke · Feb 3, 2017 · 512197a · 512197a
1 parent dfc6864
commit 512197a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/lolcat/cat.rb b/lib/lolcat/cat.rb
@@ -100,15 +100,21 @@ def self.cat!
     begin
       files = ARGV.empty? ? [:stdin] : ARGV[0..-1]
       files.each do |file|
-        fd = ARGF if file == '-' or file == :stdin
+        fd = $stdin if file == '-' or file == :stdin
         begin
-          fd = File.open file unless fd == ARGF
+          fd = File.open(file, "r") unless fd == $stdin
 
           if $stdout.tty? or opts[:force]
             Lol.cat fd, opts
           else
-            until fd.eof? do
-              $stdout.write(fd.read(8192))
+            if fd.tty?
+              fd.each do |line|
+                $stdout.write(line)
+              end
+            else
+              until fd.eof? do
+                $stdout.write(fd.read(8192))
+              end
             end
           end
         rescue Errno::ENOENT

diff --git a/lib/lolcat/version.rb b/lib/lolcat/version.rb
@@ -1,3 +1,3 @@
 module Lolcat
-  VERSION = "42.24.0"
+  VERSION = "42.24.1"
 end