Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
cc61952d
Commit
cc61952d
authored
Oct 01, 2007
by
Rafaël Carré
Browse files
ncurses: fix KeyToUTF8() breakage introduced in [22313]
parent
c887fde7
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/gui/ncurses.c
View file @
cc61952d
...
...
@@ -426,12 +426,9 @@ static void Run( intf_thread_t *p_intf )
}
/* following functions are local */
#ifdef HAVE_NCURSESW_CURSES_H
# define KeyToUTF8( i, psz ) psz
#else
static
char
*
KeyToUTF8
(
int
i_key
,
char
*
psz_part
)
{
char
*
psz_utf8
,
*
psz
;
char
*
psz_utf8
;
int
len
=
strlen
(
psz_part
);
if
(
len
==
6
)
{
...
...
@@ -442,10 +439,14 @@ static char *KeyToUTF8( int i_key, char *psz_part )
psz_part
[
len
]
=
(
char
)
i_key
;
#ifdef HAVE_NCURSESW_CURSES_H
psz_utf8
=
strdup
(
psz_part
);
#else
psz_utf8
=
FromLocaleDup
(
psz_part
);
/* Ugly check for incomplete bytes sequences
* (in case of non-UTF8 multibyte local encoding) */
char
*
psz
;
for
(
psz
=
psz_utf8
;
*
psz
;
psz
++
)
if
(
(
*
psz
==
'?'
)
&&
(
*
psz_utf8
!=
'?'
)
)
{
...
...
@@ -461,11 +462,11 @@ static char *KeyToUTF8( int i_key, char *psz_part )
free
(
psz_utf8
);
return
NULL
;
}
#endif
memset
(
psz_part
,
0
,
6
);
return
psz_utf8
;
}
#endif
static
inline
int
RemoveLastUTF8Entity
(
char
*
psz
,
int
len
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment