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

Fix constness problem in ioscm_make_gdb_stdio_port 

ioscm_make_gdb_stdio_port passes const char pointers (literal strings) to
scm_mode_bits, which takes a non-const char pointer.  Ideally, we would
change scm_mode_bits to take a const char pointer, but it's not part of
an API we control.

Instead, it's easy enough to build the string to pass to scm_mode_bits in
a (non-const) char array and pass that.

gdb/ChangeLog:

	* guile/scm-ports.c (ioscm_make_gdb_stdio_port): Pass non-const
	char pointer to scm_mode_bits.
This commit is contained in:
Simon Marchi 2015-10-26 08:41:38 -04:00
parent 585a269afb
commit 48ffa2b8cd
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-26 Simon Marchi <simon.marchi@polymtl.ca>
* guile/scm-ports.c (ioscm_make_gdb_stdio_port): Pass non-const
char pointer to scm_mode_bits.
2015-10-26 Simon Marchi <simon.marchi@polymtl.ca> 2015-10-26 Simon Marchi <simon.marchi@polymtl.ca>
* symtab.c (default_make_symbol_completion_list_break_on_1): Add * symtab.c (default_make_symbol_completion_list_break_on_1): Add

15
gdb/guile/scm-ports.c
View File

@ -357,29 +357,36 @@ ioscm_init_stdio_buffers (SCM port, long mode_bits)
static SCM static SCM
ioscm_make_gdb_stdio_port (int fd) ioscm_make_gdb_stdio_port (int fd)
{ {
int is_a_tty = isatty (fd);
const char *name; const char *name;
long mode_bits; long mode_bits;
SCM port; SCM port;
char buf[3];
memset (buf, 0, sizeof (buf));
switch (fd) switch (fd)
{ {
case 0: case 0:
name = input_port_name; name = input_port_name;
mode_bits = scm_mode_bits (is_a_tty ? "r0" : "r"); buf[0] = 'r';
break; break;
case 1: case 1:
name = output_port_name; name = output_port_name;
mode_bits = scm_mode_bits (is_a_tty ? "w0" : "w"); buf[0] = 'w';
break; break;
case 2: case 2:
name = error_port_name; name = error_port_name;
mode_bits = scm_mode_bits (is_a_tty ? "w0" : "w"); buf[0] = 'w';
break; break;
default: default:
gdb_assert_not_reached ("bad stdio file descriptor"); gdb_assert_not_reached ("bad stdio file descriptor");
} }
if (isatty (fd))
buf[1] = '0';
mode_bits = scm_mode_bits (buf);
port = ioscm_open_port (stdio_port_desc, mode_bits); port = ioscm_open_port (stdio_port_desc, mode_bits);
scm_set_port_filename_x (port, gdbscm_scm_from_c_string (name)); scm_set_port_filename_x (port, gdbscm_scm_from_c_string (name));