X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fproc.c;h=e062cd0b7c702494a3992e8bfe1beab2a348113a;hb=e0da56fc7b1dae4e21dfda7e0ac8ad7594135986;hp=54b3919c3374873664d52095cf990eb6f2619bbc;hpb=7f8d0ea5a3e927b8b6dd84eae63849ae17cdf5ae;p=ngircd-alex.git

diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c
index 54b3919c..e062cd0b 100644
--- a/src/ngircd/proc.c
+++ b/src/ngircd/proc.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,7 +79,6 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout
 		signal(SIGALRM, Proc_GenericSignalHandler);
 		close(pipefds[0]);
 		alarm(timeout);
-		Conn_CloseAllSockets();
 		return 0;
 	}
 
@@ -138,14 +137,28 @@ Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen)
 			return 0;
 		Log(LOG_CRIT, "Can't read from child process %ld: %s",
 		    proc->pid, strerror(errno));
+		Proc_Close(proc);
 		bytes_read = 0;
+	} else if (bytes_read == 0) {
+		/* EOF: clean up */
+		LogDebug("Child process %ld: EOF reached, closing pipe.",
+		         proc->pid);
+		Proc_Close(proc);
 	}
-#if DEBUG
-	else if (bytes_read == 0)
-		LogDebug("Can't read from child process %ld: EOF", proc->pid);
-#endif
-	Proc_InitStruct(proc);
 	return (size_t)bytes_read;
 }
 
+/**
+ * Close pipe to a forked child process.
+ */
+GLOBAL void
+Proc_Close(PROC_STAT *proc)
+{
+	/* Close socket, if it exists */
+	if (proc->pipe_fd >= 0)
+		io_close(proc->pipe_fd);
+
+	Proc_InitStruct(proc);
+}
+
 /* -eof- */