diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2020-02-07 14:57:47 -0500 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-06-30 15:10:46 -0600 |
| commit | c74251adf3de3f0b248802a0aeb832f4e2471f1a (patch) | |
| tree | 41b3e9234894ccff152115c6980fa8c0854c7541 | |
| parent | fca1f7036a4e9444e790e32e6206d80ef4a0db97 (diff) | |
| download | fsf-binutils-gdb-c74251adf3de3f0b248802a0aeb832f4e2471f1a.zip fsf-binutils-gdb-c74251adf3de3f0b248802a0aeb832f4e2471f1a.tar.gz fsf-binutils-gdb-c74251adf3de3f0b248802a0aeb832f4e2471f1a.tar.bz2 | |
reading history entries with timestamps can result in joined entries
| -rw-r--r-- | readline/readline/histfile.c | 15 | ||||
| -rw-r--r-- | readline/readline/patchlevel | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/readline/readline/histfile.c b/readline/readline/histfile.c index a8a92aa..6c3adc9 100644 --- a/readline/readline/histfile.c +++ b/readline/readline/histfile.c @@ -369,9 +369,11 @@ read_history_range (const char *filename, int from, int to) } has_timestamps = HIST_TIMESTAMP_START (buffer); - history_multiline_entries += has_timestamps && history_write_timestamps; + history_multiline_entries += has_timestamps && history_write_timestamps; /* Skip lines until we are at FROM. */ + if (has_timestamps) + last_ts = buffer; for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) if (*line_end == '\n') { @@ -380,7 +382,18 @@ read_history_range (const char *filename, int from, int to) line. We should check more extensively here... */ if (HIST_TIMESTAMP_START(p) == 0) current_line++; + else + last_ts = p; line_start = p; + /* If we are at the last line (current_line == from) but we have + timestamps (has_timestamps), then line_start points to the + text of the last command, and we need to skip to its end. */ + if (current_line >= from && has_timestamps) + { + for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) + ; + line_start = (*line_end == '\n') ? line_end + 1 : line_end; + } } /* If there are lines left to gobble, then gobble them now. */ diff --git a/readline/readline/patchlevel b/readline/readline/patchlevel index 7cbda82..ce3e355 100644 --- a/readline/readline/patchlevel +++ b/readline/readline/patchlevel @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -2 +3 |