diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/hist.c | 3 | ||||
| -rw-r--r-- | Src/lex.c | 12 |
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index cd9393fdb..c5f2a81af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-03-22 Peter Stephenson <p.w.stephenson@ntlworld.com> + * 34759: Src/hist.c, Src/lex.c: safer implementation. + * 34758: Src/hist.c, Src/lex.c: more problems with history interaction with command substitution: rewind over input history text when necessary. diff --git a/Src/hist.c b/Src/hist.c index 70dfac036..b44f4ad18 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -527,7 +527,8 @@ histsubchar(int c) static int marg = -1; static zlong mev = -1; char *buf, *ptr; - char *sline, *lexraw_mark; + char *sline; + int lexraw_mark; Histent ehist; size_t buflen; diff --git a/Src/lex.c b/Src/lex.c index 6b9e94289..6d0079c8f 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -1872,22 +1872,22 @@ zshlex_raw_back(void) } /**/ -char * +int zshlex_raw_mark(int offset) { if (!lex_add_raw) - return NULL; - return lexbuf_raw.ptr + offset; + return 0; + return lexbuf_raw.len + offset; } /**/ void -zshlex_raw_back_to_mark(char *mark) +zshlex_raw_back_to_mark(int mark) { if (!lex_add_raw) return; - lexbuf_raw.len -= lexbuf_raw.ptr - mark; - lexbuf_raw.ptr = mark; + lexbuf_raw.ptr = tokstr_raw + mark; + lexbuf_raw.len = mark; } /* |