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

Cleanup

Browse source
This commit is contained in:
Martin Lund 2022-06-23 20:32:18 +02:00
parent a947985651
commit 941e8d5b04
1 changed files with 79 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

103
src/tty.c
View file

@ -99,13 +99,20 @@ inline static bool is_valid_hex(char c)
inline static unsigned char char_to_nibble(char c) inline static unsigned char char_to_nibble(char c)
{ {
if(c >= '0' && c <= '9'){ if(c >= '0' && c <= '9')
{
return c - '0'; return c - '0';
} else if(c >= 'a' && c <= 'f'){ }
else if (c >= 'a' && c <= 'f')
{
return c - 'a' + 10; return c - 'a' + 10;
} else if(c >= 'A' && c <= 'F'){ }
else if (c >= 'A' && c <= 'F')
{
return c - 'A' + 10; return c - 'A' + 10;
} else { }
else
{
return 0; return 0;
} }
} }
@ -125,7 +132,8 @@ static void output_hex(char c)
if (status < 0) if (status < 0)
{ {
warning_printf("Could not write to tty device"); warning_printf("Could not write to tty device");
} else }
else
{ {
tx_total++; tx_total++;
} }
@ -513,7 +521,9 @@ void tty_configure(void)
tio.c_cflag &= ~PARODD; tio.c_cflag &= ~PARODD;
} }
else if (strcmp("none", option.parity) == 0) else if (strcmp("none", option.parity) == 0)
{
tio.c_cflag &= ~PARENB; tio.c_cflag &= ~PARENB;
}
else else
{ {
error_printf("Invalid parity"); error_printf("Invalid parity");
@ -534,26 +544,44 @@ void tty_configure(void)
while (token_found == true) while (token_found == true)
{ {
if (token == NULL) if (token == NULL)
{
token = strtok(buffer,","); token = strtok(buffer,",");
}
else else
{
token = strtok(NULL, ","); token = strtok(NULL, ",");
}
if (token != NULL) if (token != NULL)
{ {
if (strcmp(token,"INLCR") == 0) if (strcmp(token,"INLCR") == 0)
{
tio.c_iflag |= INLCR; tio.c_iflag |= INLCR;
}
else if (strcmp(token,"IGNCR") == 0) else if (strcmp(token,"IGNCR") == 0)
{
tio.c_iflag |= IGNCR; tio.c_iflag |= IGNCR;
}
else if (strcmp(token,"ICRNL") == 0) else if (strcmp(token,"ICRNL") == 0)
{
tio.c_iflag |= ICRNL; tio.c_iflag |= ICRNL;
}
else if (strcmp(token,"OCRNL") == 0) else if (strcmp(token,"OCRNL") == 0)
{
map_o_cr_nl = true; map_o_cr_nl = true;
}
else if (strcmp(token,"ODELBS") == 0) else if (strcmp(token,"ODELBS") == 0)
{
map_o_del_bs = true; map_o_del_bs = true;
}
else if (strcmp(token,"INLCRNL") == 0) else if (strcmp(token,"INLCRNL") == 0)
{
map_i_nl_crnl = true; map_i_nl_crnl = true;
}
else if (strcmp(token, "ONLCRNL") == 0) else if (strcmp(token, "ONLCRNL") == 0)
{
map_o_nl_crnl = true; map_o_nl_crnl = true;
}
else else
{ {
printf("Error: Unknown mapping flag %s\n", token); printf("Error: Unknown mapping flag %s\n", token);
@ -561,7 +589,9 @@ void tty_configure(void)
} }
} }
else else
{
token_found = false; token_found = false;
}
} }
free(buffer); free(buffer);
} }
@ -585,7 +615,8 @@ void tty_wait_for_device(void)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1; tv.tv_usec = 1;
first = false; first = false;
} else }
else
{ {
/* Wait up to 1 second */ /* Wait up to 1 second */
tv.tv_sec = 1; tv.tv_sec = 1;
@ -618,7 +649,8 @@ void tty_wait_for_device(void)
previous_char = input_char; previous_char = input_char;
} }
socket_handle_input(&rdfs, NULL); socket_handle_input(&rdfs, NULL);
} else if (status == -1) }
else if (status == -1)
{ {
error_printf("select() failed (%s)", strerror(errno)); error_printf("select() failed (%s)", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -626,7 +658,8 @@ void tty_wait_for_device(void)
/* Test for accessible device file */ /* Test for accessible device file */
status = access(option.tty_device, R_OK); status = access(option.tty_device, R_OK);
if (status == 0) { if (status == 0)
{
last_errno = 0; last_errno = 0;
return; return;
} }
@ -655,7 +688,9 @@ void tty_restore(void)
tcsetattr(fd, TCSANOW, &tio_old); tcsetattr(fd, TCSANOW, &tio_old);
if (connected) if (connected)
{
tty_disconnect(); tty_disconnect();
}
} }
int tty_connect(void) int tty_connect(void)
@ -701,7 +736,9 @@ int tty_connect(void)
print_tainted = false; print_tainted = false;
if (option.timestamp) if (option.timestamp)
{
next_timestamp = true; next_timestamp = true;
}
/* Manage print output mode */ /* Manage print output mode */
if (option.hex_mode) if (option.hex_mode)
@ -717,7 +754,9 @@ int tty_connect(void)
/* Save current port settings */ /* Save current port settings */
if (tcgetattr(fd, &tio_old) < 0) if (tcgetattr(fd, &tio_old) < 0)
{
goto error_tcgetattr; goto error_tcgetattr;
}
#ifdef HAVE_IOSSIOSPEED #ifdef HAVE_IOSSIOSPEED
if (!standard_baudrate) if (!standard_baudrate)
@ -809,7 +848,8 @@ int tty_connect(void)
print('\n'); print('\n');
if (option.timestamp) if (option.timestamp)
next_timestamp = true; next_timestamp = true;
} else }
else
{ {
/* Print received tty character to stdout */ /* Print received tty character to stdout */
print(input_char); print(input_char);
@ -826,16 +866,18 @@ int tty_connect(void)
print_tainted = true; print_tainted = true;
if (input_char == '\n' && option.timestamp) if (input_char == '\n' && option.timestamp)
{
next_timestamp = true; next_timestamp = true;
} else }
}
else
{ {
/* Error reading - device is likely unplugged */ /* Error reading - device is likely unplugged */
error_printf_silent("Could not read from tty device"); error_printf_silent("Could not read from tty device");
goto error_read; goto error_read;
} }
} }
else else if (FD_ISSET(STDIN_FILENO, &rdfs))
if (FD_ISSET(STDIN_FILENO, &rdfs))
{ {
forward = true; forward = true;
@ -854,7 +896,9 @@ int tty_connect(void)
{ {
/* Do not forward ctrl-t key */ /* Do not forward ctrl-t key */
if (input_char == KEY_CTRL_T) if (input_char == KEY_CTRL_T)
{
forward = false; forward = false;
}
/* Handle commands */ /* Handle commands */
handle_command_sequence(input_char, previous_char, &output_char, &forward); handle_command_sequence(input_char, previous_char, &output_char, &forward);
@ -862,6 +906,15 @@ int tty_connect(void)
/* Save previous key */ /* Save previous key */
previous_char = input_char; previous_char = input_char;
} }
if (print_mode == HEX)
{
if (!is_valid_hex(input_char))
{
warning_printf("Invalid hex character: '%d' (0x%02x)", input_char, input_char);
continue;
}
}
} }
else else
{ {
@ -870,34 +923,33 @@ int tty_connect(void)
if (forward) if (forward)
{ {
if (print_mode == HEX)
{
if (!is_valid_hex(input_char))
{
warning_printf("Invalid hex character: '%d' (0x%02x)", input_char, input_char);
continue;
}
}
/* Map output character */ /* Map output character */
if ((output_char == 127) && (map_o_del_bs)) if ((output_char == 127) && (map_o_del_bs))
{
output_char = '\b'; output_char = '\b';
}
if ((output_char == '\r') && (map_o_cr_nl)) if ((output_char == '\r') && (map_o_cr_nl))
{
output_char = '\n'; output_char = '\n';
}
/* Map newline character */ /* Map newline character */
if ((output_char == '\n' || output_char == '\r') && (map_o_nl_crnl)) { if ((output_char == '\n' || output_char == '\r') && (map_o_nl_crnl))
{
const char *crlf = "\r\n"; const char *crlf = "\r\n";
optional_local_echo(crlf[0]); optional_local_echo(crlf[0]);
optional_local_echo(crlf[1]); optional_local_echo(crlf[1]);
status = write(fd, crlf, 2); status = write(fd, crlf, 2);
if (status < 0) if (status < 0)
{
warning_printf("Could not write to tty device"); warning_printf("Could not write to tty device");
}
tx_total += 2; tx_total += 2;
delay(option.output_delay); delay(option.output_delay);
} else }
else
{ {
if (print_mode == HEX) if (print_mode == HEX)
{ {
@ -909,7 +961,9 @@ int tty_connect(void)
optional_local_echo(output_char); optional_local_echo(output_char);
status = write(fd, &output_char, 1); status = write(fd, &output_char, 1);
if (status < 0) if (status < 0)
{
warning_printf("Could not write to tty device"); warning_printf("Could not write to tty device");
}
fsync(fd); fsync(fd);
/* Update transmit statistics */ /* Update transmit statistics */
@ -920,7 +974,8 @@ int tty_connect(void)
delay(option.output_delay); delay(option.output_delay);
} }
} }
} else if (status == -1) }
else if (status == -1)
{ {
error_printf("Error: select() failed (%s)", strerror(errno)); error_printf("Error: select() failed (%s)", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);