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

Factor-out cleanup code from fatal() and main()

Browse Source
This commit is contained in:
Nick Patavalis
2017-12-19 22:05:42 +02:00
parent a99d1f8b69
commit 69e16a3a70
1 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
picocom.c
View File

@ -233,7 +233,7 @@ int sig_exit = 0;
#define STO STDOUT_FILENO
#define STE STDERR_FILENO
int tty_fd;
int tty_fd = -1;
int log_fd = -1;
#define TTY_Q_SZ_MIN 256
@ -349,47 +349,6 @@ uucp_unlock(void)
/**********************************************************************/
void
fatal (const char *format, ...)
{
char *s, buf[256];
va_list args;
int len;
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
buf[sizeof(buf) - 1] = '\0';
va_end(args);
s = "\r\nFATAL: ";
writen_ni(STE, s, strlen(s));
writen_ni(STE, buf, len);
s = "\r\n";
writen_ni(STE, s, strlen(s));
#ifdef UUCP_LOCK_DIR
uucp_unlock();
#endif
if ( opts.initstring ) {
free(opts.initstring);
opts.initstring = NULL;
}
if ( tty_q.buff ) {
free(tty_q.buff);
tty_q.buff = NULL;
}
free(opts.port);
if (opts.log_filename) {
free(opts.log_filename);
close(log_fd);
}
exit(EXIT_FAILURE);
}
/**********************************************************************/
#ifndef LINENOISE
char *
@ -553,6 +512,65 @@ read_baud (void)
/**********************************************************************/
void cleanup(int drain, int noreset)
{
if ( tty_fd >= 0 ) {
if ( drain )
term_drain(tty_fd);
term_flush(tty_fd);
if ( noreset ) {
fd_pinfof(opts.quiet, "Skipping tty reset...\r\n");
term_erase(tty_fd);
}
}
#ifdef LINENOISE
cleanup_history();
#endif
#ifdef UUCP_LOCK_DIR
uucp_unlock();
#endif
if ( opts.initstring ) {
free(opts.initstring);
opts.initstring = NULL;
}
if ( tty_q.buff ) {
free(tty_q.buff);
tty_q.buff = NULL;
}
free(opts.port);
if (opts.log_filename) {
free(opts.log_filename);
close(log_fd);
}
}
void
fatal (const char *format, ...)
{
char *s, buf[256];
va_list args;
int len;
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
buf[sizeof(buf) - 1] = '\0';
va_end(args);
s = "\r\nFATAL: ";
writen_ni(STE, s, strlen(s));
writen_ni(STE, buf, len);
s = "\r\n";
writen_ni(STE, s, strlen(s));
cleanup(0 /* drain*/, 0 /* noreset */);
exit(EXIT_FAILURE);
}
/**********************************************************************/
/* maximum number of chars that can replace a single characted
due to mapping */
#define M_MAXMAP 4
@ -1848,16 +1866,8 @@ main(int argc, char *argv[])
/* Terminating picocom */
fd_pinfof(opts.quiet, "\r\n");
fd_pinfof(opts.quiet, "Terminating...\r\n");
term_drain(tty_fd);
#ifdef LINENOISE
cleanup_history();
#endif
if ( opts.noreset ) {
fd_pinfof(opts.quiet, "Skipping tty reset...\r\n");
term_erase(tty_fd);
}
cleanup(1 /* drain */, opts.noreset);
if ( sig_exit ) {
fd_pinfof(opts.quiet, "Picocom was killed\r\n");
@ -1865,20 +1875,6 @@ main(int argc, char *argv[])
} else
fd_pinfof(opts.quiet, "Thanks for using picocom\r\n");
#ifdef UUCP_LOCK_DIR
uucp_unlock();
#endif
if ( tty_q.buff ) {
free(tty_q.buff);
tty_q.buff = NULL;
}
free(opts.port);
if (opts.log_filename) {
free(opts.log_filename);
close(log_fd);
}
return xcode;
}