This commit was manufactured by cvs2svn to create branch 'msnyder-msnyder-reverse-20060331-branchpoint

reverse-20060331-branch'.

Sprout from gdb-csl-available-20060303-branch 2006-03-03 15:57:44 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'gdb-csl-'
Cherrypick from master 2006-03-30 00:22:20 UTC Ben Elliston <bje@au.ibm.com> '	PR ld/2267':
    ChangeLog
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/aoutx.h
    bfd/archures.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/bfd.c
    bfd/coff-arm.c
    bfd/coff-h8300.c
    bfd/coff-ppc.c
    bfd/cofflink.c
    bfd/config.bfd
    bfd/configure
    bfd/configure.in
    bfd/cpu-arm.c
    bfd/cpu-m68k.c
    bfd/dwarf2.c
    bfd/ecoff.c
    bfd/ecofflink.c
    bfd/elf-bfd.h
    bfd/elf-m10300.c
    bfd/elf-strtab.c
    bfd/elf.c
    bfd/elf32-arm.c
    bfd/elf32-bfin.c
    bfd/elf32-cris.c
    bfd/elf32-frv.c
    bfd/elf32-hppa.c
    bfd/elf32-i386.c
    bfd/elf32-m32r.c
    bfd/elf32-m68hc1x.c
    bfd/elf32-m68k.c
    bfd/elf32-mips.c
    bfd/elf32-ppc.c
    bfd/elf32-s390.c
    bfd/elf32-sh.c
    bfd/elf32-vax.c
    bfd/elf32-xtensa.c
    bfd/elf64-alpha.c
    bfd/elf64-hppa.c
    bfd/elf64-ppc.c
    bfd/elf64-s390.c
    bfd/elf64-sh64.c
    bfd/elf64-x86-64.c
    bfd/elflink.c
    bfd/elfxx-ia64.c
    bfd/elfxx-mips.c
    bfd/elfxx-mips.h
    bfd/elfxx-sparc.c
    bfd/hash.c
    bfd/i386linux.c
    bfd/ieee.c
    bfd/libaout.h
    bfd/libbfd-in.h
    bfd/libbfd.h
    bfd/libcoff-in.h
    bfd/libcoff.h
    bfd/linker.c
    bfd/m68klinux.c
    bfd/merge.c
    bfd/opncls.c
    bfd/pdp11.c
    bfd/reloc.c
    bfd/section.c
    bfd/sparclinux.c
    bfd/stabs.c
    bfd/sunos.c
    bfd/targets.c
    bfd/version.h
    bfd/vms.c
    bfd/xcofflink.c
    configure
    configure.in
    cpu/ChangeLog
    cpu/m32c.cpu
    cpu/m32c.opc
    gdb/ChangeLog
    gdb/MAINTAINERS
    gdb/Makefile.in
    gdb/NEWS
    gdb/alpha-linux-nat.c
    gdb/amd64-linux-nat.c
    gdb/arm-linux-nat.c
    gdb/arm-tdep.c
    gdb/cli/cli-script.c
    gdb/config/frv/frv.mt
    gdb/config/pa/hppa64.mt
    gdb/config/s390/s390.mh
    gdb/configure
    gdb/configure.ac
    gdb/configure.tgt
    gdb/doc/gdbint.texinfo
    gdb/frv-linux-tdep.c
    gdb/gdbserver/ChangeLog
    gdb/gdbserver/Makefile.in
    gdb/gdbserver/config.in
    gdb/gdbserver/configure
    gdb/gdbserver/configure.ac
    gdb/gdbserver/gdb_proc_service.h
    gdb/gdbserver/linux-i386-low.c
    gdb/gdbserver/linux-mips-low.c
    gdb/gdbserver/linux-x86-64-low.c
    gdb/gdbserver/proc-service.c
    gdb/gdbserver/thread-db.c
    gdb/hppa-linux-nat.c
    gdb/i386-linux-nat.c
    gdb/i386-tdep.c
    gdb/ia64-linux-nat.c
    gdb/ia64-tdep.c
    gdb/libunwind-frame.c
    gdb/libunwind-frame.h
    gdb/linux-fork.c
    gdb/linux-nat.c
    gdb/linux-nat.h
    gdb/m32r-linux-nat.c
    gdb/m68klinux-nat.c
    gdb/mi/gdb-mi.el
    gdb/mips-linux-nat.c
    gdb/mips-linux-tdep.c
    gdb/mips-linux-tdep.h
    gdb/mips-mdebug-tdep.c
    gdb/mips-tdep.c
    gdb/ppc-linux-nat.c
    gdb/prologue-value.c
    gdb/prologue-value.h
    gdb/remote-rdp.c
    gdb/remote.c
    gdb/s390-nat.c
    gdb/sh-tdep.c
    gdb/solib-frv.c
    gdb/solib-som.c
    gdb/solib-svr4.c
    gdb/sparc-linux-nat.c
    gdb/sparc64-linux-nat.c
    gdb/symtab.h
    gdb/target.c
    gdb/testsuite/ChangeLog
    gdb/testsuite/gdb.arch/altivec-abi.exp
    gdb/testsuite/gdb.arch/altivec-regs.exp
    gdb/testsuite/gdb.arch/e500-abi.exp
    gdb/testsuite/gdb.arch/e500-regs.exp
    gdb/testsuite/gdb.base/all-bin.exp
    gdb/testsuite/gdb.base/annota1.exp
    gdb/testsuite/gdb.base/annota3.exp
    gdb/testsuite/gdb.base/args.exp
    gdb/testsuite/gdb.base/arithmet.exp
    gdb/testsuite/gdb.base/assign.exp
    gdb/testsuite/gdb.base/async.exp
    gdb/testsuite/gdb.base/bang.exp
    gdb/testsuite/gdb.base/break.exp
    gdb/testsuite/gdb.base/call-rt-st.exp
    gdb/testsuite/gdb.base/completion.exp
    gdb/testsuite/gdb.base/cond-expr.exp
    gdb/testsuite/gdb.base/condbreak.exp
    gdb/testsuite/gdb.base/consecutive.exp
    gdb/testsuite/gdb.base/define.exp
    gdb/testsuite/gdb.base/display.exp
    gdb/testsuite/gdb.base/ena-dis-br.exp
    gdb/testsuite/gdb.base/environ.exp
    gdb/testsuite/gdb.base/eval-skip.exp
    gdb/testsuite/gdb.base/info-proc.exp
    gdb/testsuite/gdb.base/jump.exp
    gdb/testsuite/gdb.base/logical.exp
    gdb/testsuite/gdb.base/long_long.exp
    gdb/testsuite/gdb.base/maint.exp
    gdb/testsuite/gdb.base/miscexprs.exp
    gdb/testsuite/gdb.base/pc-fp.exp
    gdb/testsuite/gdb.base/pointers.exp
    gdb/testsuite/gdb.base/prelink-lib.c
    gdb/testsuite/gdb.base/prelink.c
    gdb/testsuite/gdb.base/prelink.exp
    gdb/testsuite/gdb.base/relational.exp
    gdb/testsuite/gdb.base/reread.exp
    gdb/testsuite/gdb.base/sect-cmd.exp
    gdb/testsuite/gdb.base/sep.exp
    gdb/testsuite/gdb.base/sepdebug.exp
    gdb/testsuite/gdb.base/until.exp
    gdb/testsuite/gdb.base/whatis-exp.exp
    gdb/testsuite/gdb.cp/annota2.exp
    gdb/testsuite/gdb.cp/annota3.exp
    gdb/testsuite/gdb.mi/array.f
    gdb/testsuite/gdb.mi/mi-var-child-f.exp
    gdb/testsuite/gdb.trace/actions.exp
    gdb/testsuite/gdb.trace/backtrace.exp
    gdb/testsuite/gdb.trace/circ.exp
    gdb/testsuite/gdb.trace/collection.exp
    gdb/testsuite/gdb.trace/deltrace.exp
    gdb/testsuite/gdb.trace/infotrace.exp
    gdb/testsuite/gdb.trace/limits.exp
    gdb/testsuite/gdb.trace/packetlen.exp
    gdb/testsuite/gdb.trace/passc-dyn.exp
    gdb/testsuite/gdb.trace/passcount.exp
    gdb/testsuite/gdb.trace/report.exp
    gdb/testsuite/gdb.trace/save-trace.exp
    gdb/testsuite/gdb.trace/tfind.exp
    gdb/testsuite/gdb.trace/tracecmd.exp
    gdb/testsuite/gdb.trace/while-dyn.exp
    gdb/testsuite/gdb.trace/while-stepping.exp
    gdb/testsuite/lib/compiler.c
    gdb/testsuite/lib/compiler.cc
    gdb/testsuite/lib/gdb.exp
    gdb/top.c
    gdb/top.h
    gdb/tracepoint.c
    gdb/tui/tui-hooks.c
    gdb/utils.c
    gdb/varobj.c
    gdb/version.in
    gdb/xstormy16-tdep.c
    include/ChangeLog
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/bfin.h
    include/elf/hppa.h
    include/elf/m68k.h
    include/elf/mips.h
    include/elf/x86-64.h
    include/opcode/ChangeLog
    include/opcode/arm.h
    include/opcode/hppa.h
    include/opcode/m68k.h
    libiberty/ChangeLog
    libiberty/functions.texi
    libiberty/pex-common.c
    libiberty/pex-common.h
    opcodes/ChangeLog
    opcodes/arm-dis.c
    opcodes/bfin-dis.c
    opcodes/cgen-ibld.in
    opcodes/fr30-ibld.c
    opcodes/frv-ibld.c
    opcodes/i386-dis.c
    opcodes/ip2k-ibld.c
    opcodes/iq2000-asm.c
    opcodes/iq2000-ibld.c
    opcodes/m32c-asm.c
    opcodes/m32c-desc.c
    opcodes/m32c-desc.h
    opcodes/m32c-dis.c
    opcodes/m32c-ibld.c
    opcodes/m32c-opc.c
    opcodes/m32c-opc.h
    opcodes/m32r-ibld.c
    opcodes/openrisc-ibld.c
    opcodes/po/sv.po
    opcodes/xc16x-ibld.c
    opcodes/xstormy16-ibld.c
    readline/ChangeLog.gdb
    readline/histfile.c
    sim/ChangeLog
    sim/MAINTAINERS
    sim/arm/ChangeLog
    sim/arm/armos.c
    sim/common/ChangeLog
    sim/common/aclocal.m4
    sim/m32c/ChangeLog
    sim/m32c/mem.c
    sim/m32c/r8c.opc
    sim/m32c/reg.c
    sim/m32c/syscall.h
    sim/m32c/syscalls.c
    sim/m68hc11/ChangeLog
    sim/m68hc11/configure
    sim/mips/ChangeLog
    sim/mips/configure
    sim/mn10300/ChangeLog
    sim/mn10300/configure
Cherrypick from master 2006-03-31 19:47:11 UTC Michael Snyder <msnyder@vmware.com> '2006-03-31  Michael Snyder  <msnyder@redhat.com>':
    gdb/doc/ChangeLog
    gdb/doc/gdb.texinfo
Delete:
    gdb/nlm/Makefile.in
    gdb/nlm/configure
    gdb/nlm/configure.in
    gdb/nlm/gdbserve.c
    gdb/nlm/gdbserve.def
    gdb/nlm/i386.c
    gdb/nlm/i386.h
    gdb/nlm/ppc.c
    gdb/nlm/ppc.h
    gdb/nlm/prelude.c

2 files changed, 9 insertions, 1 deletions

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 28cb1f2..863beca 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,8 @@
+2006-03-21  Denis Pilat  <denis.pilat@st.com>
+
+	* histfile.c (read_history_range): Remove '\r' character from
+	history lines.
+
 2005-02-10  Denis Pilat  <denis.pilat@st.com>
 
 	* readline/terminal.c (_rl_get_screen_size): Get console size from
diff --git a/readline/histfile.c b/readline/histfile.c
index 60a9125..c19630d 100644
--- a/readline/histfile.c
+++ b/readline/histfile.c
@@ -228,7 +228,10 @@ read_history_range (filename, from, to)
   for (line_end = line_start; line_end < bufend; line_end++)
     if (*line_end == '\n')
       {
-	*line_end = '\0';
+	if (line_end - 1 >= line_start && *(line_end - 1) == '\r')
+	  *(line_end - 1) = '\0';
+	else
+	  *line_end = '\0';
 
 	if (*line_start)
 	  add_history (line_start);