uzix/picocom
1
0
Fork 0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00
Code Issues Projects Releases Wiki Activity

Do not drain the port when exiting by command

Browse Source 
If picocom exits due to an "Exit" or "Quit" command, the contents of the
output queue (data read from the terminal but not written to the port)
are, anyway, discarded. Because of this, there is no reason to wait for
the O/S output buffer (data already written to the port but not
transmitted) to drain before exiting. The output port (output buffer) is
instead flushed (data discarded) before exiting due to a command.
This commit is contained in:
Nick Patavalis
2017-12-20 06:42:14 +02:00
parent 82d69071c3
commit e6653b45b5
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
picocom.c
View File

@ -1170,7 +1170,15 @@ msec2tv (struct timeval *tv, long ms)
return tv;
}
void
/* loop-exit reason */
enum le_reason {
LE_CMD,
LE_IDLE,
LE_STDIN,
LE_SIGNAL
};
enum le_reason
loop(void)
{
enum {
@ -1205,7 +1213,7 @@ loop(void)
} else if ( stdin_closed ) {
/* stdin closed, output queue empty, and no
idle timeout: Exit. */
return;
return LE_STDIN;
}
}
@ -1218,7 +1226,7 @@ loop(void)
}
if ( r == 0 ) {
/* Idle timeout expired */
return;
return LE_IDLE;
}
if ( FD_ISSET(STI, &rdset) ) {
@ -1250,7 +1258,7 @@ loop(void)
/* process command key */
if ( do_command(c) )
/* picocom exit */
return;
return LE_CMD;
}
state = ST_TRANSPARENT;
break;
@ -1316,6 +1324,7 @@ loop(void)
tty_q.len -= n;
}
}
return LE_SIGNAL;
}
/**********************************************************************/
@ -1732,6 +1741,7 @@ int
main (int argc, char *argv[])
{
int xcode = EXIT_SUCCESS;
int ler;
int r;
parse_args(argc, argv);
@ -1861,15 +1871,18 @@ main (int argc, char *argv[])
fd_pinfof(opts.quiet, "Terminal ready\r\n");
/* Enter main processing loop */
loop();
ler = loop();
/* Terminating picocom */
fd_pinfof(opts.quiet, "\r\n");
fd_pinfof(opts.quiet, "Terminating...\r\n");
cleanup(1 /* drain */, opts.noreset);
if ( ler == LE_CMD || ler == LE_SIGNAL )
cleanup(0 /* drain */, opts.noreset);
else
cleanup(1 /* drain */, opts.noreset);
if ( sig_exit ) {
if ( ler == LE_SIGNAL ) {
fd_pinfof(opts.quiet, "Picocom was killed\r\n");
xcode = EXIT_FAILURE;
} else