X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadline.c;h=d42f29669e3ca0add8b2a2ae98b9b6101237915d;hb=5432287a033855c8c7a36f3aa055e0db60fb3383;hp=52f002ed7bda8803634abef37e6af26fcf61966d;hpb=83f8d91ff14a7cc245fcd195f701d27b514d4f19;p=gnulib.git

diff --git a/lib/readline.c b/lib/readline.c
index 52f002ed7..d42f29669 100644
--- a/lib/readline.c
+++ b/lib/readline.c
@@ -1,11 +1,11 @@
 /* readline.c --- Simple implementation of readline.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
    Written by Simon Josefsson
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,12 +13,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* This module is intended to be used when the application only needs
    the readline interface.  If you need more functions from the
@@ -34,7 +31,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <getline.h>
 
 char *
 readline (const char *prompt)
@@ -43,13 +39,16 @@ readline (const char *prompt)
   size_t size = 0;
 
   if (prompt)
-    fputs (prompt, stdout);
+    {
+      fputs (prompt, stdout);
+      fflush (stdout);
+    }
 
   if (getline (&out, &size, stdin) < 0)
     return NULL;
 
   while (*out && (out[strlen (out) - 1] == '\r'
-		  || out[strlen (out) - 1] == '\n'))
+                  || out[strlen (out) - 1] == '\n'))
     out[strlen (out) - 1] = '\0';
 
   return out;