Changeset 3383 for src/Main.hs

Timestamp:

05/18/05 10:52:42 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4972

Message:

* Gruber reports that getContents was closing stdin, rendering

echo '"x" /y/' | ./pugs -

unusable. Fixed.

Files:

• src/Main.hs (modified) (2 diffs)

src/Main.hs

@@ -81 +81 @@
 
 run (("-e"):prog:args)          = do doRun "-e" args prog
-run ("-":args)                  = do
-                                    prog <- getContents
-                                    doRun "-" args prog
+run ("-":args)                  = do doRun "-" args =<< readStdin
 run (file:args)                 = readFile file >>= doRun file args
 run []                          = do
@@ -90 +88 @@
         then do banner >> intro >> repLoop
         else run ["-"]
+
+readStdin = do
+    eof     <- isEOF
+    if eof then return [] else do
+    ch      <- getChar
+    rest    <- readStdin
+    return (ch:rest)
 
 -- convenience functions for GHCi