commit cbec073158c49ed1b36b8b6a0179708ea467b462 parent ab598bc610b0b409d03affdf25c6b40a58fc560b Author: Kyle Milz <kyle@windows.krwm.net> Date: Sun, 1 Jan 2017 21:22:54 -0800 src: move banner print to its own function and add win32 compat Diffstat:
M | src/inst_frontend.cc | | | 29 | +++++++++++++++++++++-------- |
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/inst_frontend.cc b/src/inst_frontend.cc @@ -51,24 +51,37 @@ InstFrontend::InstFrontend(int argc, char *argv[], bool is_citrun_inst) : m_is_citruninst(is_citrun_inst), m_start_time(std::chrono::high_resolution_clock::now()) { - struct utsname utsname; - - m_log << ">> citrun_inst v" << citrun_major << "." << citrun_minor; - if (uname(&utsname) == -1) - m_log << " Unknown OS" << std::endl; - else - m_log << " (" << utsname.sysname << "-" << utsname.release - << " " << utsname.machine << ")" << std::endl; + log_identity(); m_log << "CITRUN_SHARE = '" << CITRUN_SHARE << "'" << std::endl; +#ifndef _WIN32 // Sometimes we're not called as citrun_inst so force that here. setprogname("citrun_inst"); +#endif // _WIN32 if (m_is_citruninst == false) clean_PATH(); } +void +InstFrontend::log_identity() +{ + m_log << ">> citrun_inst v" << citrun_major << "." << citrun_minor; +#ifdef _WIN32 + m_log << " (Windows x86)"; +#else // _WIN32 + struct utsname utsname; + + if (uname(&utsname) == -1) + m_log << " (Unknown OS)"; + else + m_log << " (" << utsname.sysname << "-" << utsname.release + << " " << utsname.machine << ")"; +#endif // _WIN32 + m_log << " called as " << m_args[0] << std::endl; +} + // // Tries to remove CITRUN_SHARE from PATH otherwise it exits easily. //