===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/job.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/usr.bin/tmux/job.c	2010/10/16 08:31:55	1.21
+++ src/usr.bin/tmux/job.c	2011/01/08 01:52:36	1.22
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.21 2010/10/16 08:31:55 nicm Exp $ */
+/* $OpenBSD: job.c,v 1.22 2011/01/08 01:52:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -137,7 +137,7 @@
 int
 job_run(struct job *job)
 {
-	int	nullfd, out[2], mode;
+	int	nullfd, out[2];
 
 	if (job->fd != -1 || job->pid != -1)
 		return (0);
@@ -177,10 +177,7 @@
 		close(out[1]);
 
 		job->fd = out[0];
-		if ((mode = fcntl(job->fd, F_GETFL)) == -1)
-			fatal("fcntl failed");
-		if (fcntl(job->fd, F_SETFL, mode|O_NONBLOCK) == -1)
-			fatal("fcntl failed");
+		setblocking(job->fd, 0);
 
 		if (job->event != NULL)
 			bufferevent_free(job->event);