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

Fixed not being able to quit

Browse source 
When gotty was waiting for a device to appear it was impossible to quit
using the ctrl-g ctrl-q sequence. This is now fixed.
This commit is contained in:
Martin Lund 2014-09-27 22:18:07 +02:00
parent 57beed2e34
commit 6e2582787c
4 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tty.c
View file

@ -35,11 +35,9 @@
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
#define CTRLG 0x07
#define CTRLQ 0x11
static int fd;
static int connected = false;
struct termios stdio, old_stdio, old_tio;
static int fd;
void configure_stdout(void)
{
@ -68,18 +66,20 @@ void configure_stdout(void)
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &stdio);
}
void restore(void)
void restore_stdout(void)
{
static int i=0;
tcflush(STDOUT_FILENO, TCIOFLUSH);
tcsetattr(STDOUT_FILENO, TCSANOW, &old_stdio);
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &old_stdio);
}
void restore_tty(void)
{
tcsetattr(fd, TCSANOW, &old_tio);
tcsetattr(fd, TCSAFLUSH, &old_tio);
gotty_printf("Disconnected\n");
if (connected)
gotty_printf("Disconnected\n");
}
int connect_tty(void)
@ -106,15 +106,16 @@ int connect_tty(void)
}
gotty_printf("Connected");
connected = true;
/* Save current port settings */
if (tcgetattr(fd, &old_tio) < 0)
return EXIT_FAILURE;
/* Make sure we restore settings on exit */
/* Make sure we restore tty settings on exit */
if (first)
{
atexit(&restore);
atexit(&restore_tty);
first = false;
}
@ -152,9 +153,11 @@ int connect_tty(void)
fflush(stdout);
} else
{
/* Error reading - device is likely unplugged */
if (!option.no_autoconnect)
gotty_printf("Disconnected");
close(fd);
connected = false;
return EXIT_FAILURE;
}
}