summaryrefslogtreecommitdiffstats
path: root/contrib/libreadline/histfile.c
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2006-12-31 09:06:30 +0000
committerache <ache@FreeBSD.org>2006-12-31 09:06:30 +0000
commit0e6bca45b1aeb189311204a2b5d10ca61fdf4ae3 (patch)
tree7ab23277706b512032dc5a9144d193728ba52eae /contrib/libreadline/histfile.c
parentead5fc05b9835be798994dfae32172fde03e9d74 (diff)
downloadFreeBSD-src-0e6bca45b1aeb189311204a2b5d10ca61fdf4ae3.zip
FreeBSD-src-0e6bca45b1aeb189311204a2b5d10ca61fdf4ae3.tar.gz
Virgin import of GNU Readline 5.2
Diffstat (limited to 'contrib/libreadline/histfile.c')
-rw-r--r--contrib/libreadline/histfile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/libreadline/histfile.c b/contrib/libreadline/histfile.c
index 717bbee..2f051a3 100644
--- a/contrib/libreadline/histfile.c
+++ b/contrib/libreadline/histfile.c
@@ -256,7 +256,11 @@ read_history_range (filename, from, to)
for (line_end = line_start; line_end < bufend; line_end++)
if (*line_end == '\n')
{
- *line_end = '\0';
+ /* Change to allow Windows-like \r\n end of line delimiter. */
+ if (line_end > line_start && line_end[-1] == '\r')
+ line_end[-1] = '\0';
+ else
+ *line_end = '\0';
if (*line_start)
{
OpenPOWER on IntegriCloud