aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1993-02-18 12:18:23 +0000
committerJohn Gilmore <gnu@cygnus>1993-02-18 12:18:23 +0000
commitc5c00171a20baef8541b9d61df233546e6e4d3bf (patch)
tree753425238bcd478065141626bef72771df9d964b
parenteece984d9936b0854ff7d0d5e01f618ff9d843f7 (diff)
downloadgdb-c5c00171a20baef8541b9d61df233546e6e4d3bf.zip
gdb-c5c00171a20baef8541b9d61df233546e6e4d3bf.tar.gz
gdb-c5c00171a20baef8541b9d61df233546e6e4d3bf.tar.bz2
* c-lang.c (c_printstr): If a C string ends in a null, don't
print the null.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/c-lang.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c98aba..b528a99 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 18 04:10:06 1993 John Gilmore (gnu@cygnus.com)
+
+ * c-lang.c (c_printstr): If a C string ends in a null, don't
+ print the null.
+
Thu Feb 18 02:39:21 1993 Stu Grossman (grossman at cygnus.com)
* defs.h (STRCMP): Make it work for unsigned chars.
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index df88210..bfa03d0 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -1,5 +1,5 @@
/* C language support routines for GDB, the GNU debugger.
- Copyright 1992 Free Software Foundation, Inc.
+ Copyright 1992, 1993 Free Software Foundation, Inc.
This file is part of GDB.
@@ -108,6 +108,12 @@ c_printstr (stream, string, length, force_ellipses)
extern int repeat_count_threshold;
extern int print_max;
+ /* If the string was not truncated due to `set print elements', and
+ the last byte of it is a null, we don't print that, in traditional C
+ style. */
+ if ((!force_ellipses) && string[length-1] == '\0')
+ length--;
+
if (length == 0)
{
fputs_filtered ("\"\"", stdout);