emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-server: modernize sig handling 

Update some old code.
This commit is contained in:
Dirk-Jan C. Binnema 2023-12-14 08:33:49 +02:00
parent 146b80113f
commit 4b199e8bed
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mu/mu-cmd-server.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This program is free software; you can redistribute it and/or modify it ** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the ** under the terms of the GNU General Public License as published by the
@ -30,12 +30,12 @@
#include "mu-server.hh" #include "mu-server.hh"
#include "utils/mu-utils.hh" #include "utils/mu-utils.hh"
#include "utils/mu-command-handler.hh"
#include "utils/mu-readline.hh" #include "utils/mu-readline.hh"
using namespace Mu; using namespace Mu;
static std::atomic<int> MuTerminate{0}; static std::atomic<int> MuTerminate{0};
static bool tty; static bool tty;
static void static void
sig_handler(int sig) sig_handler(int sig)
@ -44,27 +44,26 @@ sig_handler(int sig)
} }
static void static void
install_sig_handler(void) install_sig_handler()
{ {
static struct sigaction action;
int i, sigs[] = {SIGINT, SIGHUP, SIGTERM, SIGPIPE};
MuTerminate = 0; MuTerminate = 0;
struct sigaction action{};
action.sa_handler = sig_handler; action.sa_handler = sig_handler;
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);
action.sa_flags = SA_RESETHAND; action.sa_flags = SA_RESETHAND;
for (i = 0; i != G_N_ELEMENTS(sigs); ++i) for (auto sig: {SIGINT, SIGHUP, SIGTERM, SIGPIPE})
if (sigaction(sigs[i], &action, NULL) != 0) if (sigaction(sig, &action, NULL) != 0)
mu_critical("set sigaction for {} failed: {}", mu_critical("set sigaction for {} failed: {}",
sigs[i], g_strerror(errno)); sig, g_strerror(errno));
} }
/* /*
* Markers for/after the length cookie that precedes the expression we write to * Markers for/after the length cookie that precedes the expression we write to
* output. We use octal 376, 377 (ie, 0xfe, 0xff) as they will never occur in * output. We use octal 376, 377 (ie, 0xfe, 0xff) as they will never occur in
* utf8 */ * utf8
*/
#define COOKIE_PRE "\376" #define COOKIE_PRE "\376"
#define COOKIE_POST "\377" #define COOKIE_POST "\377"
@ -103,7 +102,6 @@ report_error(const Mu::Error& err) noexcept
Server::OutputFlags::Flush); Server::OutputFlags::Flush);
} }
Result<void> Result<void>
Mu::mu_cmd_server(const Mu::Options& opts) try { Mu::mu_cmd_server(const Mu::Options& opts) try {