From cb432079654bad71f05fba032cd8263bd6c862d8 Mon Sep 17 00:00:00 2001 From: Elena Zannoni Date: Thu, 21 May 1998 18:03:25 +0000 Subject: [PATCH] Thu May 21 13:56:24 1998 Elena Zannoni * gdbtk.c: reinserted the changes that were accidentally deleted: (_initialize_gdbtk): Use correct device names in cygwin-specific call (cosmetic change). (gdbtk_ignorable_warning): removed va_list parameter, which was unused. (_initialize_gdbtk): add cygwin32 specific code to allow `gdb -nw' to work when specified specified from a windows console-mode command line. * ChangeLog: moved Chris Faylor's comment to ChangeLog-gdbtk --- gdb/ChangeLog | 8 ++------ gdb/ChangeLog-gdbtk | 20 ++++++++++++++++++-- gdb/gdbtk.c | 36 +++++++++++++++++++++++++++++++----- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 101eabc6098..201ac5129c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,5 @@ +Thu May 21 13:56:24 1998 Elena Zannoni + Wed May 20 15:29:41 1998 Gavin Koch * mips/tm-tx39.h (MIPS_DEFAULT_FPU_TYPE): Defined as MIPS_FPU_NONE. @@ -322,12 +324,6 @@ Thu Apr 23 00:32:08 1998 Tom Tromey * acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_STPCPY, HAVE_GETTEXT, HAVE_LC_MESSAGES): Define. -Wed Apr 22 21:17:35 1998 Christopher Faylor - - * gdbtk.c (_initialize_gdbtk): add cygwin32 specific code to - allow `gdb -nw' to work when specified specified from a windows - console-mode command line. - Wed Apr 22 15:38:56 1998 Tom Tromey * configure: Rebuilt. diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk index 17c744ac31d..1113816cb20 100644 --- a/gdb/ChangeLog-gdbtk +++ b/gdb/ChangeLog-gdbtk @@ -1,10 +1,20 @@ +Thu May 21 13:56:24 1998 Elena Zannoni + + * gdbtk.c: reinserted the changes that were accidentally deleted: + (_initialize_gdbtk): Use correct device names in + cygwin-specific call (cosmetic change). + (gdbtk_ignorable_warning): removed va_list parameter, + which was unused. + (_initialize_gdbtk): add cygwin32 specific code to + allow `gdb -nw' to work when specified specified from a windows + console-mode command line. + Wed May 13 11:12:58 1998 James Ingham * gdbtk.c: Fixed a goof in the definition of the gdb_get_args & gdb_get_locals Tcl commands. Moved the previous ChangeLog entry from ChangeLog to ChangeLog-gdbtk (here)... - Tue May 12 13:29:20 1998 Jeff Holcomb * Makefile.in (install-only): Add images/icons.txt and @@ -17,7 +27,7 @@ Tue May 12 12:03:16 1998 James Ingham catch_errors. This is just a bandaid while I rewrite the string-based commands to use the object format. - Tue May 5 09:30:25 1998 Christopher Faylor +Tue May 5 09:30:25 1998 Christopher Faylor * gdbtk.c (_initialize_gdbtk): Use correct device names in cygwin-specific call (cosmetic change). @@ -31,6 +41,12 @@ Thu Apr 23 19:01:05 1998 Keith Seitz * Makefile.in (install-only): Install help files. +Wed Apr 22 21:17:35 1998 Christopher Faylor + + * gdbtk.c (_initialize_gdbtk): add cygwin32 specific code to + allow `gdb -nw' to work when specified specified from a windows + console-mode command line. + Wed Apr 15 11:23:53 1998 Stan Shebs * gdbtcl: Remove directory and contents, this version of diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c index 96aaa97cf5c..6027cdbec36 100644 --- a/gdb/gdbtk.c +++ b/gdb/gdbtk.c @@ -98,7 +98,7 @@ static void gdbtk_flush PARAMS ((FILE *)); static void gdbtk_fputs PARAMS ((const char *, FILE *)); static int gdbtk_query PARAMS ((const char *, va_list)); static void gdbtk_warning PARAMS ((const char *, va_list)); -static void gdbtk_ignorable_warning PARAMS ((const char *, va_list)); +static void gdbtk_ignorable_warning PARAMS ((const char *)); static char *gdbtk_readline PARAMS ((char *)); static void gdbtk_init PARAMS ((char *)); static void tk_command_loop PARAMS ((void)); @@ -329,14 +329,13 @@ gdbtk_warning (warning, args) } static void -gdbtk_ignorable_warning (warning, args) +gdbtk_ignorable_warning (warning) const char *warning; - va_list args; { char buf[200], *merge[2]; char *command; - vsprintf (buf, warning, args); + sprintf (buf, warning); merge[0] = "gdbtk_tcl_ignorable_warning"; merge[1] = buf; command = Tcl_Merge (2, merge); @@ -3260,7 +3259,7 @@ gdb_loadfile (clientData, interp, objc, objv) mtime = bfd_get_mtime(exec_bfd); if (mtime && mtime < st.st_mtime) - gdbtk_ignorable_warning("Source file is more recent than executable.\n", (va_list)0); + gdbtk_ignorable_warning("Source file is more recent than executable.\n"); /* Source linenumbers don't appear to be in order, and a sort is */ @@ -3456,4 +3455,31 @@ _initialize_gdbtk () init_ui_hook = gdbtk_init; } +#ifdef __CYGWIN32__ + else + { + DWORD ft = GetFileType (GetStdHandle (STD_INPUT_HANDLE)); + void cygwin32_attach_handle_to_fd (char *, int, HANDLE, int, int); + + switch (ft) + { + case FILE_TYPE_DISK: + case FILE_TYPE_CHAR: + case FILE_TYPE_PIPE: + break; + default: + AllocConsole(); + cygwin32_attach_handle_to_fd ("/dev/conin", 0, + GetStdHandle (STD_INPUT_HANDLE), + 1, GENERIC_READ); + cygwin32_attach_handle_to_fd ("/dev/conout", 1, + GetStdHandle (STD_OUTPUT_HANDLE), + 0, GENERIC_WRITE); + cygwin32_attach_handle_to_fd ("/dev/conout", 2, + GetStdHandle (STD_ERROR_HANDLE), + 0, GENERIC_WRITE); + break; + } + } +#endif } -- 2.30.2