---

yaml
---
r: 14675
b: refs/heads/try
c: b8c8e43
h: refs/heads/master
i:
  14673: 8ce6e96
  14671: fdc8c37
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fc9b55d65f4854e22321095ae07d1ba9d39fe86d
+refs/heads/try: b8c8e43381b2b5814ca4965d2e883f78a771f262
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/markdown_writer.rs

@@ -100,17 +100,40 @@ fn pandoc_writer(
         os::close(pipe_out.out);
         os::close(pipe_err.out);
         os::close(pipe_in.out);
-        os::close(pipe_out.in);
-        os::close(pipe_err.in);
+
+        let stdout = result::get(task::try {||
+            readclose(pipe_out.in)
+        });
+        let stderr = result::get(task::try {||
+            readclose(pipe_err.in)
+        });
 
         let status = run::waitpid(pid);
         #debug("pandoc result: %i", status);
         if status != 0 {
+            #error("pandoc-out: %s", stdout);
+            #error("pandoc-err: %s", stderr);
             fail "pandoc failed";
         }
     }
 }
 
+fn readclose(fd: ctypes::fd_t) -> str {
+    import std::os;
+    import std::io;
+
+    // Copied from run::program_output
+    let file = os::fd_FILE(fd);
+    let reader = io::FILE_reader(file, false);
+    let buf = "";
+    while !reader.eof() {
+        let bytes = reader.read_bytes(4096u);
+        buf += str::from_bytes(bytes);
+    }
+    os::fclose(file);
+    ret buf;
+}
+
 fn generic_writer(process: fn~(markdown: str)) -> writer {
     let ch = task::spawn_listener {|po: comm::port<writeinstr>|
         let markdown = "";