diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/hist.c | 40 |
2 files changed, 42 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 05d5b9721..db222762a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-22 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 34604: Src/hist.c: Work around problem with changes in Meta + affecting history file when read in. + 2015-02-21 Barton E. Schaefer <schaefer@zsh.org> * 34597: Doc/Zsh/mod_datetime.yo: Revise strftime description to diff --git a/Src/hist.c b/Src/hist.c index 381c7e2e5..acc425994 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -3377,11 +3377,45 @@ histsplitwords(char *lineptr, short **wordsp, int *nwordsp, int *nwordposp, char *start = lineptr; if (uselex) { - LinkList wordlist = bufferwords(NULL, lineptr, NULL, - LEXFLAGS_COMMENTS_KEEP); + LinkList wordlist; LinkNode wordnode; - int nwords_max; + int nwords_max, remeta = 0; + char *ptr; + + /* + * Handle the special case that we're reading from an + * old shell with fewer meta characters, so we need to + * metafy some more. (It's not clear why the history + * file is metafied at all; some would say this is plain + * stupid. But we're stuck with it now without some + * hairy workarounds for compatibility). + * + * This is rare so doesn't need to be that efficient; just + * allocate space off the heap. + * + * Note that our it's currently believed this all comes out in + * the wash in the non-uselex case owing to where unmetafication + * and metafication happen. + */ + for (ptr = lineptr; *ptr; ptr++) { + if (*ptr != Meta && imeta(*ptr)) + remeta++; + } + if (remeta) { + char *ptr2, *line2; + ptr2 = line2 = (char *)zhalloc((ptr - lineptr) + remeta + 1); + for (ptr = lineptr; *ptr; ptr++) { + if (*ptr != Meta && imeta(*ptr)) { + *ptr2++ = Meta; + *ptr2++ = *ptr ^ 32; + } else + *ptr2++ = *ptr; + } + lineptr = line2; + } + wordlist = bufferwords(NULL, lineptr, NULL, + LEXFLAGS_COMMENTS_KEEP); nwords_max = 2 * countlinknodes(wordlist); if (nwords_max > nwords) { *nwordsp = nwords = nwords_max; |