highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: fix y/N regression so that \n is always needed

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-09 00:59:15 +02:00
parent cca81e7eb0
commit e084cad45f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ffmpeg.c
View File

@ -609,20 +609,6 @@ static int read_key(void)
return -1;
}
static int read_yn(void)
{
int c, t;
#if HAVE_TERMIOS_H || HAVE_KBHIT
while((c=read_key()) < 0);
#else
t=c= getchar();
while (t != '\n' && t != EOF)
t = getchar();
#endif
return (toupper(c) == 'Y');
}
static int decode_interrupt_cb(void)
{
return received_nb_signals > 1;
@ -3718,11 +3704,12 @@ static void opt_output_file(void *optctx, const char *filename)
if (!using_stdin) {
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
fflush(stderr);
if (!read_yn()) {
av_log(0, AV_LOG_FATAL, "\nNot overwriting - exiting\n");
term_exit();
if (!read_yesno()) {
av_log(0, AV_LOG_FATAL, "Not overwriting - exiting\n");
exit_program(1);
}
fprintf(stderr,"\n");
term_init();
}
else {
av_log(0, AV_LOG_FATAL,"File '%s' already exists. Exiting.\n", filename);