===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- src/usr.bin/tmux/server.c	2009/10/11 07:01:10	1.52
+++ src/usr.bin/tmux/server.c	2009/10/11 07:20:16	1.53
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.52 2009/10/11 07:01:10 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.53 2009/10/11 07:20:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -88,6 +88,7 @@
 void		 server_check_redraw(struct client *);
 void		 server_set_title(struct client *);
 void		 server_check_timers(struct client *);
+void		 server_check_jobs(void);
 void		 server_lock_server(void);
 void		 server_lock_sessions(void);
 void		 server_check_clients(void);
@@ -370,7 +371,8 @@
 			sigusr1 = 0;
 		}
 
-		/* Process client actions. */
+		/* Collect any jobs that have died and process clients. */
+		server_check_jobs();
 		server_check_clients();
 
 		/* Initialise pollfd array and add server socket. */
@@ -389,7 +391,6 @@
 
 		/* Do the poll. */
 		pfds = server_poll_flatten(&nfds);
-		log_debug("polling %d", nfds);
 		if (poll(pfds, nfds, xtimeout) == -1) {
 			if (errno == EAGAIN || errno == EINTR)
 				continue;
@@ -510,6 +511,7 @@
 {
 	struct window		*w;
 	struct window_pane	*wp;
+	struct job		*job;
 	int		 	 status;
 	pid_t		 	 pid;
 	u_int		 	 i;
@@ -523,8 +525,15 @@
 		case 0:
 			return;
 		}
-		if (!WIFSTOPPED(status))
+		if (!WIFSTOPPED(status)) {
+			SLIST_FOREACH(job, &all_jobs, lentry) {
+				if (pid == job->pid) {
+					job->pid = -1;
+					job->status = status;
+				}
+			}
 			continue;
+		}
 		if (WSTOPSIG(status) == SIGTTIN || WSTOPSIG(status) == SIGTTOU)
 			continue;
 
@@ -792,9 +801,22 @@
 		if (buffer_poll(pfd, job->out, NULL) != 0) {
 			close(job->fd);
 			job->fd = -1;
-			if (job->callbackfn != NULL)
-				job->callbackfn(job);
 		}
+	}
+}
+
+/* Handle job fds. */
+void
+server_check_jobs(void)
+{
+	struct job	*job;
+
+	SLIST_FOREACH(job, &all_jobs, lentry) {
+		if (job->flags & JOB_DONE || job->fd != -1 || job->pid != -1)
+			continue;
+		if (job->callbackfn != NULL)
+			job->callbackfn(job);
+		job->flags |= JOB_DONE;
 	}
 }