mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-13 02:56:18 +02:00
Code

Merge branch 'master' of git://git.code.sf.net/p/zsh/code 

Conflicts:
	ChangeLog
This commit is contained in:
Barton E. Schaefer 2014-08-22 09:14:50 -07:00
parent cb468501c9 33ad7174f6
commit 7d2912de04
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* 33042: NEWS, Src/jobs.c: $? and $pipestatus report 128+signal
number for stopped jobs as well as terminated jobs
2014-08-21 Mikael Magnusson <mikachu@gmail.com>
* 33038: Src/glob.c: Fix {a..b} expansion hanging when either
endpoint is a literal NUL character
2014-08-20 Barton E. Schaefer <schaefer@zsh.org>
* Lokesh Mandvekar: 33032: Completion/Linux/Command/_docker,

4
Src/glob.c
View File

@ -2219,7 +2219,7 @@ xpandbraces(LinkList list, LinkNode *np)
uremnode(list, node);
strp = str - str3;
lenalloc = strp + strlen(str2+1) + 1;
for (; cend >= cstart; cend--) {
do {
#ifdef MULTIBYTE_SUPPORT
char *ncptr;
int nclen;
@ -2239,7 +2239,7 @@ xpandbraces(LinkList list, LinkNode *np)
insertlinknode(list, last, p);
if (rev) /* decreasing: add in reverse order. */
last = nextnode(last);
}
} while (cend-- > cstart);
*np = nextnode(olast);
return;
}