mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-08-11 20:50:42 +02:00
commit bash-20100520 snapshot
This commit is contained in:
+32
-1
@@ -49,13 +49,20 @@ ansicstr (string, len, flags, sawc, rlen)
|
||||
char *string;
|
||||
int len, flags, *sawc, *rlen;
|
||||
{
|
||||
int c, temp;
|
||||
int c, temp, v;
|
||||
char *ret, *r, *s;
|
||||
#if defined (HANDLE_MULTIBYTE)
|
||||
char mbch[25]; /* 25 > MB_LEN_MAX, plus can handle 4-byte UTF-8 and large Unicode characters*/
|
||||
#endif
|
||||
|
||||
if (string == 0 || *string == '\0')
|
||||
return ((char *)NULL);
|
||||
|
||||
#if defined (HANDLE_MULTIBYTE)
|
||||
ret = (char *)xmalloc (4*len + 1);
|
||||
#else
|
||||
ret = (char *)xmalloc (2*len + 1); /* 2*len for possible CTLESC */
|
||||
#endif
|
||||
for (r = ret, s = string; s && *s; )
|
||||
{
|
||||
c = *s++;
|
||||
@@ -128,6 +135,30 @@ ansicstr (string, len, flags, sawc, rlen)
|
||||
}
|
||||
c &= 0xFF;
|
||||
break;
|
||||
#if defined (HANDLE_MULTIBYTE)
|
||||
case 'u':
|
||||
case 'U':
|
||||
temp = (c == 'u') ? 4 : 8; /* \uNNNN \UNNNNNNNN */
|
||||
for (v = 0; ISXDIGIT ((unsigned char)*s) && temp--; s++)
|
||||
v = (v * 16) + HEXVALUE (*s);
|
||||
if (temp == ((c == 'u') ? 4 : 8))
|
||||
{
|
||||
*r++ = '\\'; /* c remains unchanged */
|
||||
break;
|
||||
}
|
||||
else if (v <= UCHAR_MAX)
|
||||
{
|
||||
c = v;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
memset (mbch, '\0', sizeof (mbch));
|
||||
temp = u32cconv (v, r);
|
||||
r += temp;
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
case '\\':
|
||||
break;
|
||||
case '\'': case '"': case '?':
|
||||
|
||||
Reference in New Issue
Block a user