projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChangeLog: s/^ /\t/
[gnulib.git]
/
lib
/
readline.c
diff --git
a/lib/readline.c
b/lib/readline.c
index
f2ddcaa
..
72a93c3
100644
(file)
--- a/
lib/readline.c
+++ b/
lib/readline.c
@@
-1,11
+1,11
@@
/* readline.c --- Simple implementation of readline.
/* readline.c --- Simple implementation of readline.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005
-2007, 2009-2011
Free Software Foundation, Inc.
Written by Simon Josefsson
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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,14
+13,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 need
+/* This module is intended to be used when the application only need
s
the readline interface. If you need more functions from the
readline library, it is recommended to require the readline library
(or improve this module) rather than #if-protect part of your
the readline interface. If you need more functions from the
readline library, it is recommended to require the readline library
(or improve this module) rather than #if-protect part of your
@@
-34,7
+31,6
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#include <getline.h>
char *
readline (const char *prompt)
char *
readline (const char *prompt)
@@
-43,14
+39,16
@@
readline (const char *prompt)
size_t size = 0;
if (prompt)
size_t size = 0;
if (prompt)
- fputs (prompt, stdout);
+ {
+ fputs (prompt, stdout);
+ fflush (stdout);
+ }
if (getline (&out, &size, stdin) < 0)
return NULL;
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')
+ while (*out && (out[strlen (out) - 1] == '\r'
+ || out[strlen (out) - 1] == '\n'))
out[strlen (out) - 1] = '\0';
return out;
out[strlen (out) - 1] = '\0';
return out;