Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 23:07:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Added more error handling of terminal calls

Browse source 
Also removed duplicate terminal flushing calls.
This commit is contained in:
Martin Lund 2016-06-10 18:08:23 +02:00
parent 61655faaa8
commit 80cd28bbb6
1 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/tty.c
View file

@ -123,6 +123,8 @@ void handle_command_sequence(char input_char, char previous_char, char *output_c
void stdout_configure(void) void stdout_configure(void)
{ {
int status;
/* Save current stdout settings */ /* Save current stdout settings */
if (tcgetattr(STDOUT_FILENO, &old_stdout) < 0) if (tcgetattr(STDOUT_FILENO, &old_stdout) < 0)
{ {
@ -144,8 +146,12 @@ void stdout_configure(void)
new_stdout.c_cc[VMIN] = 1; /* Blocking read until 1 character received */ new_stdout.c_cc[VMIN] = 1; /* Blocking read until 1 character received */
/* Activate new stdout settings */ /* Activate new stdout settings */
tcsetattr(STDOUT_FILENO, TCSANOW, &new_stdout); status = tcsetattr(STDOUT_FILENO, TCSANOW, &new_stdout);
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &new_stdout); if (status == -1)
{
error_printf("Could not apply new stdout settings (%s)", strerror(errno));
exit(EXIT_FAILURE);
}
/* Print launch hints */ /* Print launch hints */
tio_printf("tio v%s", VERSION); tio_printf("tio v%s", VERSION);
@ -158,11 +164,11 @@ void stdout_configure(void)
void stdout_restore(void) void stdout_restore(void)
{ {
tcsetattr(STDOUT_FILENO, TCSANOW, &old_stdout); tcsetattr(STDOUT_FILENO, TCSANOW, &old_stdout);
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &old_stdout);
} }
void tty_configure(void) void tty_configure(void)
{ {
int status;
speed_t baudrate; speed_t baudrate;
memset(&tio, 0, sizeof(tio)); memset(&tio, 0, sizeof(tio));
@ -188,8 +194,21 @@ void tty_configure(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
cfsetispeed(&tio, baudrate); // Set input speed
status = cfsetispeed(&tio, baudrate);
if (status == -1)
{
error_printf("Could not configure input speed (%s)", strerror(errno));
exit(EXIT_FAILURE);
}
// Set output speed
cfsetospeed(&tio, baudrate); cfsetospeed(&tio, baudrate);
if (status == -1)
{
error_printf("Could not configure output speed (%s)", strerror(errno));
exit(EXIT_FAILURE);
}
/* Set databits */ /* Set databits */
tio.c_cflag &= ~CSIZE; tio.c_cflag &= ~CSIZE;
@ -340,7 +359,6 @@ void tty_disconnect(void)
void tty_restore(void) void tty_restore(void)
{ {
tcsetattr(fd, TCSANOW, &old_tio); tcsetattr(fd, TCSANOW, &old_tio);
tcsetattr(fd, TCSAFLUSH, &old_tio);
if (connected) if (connected)
tty_disconnect(); tty_disconnect();
@ -407,8 +425,12 @@ int tty_connect(void)
tio.c_cc[VMIN] = 1; /* Blocking read until 1 character received */ tio.c_cc[VMIN] = 1; /* Blocking read until 1 character received */
/* Activate new port settings */ /* Activate new port settings */
tcsetattr(fd, TCSANOW, &tio); status = tcsetattr(fd, TCSANOW, &tio);
tcsetattr(fd, TCSAFLUSH, &tio); if (status == -1)
{
error_printf_silent("Could not apply port settings (%s)", strerror(errno));
goto error_tcsetattr;
}
maxfd = MAX(fd, STDIN_FILENO) + 1; /* Maximum bit entry (fd) to test */ maxfd = MAX(fd, STDIN_FILENO) + 1; /* Maximum bit entry (fd) to test */
@ -495,6 +517,7 @@ int tty_connect(void)
return TIO_SUCCESS; return TIO_SUCCESS;
error_tcsetattr:
error_tcgetattr: error_tcgetattr:
error_read: error_read:
tty_disconnect(); tty_disconnect();