forkserver: clean up, do not panic on forkBuffer failure

I've removed the SIGINT trap because the fork server is now in a
separate process group than the main process anyway.  We'll see if this
actually works...

Also realized we weren't closing the fork server's control stream on
fork; now we do.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/local/pager.nim b/src/local/pager.nim
index 13c57f2b..737a13ac 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -2690,19 +2690,23 @@ proc connected2(pager: Pager; container: Container; res: MailcapResult;
       url = newURL(url)
       url.username = ""
       url.password = ""
-    let (pid, fd) = pager.forkserver.forkBuffer(
+    let (pid, cstream) = pager.forkserver.forkBuffer(
       container.config,
       url,
       attrs,
       cmfHTML in res.flags,
       container.charsetStack
     )
-    container.process = pid
-    if container.replace != nil:
-      pager.deleteContainer(container.replace, container.find(ndAny))
-      container.replace = nil
-    pager.connected3(container, newSocketStream(fd), res.ostream,
-      response.outputId, res.ostreamOutputId, cmfRedirected in res.flags)
+    if pid == -1:
+      res.ostream.sclose()
+      pager.fail(container, "Error forking new process for buffer")
+    else:
+      container.process = pid
+      if container.replace != nil:
+        pager.deleteContainer(container.replace, container.find(ndAny))
+        container.replace = nil
+      pager.connected3(container, cstream, res.ostream, response.outputId,
+        res.ostreamOutputId, cmfRedirected in res.flags)
   else:
     dec pager.numload
     pager.deleteContainer(container, container.find(ndAny))