From 77eefaed583ad3f6c53378c63b364d0dcc6912c5 Mon Sep 17 00:00:00 2001
From: Eric Pouech <eric.pouech@orange.fr>
Date: Tue, 15 Mar 2011 22:26:49 +0100
Subject: [PATCH] winedbg: Also get rid of trailing \r in input_read_line.

---
 programs/winedbg/dbg.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y
index c7e2c3b000a..4f2da252e66 100644
--- a/programs/winedbg/dbg.y
+++ b/programs/winedbg/dbg.y
@@ -507,8 +507,8 @@ int input_read_line(const char* pfx, char* buf, int size)
 
     int len = input_fetch_entire_line(pfx, &line);
     if (len < 0) return 0;
-    /* remove trailing \n */
-    if (len > 0 && line[len - 1] == '\n') len--;
+    /* remove trailing \n and \r */
+    while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r')) len--;
     len = min(size - 1, len);
     memcpy(buf, line, len);
     buf[len] = '\0';
-- 
2.11.4.GIT