diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-17 19:53:11 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-17 19:53:11 -0700 |
| commit | b63ff19dbf8f220f3ae8ab2ab41058f3149bde1f (patch) | |
| tree | f88f19b51aac7004fb0c458021eb530878bc2325 | |
| parent | a8a59f94991fdfd4534442f6e6578c1d6b525f51 (diff) | |
| download | zsh-b63ff19dbf8f220f3ae8ab2ab41058f3149bde1f.tar.gz zsh-b63ff19dbf8f220f3ae8ab2ab41058f3149bde1f.tar.xz zsh-b63ff19dbf8f220f3ae8ab2ab41058f3149bde1f.zip | |
32882 (cf. Augie Fackler 32879): correct reload of backslash-continuation lines from history, fix bad history write of events ending with backslashes
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/hist.c | 14 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2cd8392b2..7b4e05738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-07-17 Barton E. Schaefer <schaefer@zsh.org> + + * 32882 (cf. Augie Fackler 32879): Src/hist.c: restore correct + reload of backslash-continuation lines from history, broken by + workers/30443 just before the zsh 5.0.0 release; fix bad history + write of events ending with an even number of backslashes. + 2014-07-17 Oliver Kiddle <opk@zsh.org> * 32849: Completion/Linux/Command/_ss: new completion function diff --git a/Src/hist.c b/Src/hist.c index 64f88f559..770d559b1 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -2308,8 +2308,7 @@ readhistline(int start, char **bufp, int *bufsiz, FILE *in) } else { buf[len - 1] = '\0'; - if (len > 1 && buf[len - 2] == '\\' && - (len < 3 || buf[len - 3] != '\\')) { + if (len > 1 && buf[len - 2] == '\\') { buf[--len - 1] = '\n'; if (!feof(in)) return readhistline(len, bufp, bufsiz, in); @@ -2618,6 +2617,8 @@ savehistfile(char *fn, int err, int writeflags) ret = 0; for (; he && he->histnum <= xcurhist; he = down_histent(he)) { + int count_backslashes = 0; + if ((writeflags & HFILE_SKIPDUPS && he->node.flags & HIST_DUP) || (writeflags & HFILE_SKIPFOREIGN && he->node.flags & HIST_FOREIGN) || he->node.flags & HIST_TMPSTORE) @@ -2649,9 +2650,18 @@ savehistfile(char *fn, int err, int writeflags) if (*t == '\n') if ((ret = fputc('\\', out)) < 0) break; + if (*t == '\\') + count_backslashes++; + else + count_backslashes = 0; if ((ret = fputc(*t, out)) < 0) break; } + if (ret < 0) + break; + if (count_backslashes && (count_backslashes % 2 == 0)) + if ((ret = fputc(' ', out)) < 0) + break; if (ret < 0 || (ret = fputc('\n', out)) < 0) break; } |