From dd36982ad51632bc47ce7b73cad0696e85d593c3 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 8 Nov 2009 22:40:36 +0000 Subject: Sync OpenBSD patchset 491: Initial changes to move tmux to libevent. This moves the client-side loops are pretty much fully over to event-based only (tmux.c and client.c) but server-side (server.c and friends) treats libevent as a sort of clever poll, waking up after every event to run various things. Moving the server stuff over to bufferevents and timers and so on will come later. --- job.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'job.c') diff --git a/job.c b/job.c index cd263325..3520752b 100644 --- a/job.c +++ b/job.c @@ -1,4 +1,4 @@ -/* $Id: job.c,v 1.9 2009-11-02 21:38:26 tcunha Exp $ */ +/* $Id: job.c,v 1.10 2009-11-08 22:40:36 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -86,6 +86,7 @@ job_add(struct jobs *jobs, int flags, struct client *c, const char *cmd, job->fd = -1; job->out = buffer_create(BUFSIZ); + memset(&job->event, 0, sizeof job->event); job->callbackfn = callbackfn; job->freefn = freefn; @@ -125,6 +126,7 @@ job_free(struct job *job) close(job->fd); if (job->out != NULL) buffer_destroy(job->out); + event_del(&job->event); xfree(job); } @@ -146,7 +148,7 @@ job_run(struct job *job) case -1: return (-1); case 0: /* child */ - sigreset(); + server_signal_clear(); /* XXX environ? */ if (dup2(out[1], STDOUT_FILENO) == -1) -- cgit