* configure.tgt (i[3456]86-*-unixware*, i[3456]86-*-unixware2*):

[deliverable/binutils-gdb.git] / gdb / event-loop.c

diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 1ae2a82e1a0b7128388eafb4efcbb530f431bc67..ea74419623e472dc381e21e8a01fa3bbe45f171a 100644 (file)
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -1,5 +1,5 @@
 /* Event loop machinery for GDB, the GNU debugger.
-   Copyright 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -20,7 +20,6 @@
    Boston, MA 02111-1307, USA. */
 
 #include "defs.h"
-#include "top.h"
 #include "event-loop.h"
 #include "event-top.h"
 
@@ -35,55 +34,8 @@
 #include <sys/types.h>
 #include "gdb_string.h"
 #include <errno.h>
-#include <setjmp.h>
 #include <sys/time.h>
 
-/* Type of the mask arguments to select. */
-
-#ifndef HAVE_POLL
-#ifdef NO_FD_SET
-/* All this stuff below is not required if select is used as God(tm)
-   intended, with the FD_* macros.  Are there any implementations of
-   select which don't have FD_SET and other standard FD_* macros?  I
-   don't think there are, but if I'm wrong, we need to catch them.  */
-#error FD_SET must be defined if select function is to be used!
-
-#ifndef _AIX
-typedef long fd_mask;
-#endif
-#if defined(_IBMR2)
-#define SELECT_MASK void
-#else
-#define SELECT_MASK int
-#endif /* !_IBMR2 */
-
-/* Define "NBBY" (number of bits per byte) if it's not already defined. */
-
-#ifndef NBBY
-#define NBBY 8
-#endif
-
-/* Define the number of fd_masks in an fd_set */
-
-#ifndef FD_SETSIZE
-#ifdef OPEN_MAX
-#define FD_SETSIZE OPEN_MAX
-#else
-#define FD_SETSIZE 256
-#endif
-#endif
-#if !defined(howmany)
-#define howmany(x, y) (((x)+((y)-1))/(y))
-#endif
-#ifndef NFDBITS
-#define NFDBITS NBBY*sizeof(fd_mask)
-#endif
-#define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
-
-#endif /* NO_FD_SET */
-#endif /* !HAVE_POLL */
-
-
 typedef struct gdb_event gdb_event;
 typedef void (event_handler_func) (int);
 
@@ -450,6 +402,14 @@ start_event_loop (void)
             interface specific, because interfaces can display the
             prompt in their own way. */
          display_gdb_prompt (0);
+         /* This call looks bizarre, but it is required.  If the user
+            entered a command that caused an error,
+            after_char_processing_hook won't be called from
+            rl_callback_read_char_wrapper.  Using a cleanup there
+            won't work, since we want this function to be called
+            after a new prompt is printed.  */
+         if (after_char_processing_hook)
+           (*after_char_processing_hook) ();
          /* Maybe better to set a flag to be checked somewhere as to
             whether display the prompt or not. */
        }
@@ -484,7 +444,8 @@ add_file_handler (int fd, handler_func * proc, gdb_client_data client_data)
       if (poll (&fds, 1, 0) == 1 && (fds.revents & POLLNVAL))
        use_poll = 0;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   if (use_poll)
@@ -492,7 +453,8 @@ add_file_handler (int fd, handler_func * proc, gdb_client_data client_data)
 #ifdef HAVE_POLL
       create_file_handler (fd, POLLIN, proc, client_data);
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif
     }
   else
@@ -543,8 +505,9 @@ create_file_handler (int fd, int mask, handler_func * proc, gdb_client_data clie
       gdb_notifier.num_fds++;
       if (gdb_notifier.poll_fds)
        gdb_notifier.poll_fds =
-         (struct pollfd *) realloc (gdb_notifier.poll_fds,
-                          (gdb_notifier.num_fds) * sizeof (struct pollfd));
+         (struct pollfd *) xrealloc (gdb_notifier.poll_fds,
+                                     (gdb_notifier.num_fds
+                                      * sizeof (struct pollfd)));
       else
        gdb_notifier.poll_fds =
          (struct pollfd *) xmalloc (sizeof (struct pollfd));
@@ -552,7 +515,8 @@ create_file_handler (int fd, int mask, handler_func * proc, gdb_client_data clie
       (gdb_notifier.poll_fds + gdb_notifier.num_fds - 1)->events = mask;
       (gdb_notifier.poll_fds + gdb_notifier.num_fds - 1)->revents = 0;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -624,7 +588,8 @@ delete_file_handler (int fd)
       gdb_notifier.poll_fds = new_poll_fds;
       gdb_notifier.num_fds--;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -725,7 +690,8 @@ handle_file_event (int event_file_desc)
              else
                file_ptr->error = 0;
 #else
-             internal_error ("event-loop.c : use_poll without HAVE_POLL");
+             internal_error (__FILE__, __LINE__,
+                             "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
            }
          else
@@ -786,7 +752,8 @@ gdb_wait_for_event (void)
       if (num_found == -1 && errno != EINTR)
        perror_with_name ("Poll");
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -847,7 +814,8 @@ gdb_wait_for_event (void)
          file_ptr->ready_mask = (gdb_notifier.poll_fds + i)->revents;
        }
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -1167,7 +1135,8 @@ poll_timers (void)
 #ifdef HAVE_POLL
          gdb_notifier.poll_timeout = delta.tv_sec * 1000;
 #else
-         internal_error ("event-loop.c : use_poll without HAVE_POLL");
+         internal_error (__FILE__, __LINE__,
+                         "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
        }
       else