MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use readline's variant of Windows patch

Browse Source 
A while back, Eli sent a patch to readline that was incorporated by
upstream readline in a slightly different form.  To cut down on
divergences between GDB and upstream readline, I am checking in this
patch to use the readline code.

readline/readline/ChangeLog.gdb
2021-01-23  Tom Tromey  <tom@tromey.com>

	* input.c [_WIN32]: Use code from upstream readline.
This commit is contained in:
Tom Tromey 2021-01-23 09:04:43 -07:00
parent 1af4c9c420
commit ef45cb65a7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
readline/readline/ChangeLog.gdb
View File

@ -1,3 +1,7 @@
2021-01-23 Tom Tromey <tom@tromey.com>
* input.c [_WIN32]: Use code from upstream readline.
2019-10-23 Andrew Burgess <andrew.burgess@embecosm.com> 2019-10-23 Andrew Burgess <andrew.burgess@embecosm.com>
PR cli/24980 PR cli/24980

10
readline/readline/input.c
View File

@ -99,16 +99,16 @@ static int ibuffer_space PARAMS((void));
static int rl_get_char PARAMS((int *)); static int rl_get_char PARAMS((int *));
static int rl_gather_tyi PARAMS((void)); static int rl_gather_tyi PARAMS((void));
/* Windows isatty returns true for every character device, including the null
device, so we need to perform additional checks. */
#if defined (_WIN32) && !defined (__CYGWIN__) #if defined (_WIN32) && !defined (__CYGWIN__)
/* 'isatty' in the Windows runtime returns non-zero for every
character device, including the null device. Repair that. */
#include <io.h> #include <io.h>
#include <conio.h> #include <conio.h>
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#include <windows.h> #include <windows.h>
int w32_isatty (int fd) int
win32_isatty (int fd)
{ {
if (_isatty(fd)) if (_isatty(fd))
{ {
@ -127,7 +127,7 @@ int w32_isatty (int fd)
return 0; return 0;
} }
#define isatty(x) w32_isatty(x) #define isatty(x) win32_isatty(x)
#endif #endif
/* **************************************************************** */ /* **************************************************************** */