Sync OpenBSD patchset 493:

Switch jobs over to use a bufferevent.

1 files changed, 3 insertions, 5 deletions

diff --git a/server.c b/server.c
index a31603c4..8f85cd88 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.217 2009-11-08 22:40:36 tcunha Exp $ */
+/* $Id: server.c,v 1.218 2009-11-08 22:56:04 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -218,14 +218,12 @@ server_loop(void)
 	while (!server_should_shutdown()) {
 		server_update_socket();
 
-		server_job_prepare();
 		server_window_prepare();
 		server_client_prepare();
 
 		event_loopexit(&tv);
 		event_loop(EVLOOP_ONCE);
 
-		server_job_loop();
 		server_window_loop();
 		server_client_loop();
 
@@ -474,8 +472,8 @@ server_child_exited(pid_t pid, int status)
 
 	SLIST_FOREACH(job, &all_jobs, lentry) {
 		if (pid == job->pid) {
-			job->pid = -1;
-			job->status = status;
+			job_died(job, status);	/* might free job */
+			break;
 		}
 	}
 }