[PATCH 1/2] [WineDbg]: also get rid of trailing \r in input_read_line
Eric Pouech
eric.pouech at orange.fr
Tue Mar 15 16:26:49 CDT 2011
A+
---
programs/winedbg/dbg.y | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y
index c7e2c3b..4f2da25 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';
More information about the wine-patches
mailing list