From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 10 Nov 2005 02:19:29 +0000 (+0000)
Subject: * readline.c: Remove EOL.
X-Git-Tag: cvs-readonly~2740
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=04100c39ec27510503ef803a99d895c943ddac12;p=gnulib.git

* readline.c: Remove EOL.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 91db74a39..a84cf1310 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-10  Simon Josefsson  <jas@extundo.com>
+
+	* readline.c: Remove EOL.
+
 2005-11-08  Eric Blake  <ebb9@byu.net>
 
 	* inet_ntop.h: Use #if !, not #ifndef, for AC_CHECK_DECLS.
diff --git a/lib/readline.c b/lib/readline.c
index 3f8c18ae4..f2ddcaaaa 100644
--- a/lib/readline.c
+++ b/lib/readline.c
@@ -33,6 +33,7 @@
 #include "readline.h"
 
 #include <stdio.h>
+#include <string.h>
 #include <getline.h>
 
 char *
@@ -47,5 +48,10 @@ readline (const char *prompt)
   if (getline (&out, &size, stdin) < 0)
     return NULL;
 
+  if (out[strlen (out) - 1] == '\r')
+    out[strlen (out) - 1] = '\0';
+  if (out[strlen (out) - 1] == '\n')
+    out[strlen (out) - 1] = '\0';
+
   return out;
 }