1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-07-12 17:11:25 +02:00

49991: single-byte brace expansion handles $'\0' and control character output aligns with multibyte

This commit is contained in:
Bart Schaefer 2022-04-04 14:21:50 -07:00
parent bdd37b4c14
commit b80d160039
3 changed files with 17 additions and 12 deletions

View file

@ -1,5 +1,8 @@
2022-04-04 Bart Schaefer <schaefer@zsh.org>
* 49991: Src/glob.c, Src/utils.c: single-byte brace expansion
handles $'\0' and control character output aligns with multibyte
* 49990: Src/hist.c: in single-byte, like multibyte, casemodify()
avoids metafying characters that it otherwise did not touch

View file

@ -2220,7 +2220,7 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p)
#ifdef MULTIBYTE_SUPPORT
cstart == WEOF ||
#else
!cstart ||
!*pconv ||
#endif
pnext[0] != '.' || pnext[1] != '.')
return 0;
@ -2241,7 +2241,7 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p)
#ifdef MULTIBYTE_SUPPORT
cend == WEOF ||
#else
!cend ||
!*pconv ||
#endif
*pnext != Outbrace)
return 0;
@ -2305,22 +2305,19 @@ xpandbraces(LinkList list, LinkNode *np)
strp = str - str3;
lenalloc = strp + strlen(str2+1) + 1;
do {
#ifdef MULTIBYTE_SUPPORT
char *ncptr;
int nclen;
#ifdef MULTIBYTE_SUPPORT
mb_charinit();
ncptr = wcs_nicechar(cend, NULL, NULL);
#else
ncptr = nicechar(cend);
#endif
nclen = strlen(ncptr);
p = zhalloc(lenalloc + nclen);
memcpy(p, str3, strp);
memcpy(p + strp, ncptr, nclen);
strcpy(p + strp + nclen, str2 + 1);
#else
p = zhalloc(lenalloc + 1);
memcpy(p, str3, strp);
sprintf(p + strp, "%c", cend);
strcat(p + strp, str2 + 1);
#endif
insertlinknode(list, last, p);
if (rev) /* decreasing: add in reverse order. */
last = nextnode(last);

View file

@ -557,9 +557,14 @@ nicechar(int c)
*s++ = '\\';
c = 't';
} else if (c < 0x20) {
*s++ = '\\';
*s++ = 'C';
*s++ = '-';
/*
if (quotable) {
*s++ = '\\';
*s++ = 'C';
*s++ = '-';
} else
*/
*s++ = '^';
c += 0x40;
}
done: