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

pty: random fixes

Browse Source 
Fix some random coding-style issues and adjust to new eloop-rules.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-03-25 18:37:45 +02:00
parent e0546adcaa
commit 5cdf94711b
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pty.c
View File

@ -260,15 +260,11 @@ static void pty_input(struct ev_fd *fd, int mask, void *data)
ssize_t len;
struct kmscon_pty *pty = data;
if (!pty || pty->fd < 0)
return;
if (mask & (EV_ERR | EV_HUP)) {
if (mask & EV_ERR)
log_warn("error on child pty socket");
else
log_debug("child closed remote end");
if (mask & EV_ERR) {
log_warn("error on child pty socket");
goto err;
} else if (mask & EV_HUP) {
log_debug("child closed remote end");
goto err;
}
@ -295,8 +291,6 @@ static void pty_input(struct ev_fd *fd, int mask, void *data)
return;
err:
ev_eloop_rm_fd(pty->efd);
pty->efd = NULL;
if (pty->input_cb)
pty->input_cb(pty, NULL, 0, pty->data);
}
@ -365,7 +359,7 @@ int kmscon_pty_write(struct kmscon_pty *pty, const char *u8, size_t len)
log_warn("cannot write to child process");
return ret;
}
} else if (ret == len) {
} else if (ret >= len) {
return 0;
} else if (ret > 0) {
len -= ret;