mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-06 09:01:13 +02:00
Code Releases Activity

34604: Work around problem with changes in Meta characters.

Browse source 
If reading in a file that contains characters that should be
metafied but are not, fix up on the fly.  Only need when using
HIST_LEX_WORDS.
This commit is contained in:
Peter Stephenson 2015-02-22 20:22:40 +00:00
parent 009b6c9ff5
commit bcc4ab792d
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2015-02-21 Barton E. Schaefer <schaefer@zsh.org>
* 34597: Doc/Zsh/mod_datetime.yo: Revise strftime description to * 34597: Doc/Zsh/mod_datetime.yo: Revise strftime description to

40
Src/hist.c
View file

@ -3377,11 +3377,45 @@ histsplitwords(char *lineptr, short **wordsp, int *nwordsp, int *nwordposp,
char *start = lineptr; char *start = lineptr;
if (uselex) { if (uselex) {
LinkList wordlist = bufferwords(NULL, lineptr, NULL, LinkList wordlist;
LEXFLAGS_COMMENTS_KEEP);
LinkNode wordnode; 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); nwords_max = 2 * countlinknodes(wordlist);
if (nwords_max > nwords) { if (nwords_max > nwords) {
*nwordsp = nwords = nwords_max; *nwordsp = nwords = nwords_max;