mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-16 09:50:25 +00:00
(handle_USR1_signal, handle_USR2_signal): Replace by...
(handle_user_signal): ... this, which generates two USER_SIGNAL_EVENTs first with code == 0 [signal] and one with code == sig number. (main): Use it as handler for SIGUR1 and SIGUSR2.
This commit is contained in:
parent
8ddd297d1d
commit
8247c60d3b
29
src/emacs.c
29
src/emacs.c
@ -361,9 +361,9 @@ pthread_t main_thread;
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef SIGUSR1
|
||||
#if defined (SIGUSR1) || defined (SIGUSR2)
|
||||
SIGTYPE
|
||||
handle_USR1_signal (sig)
|
||||
handle_user_signal (sig)
|
||||
int sig;
|
||||
{
|
||||
struct input_event buf;
|
||||
@ -374,25 +374,10 @@ handle_USR1_signal (sig)
|
||||
buf.frame_or_window = selected_frame;
|
||||
|
||||
kbd_buffer_store_event (&buf);
|
||||
}
|
||||
#endif /* SIGUSR1 */
|
||||
|
||||
#ifdef SIGUSR2
|
||||
SIGTYPE
|
||||
handle_USR2_signal (sig)
|
||||
int sig;
|
||||
{
|
||||
struct input_event buf;
|
||||
|
||||
SIGNAL_THREAD_CHECK (sig);
|
||||
bzero (&buf, sizeof buf);
|
||||
buf.kind = USER_SIGNAL_EVENT;
|
||||
buf.code = 1;
|
||||
buf.frame_or_window = selected_frame;
|
||||
|
||||
buf.code = sig;
|
||||
kbd_buffer_store_event (&buf);
|
||||
}
|
||||
#endif /* SIGUSR2 */
|
||||
#endif
|
||||
|
||||
/* Handle bus errors, invalid instruction, etc. */
|
||||
SIGTYPE
|
||||
@ -1226,10 +1211,10 @@ main (argc, argv
|
||||
signal (SIGILL, fatal_error_signal);
|
||||
signal (SIGTRAP, fatal_error_signal);
|
||||
#ifdef SIGUSR1
|
||||
signal (SIGUSR1, handle_USR1_signal);
|
||||
#ifdef SIGUSR2
|
||||
signal (SIGUSR2, handle_USR2_signal);
|
||||
signal (SIGUSR1, handle_user_signal);
|
||||
#endif
|
||||
#ifdef SIGUSR2
|
||||
signal (SIGUSR2, handle_user_signal);
|
||||
#endif
|
||||
#ifdef SIGABRT
|
||||
signal (SIGABRT, fatal_error_signal);
|
||||
|
Loading…
Reference in New Issue
Block a user