mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
restore old tty in ffmpeg patch by (Roumen Petrov <ffmpeg at roumenpetrov dot info>)
Originally committed as revision 1750 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b5e34cb1c1
commit
9680a72282
25
ffmpeg.c
25
ffmpeg.c
@ -30,6 +30,7 @@
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_OS2
|
#ifdef CONFIG_OS2
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -238,6 +239,15 @@ static void term_exit(void)
|
|||||||
tcsetattr (0, TCSANOW, &oldtty);
|
tcsetattr (0, TCSANOW, &oldtty);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static volatile sig_atomic_t received_sigterm = 0;
|
||||||
|
|
||||||
|
static void
|
||||||
|
sigterm_handler(int sig)
|
||||||
|
{
|
||||||
|
received_sigterm = sig;
|
||||||
|
term_exit();
|
||||||
|
}
|
||||||
|
|
||||||
static void term_init(void)
|
static void term_init(void)
|
||||||
{
|
{
|
||||||
struct termios tty;
|
struct termios tty;
|
||||||
@ -256,6 +266,12 @@ static void term_init(void)
|
|||||||
|
|
||||||
tcsetattr (0, TCSANOW, &tty);
|
tcsetattr (0, TCSANOW, &tty);
|
||||||
|
|
||||||
|
signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */
|
||||||
|
signal(SIGQUIT, sigterm_handler); /* Quit (POSIX). */
|
||||||
|
signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */
|
||||||
|
/*
|
||||||
|
register a function to be called at normal program termination
|
||||||
|
*/
|
||||||
atexit(term_exit);
|
atexit(term_exit);
|
||||||
#ifdef CONFIG_BEOS_NETSERVER
|
#ifdef CONFIG_BEOS_NETSERVER
|
||||||
fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
|
fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
|
||||||
@ -2838,5 +2854,14 @@ int main(int argc, char **argv)
|
|||||||
powerpc_display_perf_report();
|
powerpc_display_perf_report();
|
||||||
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */
|
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */
|
||||||
|
|
||||||
|
#ifndef CONFIG_WIN32
|
||||||
|
if (received_sigterm) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"Received signal %d: terminating.\n",
|
||||||
|
(int) received_sigterm);
|
||||||
|
exit (255);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
exit(0); /* not all OS-es handle main() return value */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user