mirror of
https://github.com/irssi/irssi.git
synced 2025-04-27 05:21:16 -05:00
restore locale if perl breaks it
This commit is contained in:
parent
514f1cdcf6
commit
a0caf5e5e6
@ -90,13 +90,16 @@ static void xs_init(pTHX)
|
|||||||
void perl_scripts_init(void)
|
void perl_scripts_init(void)
|
||||||
{
|
{
|
||||||
char *code, *use_code;
|
char *code, *use_code;
|
||||||
|
int broken_perl;
|
||||||
|
|
||||||
perl_scripts = NULL;
|
perl_scripts = NULL;
|
||||||
perl_sources_start();
|
perl_sources_start();
|
||||||
perl_signals_start();
|
perl_signals_start();
|
||||||
|
|
||||||
my_perl = perl_alloc();
|
my_perl = perl_alloc();
|
||||||
|
broken_perl = wcwidth(160);
|
||||||
perl_construct(my_perl);
|
perl_construct(my_perl);
|
||||||
|
broken_perl = broken_perl != wcwidth(160);
|
||||||
|
|
||||||
perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args) - 1, perl_args, NULL);
|
perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args) - 1, perl_args, NULL);
|
||||||
|
|
||||||
@ -105,6 +108,20 @@ void perl_scripts_init(void)
|
|||||||
use_code = perl_get_use_list();
|
use_code = perl_get_use_list();
|
||||||
code = g_strdup_printf(irssi_core_code, use_code);
|
code = g_strdup_printf(irssi_core_code, use_code);
|
||||||
perl_eval_pv(code, TRUE);
|
perl_eval_pv(code, TRUE);
|
||||||
|
if (broken_perl) {
|
||||||
|
g_warning("applying locale workaround for Perl %d.%d, see "
|
||||||
|
"https://github.com/Perl/perl5/issues/21366",
|
||||||
|
PERL_REVISION, PERL_VERSION);
|
||||||
|
perl_eval_pv("package Irssi::Core;"
|
||||||
|
/* https://github.com/Perl/perl5/issues/21746 */
|
||||||
|
"if ( $] == $] )"
|
||||||
|
"{"
|
||||||
|
"require POSIX;"
|
||||||
|
"POSIX::setlocale(&POSIX::LC_ALL, \"\");"
|
||||||
|
"}"
|
||||||
|
"1;",
|
||||||
|
TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
g_free(code);
|
g_free(code);
|
||||||
g_free(use_code);
|
g_free(use_code);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user