mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

22753: minor character bugs spotted on Cygwin

Browse Source
This commit is contained in:
Peter Stephenson 2006-09-21 16:36:53 +00:00
parent 286ca1d487
commit 78d1939ffd
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-09-21 Peter Stephenson <pws@csr.com>
* 22753: Src/prompt.c, Src/utils.c, Src/Zle/complist.c:
minor bugs with using characters spotted from warnings on
Cygwin.
2006-09-20 Peter Stephenson <pws@csr.com>
* users/10748: Doc/Zsh/compsys.yo: improve example, make one

4
Src/Zle/complist.c
View File

@ -982,7 +982,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
len = MB_METACHARLENCONV(p, &cchar);
#ifdef MULTIBYTE_SUPPORT
if (cchar == WEOF) {
cchar = (wchar_t)p;
cchar = (wchar_t)(*p == Meta ? p[1] ^ 32 : *p);
width = 1;
}
else
@ -995,7 +995,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
len = MB_METACHARLENCONV(p, &cchar);
#ifdef MULTIBYTE_SUPPORT
if (cchar == WEOF)
cchar = (wchar_t)p;
cchar = (wchar_t)(*p == Meta ? p[1] ^ 32 : *p);
#endif
p += len;

3
Src/prompt.c
View File

@ -1130,7 +1130,8 @@ prompttrunc(int arg, int truncchar, int doprint, int endchar)
* Normal text: build up a multibyte character.
*/
char inchar;
wchar_t cc, wcw;
wchar_t cc;
int wcw;
/*
* careful: string is still metafied (we

3
Src/utils.c
View File

@ -2019,9 +2019,10 @@ mod_export int
noquery(int purge)
{
int val = 0;
char c;
#ifdef FIONREAD
char c;
ioctl(SHTTY, FIONREAD, (char *)&val);
if (purge) {
for (; val; val--)