* readline.c: Remove EOL.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 91db74a39c2f4af7f8671e4936d6aecf13972cbd..a84cf13103ed2c1aecd238b0da44862aa2b58111 100644 (file)
--- 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 3f8c18ae444afd6ca2d3fa23a78769e5fdfb71de..f2ddcaaaa13285e57618e71c7f85ccf65512e74a 100644 (file)
--- 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;
 }