From 10e358d835e5ccc2db0ba93aae3b2a293acd8159 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 13 Nov 2018 10:01:02 -0800 Subject: [PATCH] modules/console: Add the die cmd; move exit cmd. --- construct/console.cc | 9 --------- modules/console.cc | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/construct/console.cc b/construct/console.cc index e7475bb1b..d8eb7de7d 100644 --- a/construct/console.cc +++ b/construct/console.cc @@ -232,15 +232,6 @@ try if(line == "EXIT") exit(0); - if(line == "exit") - return false; - - if(line == "die") - { - ircd::quit(); - return false; - } - int ret{-1}; if(console_module) switch((ret = handle_line_bymodule(line))) { diff --git a/modules/console.cc b/modules/console.cc index 8d71a9f38..f39cecea2 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -405,6 +405,12 @@ console_json(const json::object &object) // misc // +bool +console_cmd__exit(opt &out, const string_view &line) +{ + return false; +} + bool console_cmd__debug(opt &out, const string_view &line) { @@ -426,6 +432,24 @@ console_cmd__debug(opt &out, const string_view &line) } } +// +// main +// + +bool +console_cmd__die(opt &out, const string_view &line) +{ + ircd::quit(); + return false; +} + +[[noreturn]] bool +console_cmd__die__hard(opt &out, const string_view &line) +{ + ircd::terminate(); + __builtin_unreachable(); +} + // // log //