From efc9097d62cd93e2d139d6d321b5a71d1b169502 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Mon, 27 Jun 2016 01:46:54 +0900 Subject: [PATCH] Renamed system.use_daemon to system.daemon. --- src/command_local.cc | 2 +- src/display/canvas.cc | 2 +- src/main.cc | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/command_local.cc b/src/command_local.cc index beeead5a..9236f9bb 100644 --- a/src/command_local.cc +++ b/src/command_local.cc @@ -266,7 +266,7 @@ initialize_command_local() { CMD2_ANY_VALUE_V ("system.umask.set", std::bind(&umask, std::placeholders::_2)); - CMD2_VAR_BOOL ("system.use_daemon", false); + CMD2_VAR_BOOL ("system.daemon", false); CMD2_ANY ("system.cwd", std::bind(&system_get_cwd)); CMD2_ANY_STRING ("system.cwd.set", std::bind(&system_set_cwd, std::placeholders::_2)); diff --git a/src/display/canvas.cc b/src/display/canvas.cc index 02bdc193..fc24bbc3 100644 --- a/src/display/canvas.cc +++ b/src/display/canvas.cc @@ -105,7 +105,7 @@ Canvas::initialize() { if (m_isInitialized) return; - m_isDaemon = rpc::call_command_value("system.use_daemon"); + m_isDaemon = rpc::call_command_value("system.daemon"); m_isInitialized = true; diff --git a/src/main.cc b/src/main.cc index bfc34ff6..2bd73815 100644 --- a/src/main.cc +++ b/src/main.cc @@ -190,8 +190,10 @@ main(int argc, char** argv) { control = new Control; - srandom(cachedTime.usec() ^ (getpid() << 16) ^ getppid()); - srand48(cachedTime.usec() ^ (getpid() << 16) ^ getppid()); + unsigned int random_seed = cachedTime.seconds() ^ cachedTime.usec() ^ (getpid() << 16) ^ getppid(); + + srandom(random_seed); + srand48(random_seed); SignalHandler::set_ignore(SIGPIPE); SignalHandler::set_handler(SIGINT, std::bind(&Control::receive_normal_shutdown, control));