norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pty: simplify pty_close()

Browse Source 
The old logic is no longer needed as we use edge-triggered fd notification
now. Therefore, simplify the helpers to make them more readable.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-12-02 13:42:15 +01:00
parent 636c383c68
commit 715287427d
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pty.c
View File

@ -200,24 +200,11 @@ static void sig_child(struct ev_eloop *eloop, struct signalfd_siginfo *info,
static void pty_close(struct kmscon_pty *pty, bool user)
{
bool called = true;
if (!pty || !pty_is_open(pty))
return;
if (pty->efd) {
called = false;
ev_eloop_rm_fd(pty->efd);
pty->efd = NULL;
}
if (!user) {
if (!called)
pty->input_cb(pty, NULL, 0, pty->data);
return;
}
ev_eloop_rm_fd(pty->efd);
pty->efd = NULL;
ev_eloop_unregister_signal_cb(pty->eloop, SIGCHLD, sig_child, pty);
close(pty->fd);
pty->fd = -1;
@ -470,7 +457,7 @@ static void sig_child(struct ev_eloop *eloop, struct signalfd_siginfo *info,
info->ssi_pid, info->ssi_status,
info->ssi_utime, info->ssi_stime);
pty_close(pty, false);
pty->input_cb(pty, NULL, 0, pty->data);
}
int kmscon_pty_open(struct kmscon_pty *pty, unsigned short width,