diff options
author | Chet Ramey <chet.ramey@case.edu> | 2020-02-07 14:57:47 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2020-02-07 14:57:47 -0500 |
commit | f5720c8cabbdb2387b4dc9e36633a73df6a634da (patch) | |
tree | 0d50eddd62d169e7d2853f0a0ddd586a6504609b | |
parent | d063aa6a54e670adeaa9b71385394dbf8dc9ff63 (diff) | |
download | readline-f5720c8cabbdb2387b4dc9e36633a73df6a634da.tar.gz |
reading history entries with timestamps can result in joined entries
-rw-r--r-- | histfile.c | 15 | ||||
-rw-r--r-- | patchlevel | 2 |
2 files changed, 15 insertions, 2 deletions
@@ -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. */ @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -2 +3 |