pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-09 13:10:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20170512 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2017-05-15 10:11:27 -04:00
parent 8a10051448
commit ea921184eb
6 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/readline/display.c
+1 -1
View File
@@ -466,7 +466,7 @@ expand_prompt (char *pmt, int flags, int *lp, int *lip, int *niflp, int *vlp)
{
#if defined (HANDLE_MULTIBYTE)
if (mb_cur_max > 1 && rl_byte_oriented == 0)
new = _rl_find_prev_mbchar (r, r - ret, MB_FIND_ANY);
new = _rl_find_prev_mbchar (ret, r - ret, MB_FIND_ANY);
else
#endif
new = r - ret - (physchars - bound); /* XXX */
lib/readline/rlmbutil.h
+4
View File
@@ -200,6 +200,10 @@ _rl_wcwidth (wc)
#define UTF8_SINGLEBYTE(c) (1)
#if !defined (HAVE_WCHAR_T) && !defined (wchar_t)
# define wchar_t int
#endif
#endif /* !HANDLE_MULTIBYTE */
extern int rl_byte_oriented;
lib/readline/text.c
+32 -4
View File
@@ -1327,7 +1327,8 @@ static int
rl_change_case (int count, int op)
{
int start, next, end;
int inword, c, nc, nop;
int inword, nc, nop;
wchar_t c;
#if defined (HANDLE_MULTIBYTE)
wchar_t wc, nwc;
char mb[MB_LEN_MAX+1];
@@ -1377,7 +1378,10 @@ rl_change_case (int count, int op)
}
else
nop = op;
if (MB_CUR_MAX == 1 || rl_byte_oriented || isascii ((unsigned char)c))
/* Can't check isascii here; some languages (e.g, Turkish) have
multibyte upper and lower case equivalents of single-byte ascii
characters */
if (MB_CUR_MAX == 1 || rl_byte_oriented)
{
nc = (nop == UpCase) ? _rl_to_upper (c) : _rl_to_lower (c);
rl_line_buffer[start] = nc;
@@ -1393,11 +1397,35 @@ rl_change_case (int count, int op)
nwc = (nop == UpCase) ? _rl_to_wupper (wc) : _rl_to_wlower (wc);
if (nwc != wc) /* just skip unchanged characters */
{
char *s, *e;
mlen = wcrtomb (mb, nwc, &mps);
if (mlen > 0)
mb[mlen] = '\0';
/* Assume the same width */
strncpy (rl_line_buffer + start, mb, mlen);
/* what to do if m != mlen? adjust below */
/* m == length of old char, mlen == length of new char */
s = rl_line_buffer + start;
e = rl_line_buffer + rl_end;
if (m == mlen)
memcpy (s, mb, mlen);
else if (m > mlen)
{
memcpy (s, mb, mlen);
memmove (s + mlen, s + m, (e - s) - m);
next -= m - mlen; /* next char changes */
end -= m - mlen; /* end of word changes */
rl_end -= m - mlen; /* end of line changes */
rl_line_buffer[rl_end] = 0;
}
else if (m < mlen)
{
rl_extend_line_buffer (mlen - m + 1);
memmove (s + mlen, s + m, (e - s) - m);
memcpy (s, mb, mlen);
next += mlen - m; /* next char changes */
end += mlen - m; /* end of word changes */
rl_end += mlen - m; /* end of line changes */
rl_line_buffer[rl_end] = 0;
}
}
}
#endif