X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fevent-top.c;h=4614d4d2f4c8af13589f7479821997357c85708d;hb=3be60c3d274d8a95d1e3c579c26140177b711d74;hp=01f1f51c265997bbb352726b708e00eefa0b7dc6;hpb=362646f51708657cb5bc8886426a881f2fb56191;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/event-top.c b/gdb/event-top.c
index 01f1f51c26..4614d4d2f4 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -1,5 +1,8 @@
 /* Top level stuff for GDB, the GNU debugger.
-   Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+
+   Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software
+   Foundation, Inc.
+
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -28,6 +31,7 @@
 #include "event-top.h"
 #include "interps.h"
 #include <signal.h>
+#include "exceptions.h"
 
 /* For dont_repeat() */
 #include "gdbcmd.h"
@@ -51,7 +55,9 @@ static void async_stop_sig (gdb_client_data arg);
 static void async_float_handler (gdb_client_data arg);
 
 /* Signal handlers. */
+#ifdef SIGQUIT
 static void handle_sigquit (int sig);
+#endif
 static void handle_sighup (int sig);
 static void handle_sigfpe (int sig);
 #if defined(SIGWINCH) && defined(SIGWINCH_HANDLER)
@@ -129,7 +135,9 @@ void *sigint_token;
 #ifdef SIGHUP
 void *sighup_token;
 #endif
+#ifdef SIGQUIT
 void *sigquit_token;
+#endif
 void *sigfpe_token;
 #if defined(SIGWINCH) && defined(SIGWINCH_HANDLER)
 void *sigwinch_token;
@@ -321,7 +329,7 @@ change_annotation_level (void)
     {
       /* The prompt stack has not been initialized to "", we are
          using gdb w/o the --async switch */
-      warning ("Command has same effect as set annotate");
+      warning (_("Command has same effect as set annotate"));
       return;
     }
 
@@ -406,7 +414,7 @@ stdin_event_handler (int error, gdb_client_data client_data)
 {
   if (error)
     {
-      printf_unfiltered ("error detected on stdin\n");
+      printf_unfiltered (_("error detected on stdin\n"));
       delete_file_handler (input_fd);
       discard_all_continuations ();
       /* If stdin died, we may as well kill gdb. */
@@ -529,7 +537,7 @@ command_handler (char *command)
 	{
 	  long cmd_time = get_run_time () - time_at_cmd_start;
 
-	  printf_unfiltered ("Command execution time: %ld.%06ld\n",
+	  printf_unfiltered (_("Command execution time: %ld.%06ld\n"),
 			     cmd_time / 1000000, cmd_time % 1000000);
 	}
 
@@ -540,7 +548,7 @@ command_handler (char *command)
 	  long space_now = lim - lim_at_start;
 	  long space_diff = space_now - space_at_cmd_start;
 
-	  printf_unfiltered ("Space used: %ld (%c%ld for this command)\n",
+	  printf_unfiltered (_("Space used: %ld (%c%ld for this command)\n"),
 			     space_now,
 			     (space_diff >= 0 ? '+' : '-'),
 			     space_diff);
@@ -568,7 +576,7 @@ command_line_handler_continuation (struct continuation_arg *arg)
     {
       long cmd_time = get_run_time () - time_at_cmd_start;
 
-      printf_unfiltered ("Command execution time: %ld.%06ld\n",
+      printf_unfiltered (_("Command execution time: %ld.%06ld\n"),
 			 cmd_time / 1000000, cmd_time % 1000000);
     }
   if (display_space)
@@ -578,7 +586,7 @@ command_line_handler_continuation (struct continuation_arg *arg)
       long space_now = lim - lim_at_start;
       long space_diff = space_now - space_at_cmd_start;
 
-      printf_unfiltered ("Space used: %ld (%c%ld for this command)\n",
+      printf_unfiltered (_("Space used: %ld (%c%ld for this command)\n"),
 			 space_now,
 			 (space_diff >= 0 ? '+' : '-'),
 			 space_diff);
@@ -611,9 +619,9 @@ command_line_handler (char *rl)
 
   if (annotation_level > 1 && instream == stdin)
     {
-      printf_unfiltered ("\n\032\032post-");
+      printf_unfiltered (("\n\032\032post-"));
       puts_unfiltered (async_annotation_suffix);
-      printf_unfiltered ("\n");
+      printf_unfiltered (("\n"));
     }
 
   if (linebuffer == 0)
@@ -645,15 +653,7 @@ command_line_handler (char *rl)
   gdb_flush (gdb_stderr);
 
   if (source_file_name != NULL)
-    {
-      ++source_line_number;
-      sprintf (source_error,
-	       "%s%s:%d: Error in sourced command file:\n",
-	       source_pre_error,
-	       source_file_name,
-	       source_line_number);
-      error_pre_print = source_error;
-    }
+    ++source_line_number;
 
   /* If we are in this case, then command_handler will call quit 
      and exit from gdb. */
@@ -855,15 +855,11 @@ gdb_readline2 (gdb_client_data client_data)
 	}
 
       if (c == '\n')
-#ifndef CRLF_SOURCE_FILES
-	break;
-#else
 	{
 	  if (input_index > 0 && result[input_index - 1] == '\r')
 	    input_index--;
 	  break;
 	}
-#endif
 
       result[input_index++] = c;
       while (input_index >= result_size)
@@ -903,6 +899,7 @@ async_init_signals (void)
   signal (SIGTRAP, SIG_DFL);
 #endif
 
+#ifdef SIGQUIT
   /* If we initialize SIGQUIT to SIG_IGN, then the SIG_IGN will get
      passed to the inferior, which we don't want.  It would be
      possible to do a "signal (SIGQUIT, SIG_DFL)" after we fork, but
@@ -914,6 +911,7 @@ async_init_signals (void)
   signal (SIGQUIT, handle_sigquit);
   sigquit_token =
     create_async_signal_handler (async_do_nothing, NULL);
+#endif
 #ifdef SIGHUP
   if (signal (SIGHUP, handle_sighup) != SIG_IGN)
     sighup_token =
@@ -974,6 +972,7 @@ async_request_quit (gdb_client_data arg)
   quit ();
 }
 
+#ifdef SIGQUIT
 /* Tell the event loop what to do if SIGQUIT is received. 
    See event-signal.c. */
 static void
@@ -982,6 +981,7 @@ handle_sigquit (int sig)
   mark_async_signal_handler_wrapper (sigquit_token);
   signal (sig, handle_sigquit);
 }
+#endif
 
 /* Called by the event loop in response to a SIGQUIT. */
 static void
@@ -1064,7 +1064,7 @@ async_float_handler (gdb_client_data arg)
 {
   /* This message is based on ANSI C, section 4.7. Note that integer
      divide by zero causes this, so "float" is a misnomer. */
-  error ("Erroneous arithmetic operation.");
+  error (_("Erroneous arithmetic operation."));
 }
 
 /* Tell the event loop what to do if SIGWINCH is received.