procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid sending systemd shutdown notifications if non-daemon

Browse source 
* src/emacs.c (Fkill_emacs): Send the shutdown notification only
in daemon mode.  (Bug#46022)
This commit is contained in:
Eli Zaretskii 2021-01-22 14:30:22 +02:00
parent 009df5cb3c
commit 3f610177ad
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/emacs.c
View file

@ -187,7 +187,8 @@ bool build_details;
/* Name for the server started by the daemon.*/ /* Name for the server started by the daemon.*/
static char *daemon_name; static char *daemon_name;
/* 0 not a daemon, 1 new-style (foreground), 2 old-style (background). */ /* 0 not a daemon, 1 new-style (foreground), 2 old-style (background).
A negative value means the daemon initialization was already done. */
int daemon_type; int daemon_type;
#ifndef WINDOWSNT #ifndef WINDOWSNT
@ -2371,7 +2372,10 @@ all of which are called before Emacs is actually killed. */
int exit_code; int exit_code;
#ifdef HAVE_LIBSYSTEMD #ifdef HAVE_LIBSYSTEMD
sd_notify(0, "STOPPING=1"); /* Notify systemd we are shutting down, but only if we have notified
it about startup. */
if (daemon_type == -1)
sd_notify(0, "STOPPING=1");
#endif /* HAVE_LIBSYSTEMD */ #endif /* HAVE_LIBSYSTEMD */
/* Fsignal calls emacs_abort () if it sees that waiting_for_input is /* Fsignal calls emacs_abort () if it sees that waiting_for_input is
@ -2876,7 +2880,7 @@ from the parent process and its tty file descriptors. */)
} }
/* Set it to an invalid value so we know we've already run this function. */ /* Set it to an invalid value so we know we've already run this function. */
daemon_type = -1; daemon_type = -daemon_type;
#else /* WINDOWSNT */ #else /* WINDOWSNT */
/* Signal the waiting emacsclient process. */ /* Signal the waiting emacsclient process. */