mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: Improve error handling in tty_create()

Browse Source 
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl
2012-03-28 22:36:10 +02:00
committed by Kristian Høgsberg
parent c97af923d9
commit 29a9cf0f97
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tty.c
+25 -3
View File
@@ -152,12 +152,13 @@ tty_create(struct weston_compositor *compositor, tty_vt_func_t vt_func,
if (tty->fd <= 0) { if (tty->fd <= 0) {
fprintf(stderr, "failed to open tty: %m\n"); fprintf(stderr, "failed to open tty: %m\n");
free(tty);
return NULL; return NULL;
} }
if (tcgetattr(tty->fd, &tty->terminal_attributes) < 0) { if (tcgetattr(tty->fd, &tty->terminal_attributes) < 0) {
fprintf(stderr, "could not get terminal attributes: %m\n"); fprintf(stderr, "could not get terminal attributes: %m\n");
return NULL; goto err;
} }
/* Ignore control characters and disable echo */ /* Ignore control characters and disable echo */
@@ -174,11 +175,13 @@ tty_create(struct weston_compositor *compositor, tty_vt_func_t vt_func,
tty->input_source = tty->input_source =
wl_event_loop_add_fd(loop, tty->fd, wl_event_loop_add_fd(loop, tty->fd,
WL_EVENT_READABLE, on_tty_input, tty); WL_EVENT_READABLE, on_tty_input, tty);
if (!tty->input_source)
goto err_attr;
ret = ioctl(tty->fd, KDSETMODE, KD_GRAPHICS); ret = ioctl(tty->fd, KDSETMODE, KD_GRAPHICS);
if (ret) { if (ret) {
fprintf(stderr, "failed to set KD_GRAPHICS mode on tty: %m\n"); fprintf(stderr, "failed to set KD_GRAPHICS mode on tty: %m\n");
return NULL; goto err_input_source;
} }
tty->has_vt = 1; tty->has_vt = 1;
@@ -187,13 +190,32 @@ tty_create(struct weston_compositor *compositor, tty_vt_func_t vt_func,
mode.acqsig = SIGUSR1; mode.acqsig = SIGUSR1;
if (ioctl(tty->fd, VT_SETMODE, &mode) < 0) { if (ioctl(tty->fd, VT_SETMODE, &mode) < 0) {
fprintf(stderr, "failed to take control of vt handling\n"); fprintf(stderr, "failed to take control of vt handling\n");
return NULL; goto err_kdmode;
} }
tty->vt_source = tty->vt_source =
wl_event_loop_add_signal(loop, SIGUSR1, vt_handler, tty); wl_event_loop_add_signal(loop, SIGUSR1, vt_handler, tty);
if (!tty->vt_source)
goto err_vtmode;
return tty; return tty;
err_vtmode:
ioctl(tty->fd, VT_SETMODE, &mode);
err_kdmode:
ioctl(tty->fd, KDSETMODE, KD_TEXT);
err_input_source:
wl_event_source_remove(tty->input_source);
err_attr:
tcsetattr(tty->fd, TCSANOW, &tty->terminal_attributes);
err:
close(tty->fd);
free(tty);
return NULL;
} }
void void