OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* utils.c: Add include of gdb_usleep.h. 

(defaulted_query): Detect false EOF conditions that happen
        on terminals opened with the O_NONBLOCK flag when there is
        nothing to read.
This commit is contained in:
Joel Brobecker 2009-05-06 22:54:58 +00:00
parent ba42693bb4
commit 8626589c42
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2009-05-06 Joel Brobecker <brobecker@adacore.com>
* utils.c: Add include of gdb_usleep.h.
(defaulted_query): Detect false EOF conditions that happen
on terminals opened with the O_NONBLOCK flag when there is
nothing to read.
2009-05-06 Pedro Alves <pedro@codesourcery.com>
* inferior.c (add_inferior): Move observer_notify_new_inferior

21
gdb/utils.c
View File

@ -67,6 +67,8 @@
#include <sys/time.h>
#include <time.h>
#include "gdb_usleep.h"
#if !HAVE_DECL_MALLOC
extern PTR malloc (); /* ARI: PTR */
#endif
@ -1477,6 +1479,25 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
gdb_flush (gdb_stdout);
answer = fgetc (stdin);
/* We expect fgetc to block until a character is read. But
this may not be the case if the terminal was opened with
the NONBLOCK flag. In that case, if there is nothing to
read on stdin, fgetc returns EOF, but also sets the error
condition flag on stdin and errno to EAGAIN. With a true
EOF, stdin's error condition flag is not set.
A situation where this behavior was observed is a pseudo
terminal on AIX. */
while (answer == EOF && ferror (stdin) && errno == EAGAIN)
{
/* Not a real EOF. Wait a little while and try again until
we read something. */
clearerr (stdin);
gdb_usleep (10000);
answer = fgetc (stdin);
}
clearerr (stdin); /* in case of C-d */
if (answer == EOF) /* C-d */
{