zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-17 15:42:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

"return 1" doesn't anymore stop signals in perl scripts. Fixed

Browse source 
Irssi::signal_stop() to properly stop the signal from going to other
perl scripts.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1086 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-07 08:23:06 +00:00 • committed by cras
commit 14dbcd00bf
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/perl/perl-signals.c
View file

@ -49,8 +49,8 @@ static PERL_SIGNAL_ARGS_REC *perl_signal_args_find(int signal_id)
return NULL;
}
static int perl_call_signal(const char *func, int signal_id,
gconstpointer *args)
static void perl_call_signal(const char *func, int signal_id,
gconstpointer *args)
{
dSP;
int retcount, ret;
@ -106,28 +106,18 @@ static int perl_call_signal(const char *func, int signal_id,
}
PUTBACK;
retcount = perl_call_pv((char *) func, G_EVAL|G_SCALAR);
retcount = perl_call_pv((char *) func, G_EVAL|G_DISCARD);
SPAGAIN;
ret = 0;
if (SvTRUE(ERRSV)) {
STRLEN n_a;
signal_emit("gui dialog", 2, "error", SvPV(ERRSV, n_a));
(void)POPs;
} else if (retcount > 0) {
SV *sv = POPs;
if (SvIOK(sv) && SvIV(sv) == 1) ret = 1;
while (--retcount > 0)
(void)POPi;
}
PUTBACK;
FREETMPS;
LEAVE;
return ret;
}
static void sig_func(int priority, gconstpointer *args)
@ -141,10 +131,9 @@ static void sig_func(int priority, gconstpointer *args)
for (tmp = list == NULL ? NULL : *list; tmp != NULL; tmp = tmp->next) {
PERL_SIGNAL_REC *rec = tmp->data;
if (perl_call_signal(rec->func, signal_id, args)) {
signal_stop();
break;
}
perl_call_signal(rec->func, signal_id, args);
if (signal_is_stopped(signal_id))
break;
}
}

2
src/perl/perl.c
View file

@ -317,7 +317,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec)
XPUSHs(sv_2mortal(new_pv(rec->data)));
PUTBACK;
retcount = perl_call_pv(rec->func, G_EVAL|G_SCALAR);
retcount = perl_call_pv(rec->func, G_EVAL|G_DISCARD);
SPAGAIN;
if (SvTRUE(ERRSV)) {