debauchee/barrier
1
1
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2024-12-25 12:06:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix usage of m_pname and rename to m_exename

Browse Source
This commit is contained in:
walker0643 2018-05-12 17:32:26 -04:00
parent f299558cdf
commit f4301a7618
7 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/barrier/App.cpp
View File

@ -79,18 +79,9 @@ App::~App()
void void
App::version() App::version()
{ {
char buffer[500]; std::cout << argsBase().m_exename << " " << kVersion << ", protocol version " << kProtocolMajorVersion << "." << kProtocolMinorVersion << std::endl;
sprintf( std::cout << kCopyright << std::endl;
buffer,
"%s %s, protocol version %d.%d\n%s",
argsBase().m_pname,
kVersion,
kProtocolMajorVersion,
kProtocolMinorVersion,
kCopyright
);
std::cout << buffer << std::endl;
} }
int int
@ -178,7 +169,7 @@ App::initApp(int argc, const char** argv)
// set log filter // set log filter
if (!CLOG->setFilter(argsBase().m_logFilter)) { if (!CLOG->setFilter(argsBase().m_logFilter)) {
LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE, LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE,
argsBase().m_pname, argsBase().m_logFilter, argsBase().m_pname)); argsBase().m_exename.c_str(), argsBase().m_logFilter, argsBase().m_exename.c_str()));
m_bye(kExitArgs); m_bye(kExitArgs);
} }
loggingFilterWarning(); loggingFilterWarning();

12
src/lib/barrier/ArgParser.cpp
View File

@ -62,7 +62,7 @@ ArgParser::parseServerArgs(ServerArgs& args, int argc, const char* const* argv)
args.m_configFile = argv[++i]; args.m_configFile = argv[++i];
} }
else { else {
LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname)); LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_exename.c_str(), argv[i], args.m_exename.c_str()));
return false; return false;
} }
} }
@ -107,7 +107,7 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
return true; return true;
} }
LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname)); LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_exename.c_str(), argv[i], args.m_exename.c_str()));
return false; return false;
} }
} }
@ -118,7 +118,7 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
// exactly one non-option argument (server-address) // exactly one non-option argument (server-address)
if (i == argc) { if (i == argc) {
LOG((CLOG_PRINT "%s: a server address or name is required" BYE, LOG((CLOG_PRINT "%s: a server address or name is required" BYE,
args.m_pname, args.m_pname)); args.m_exename.c_str(), args.m_exename.c_str()));
return false; return false;
} }
@ -313,7 +313,7 @@ ArgParser::isArg(
// match. check args left. // match. check args left.
if (argi + minRequiredParameters >= argc) { if (argi + minRequiredParameters >= argc) {
LOG((CLOG_PRINT "%s: missing arguments for `%s'" BYE, LOG((CLOG_PRINT "%s: missing arguments for `%s'" BYE,
argsBase().m_pname, argv[argi], argsBase().m_pname)); argsBase().m_exename.c_str(), argv[argi], argsBase().m_exename.c_str()));
argsBase().m_shouldExit = true; argsBase().m_shouldExit = true;
return false; return false;
} }
@ -456,7 +456,7 @@ void
ArgParser::updateCommonArgs(const char* const* argv) ArgParser::updateCommonArgs(const char* const* argv)
{ {
argsBase().m_name = ARCH->getHostName(); argsBase().m_name = ARCH->getHostName();
argsBase().m_pname = PathUtilities::basename(argv[0]).c_str(); argsBase().m_exename = PathUtilities::basename(argv[0]);
} }
bool bool
@ -470,7 +470,7 @@ ArgParser::checkUnexpectedArgs()
LOG((CLOG_ERR LOG((CLOG_ERR
"the --daemon argument is not supported on windows. " "the --daemon argument is not supported on windows. "
"instead, install %s as a service (--service install)", "instead, install %s as a service (--service install)",
argsBase().m_pname)); argsBase().m_exename.c_str()));
return true; return true;
} }
#endif #endif

1
src/lib/barrier/ArgsBase.cpp
View File

@ -33,7 +33,6 @@ m_disableXInitThreads(false),
m_backend(false), m_backend(false),
m_restartable(true), m_restartable(true),
m_noHooks(false), m_noHooks(false),
m_pname(NULL),
m_logFilter(NULL), m_logFilter(NULL),
m_logFile(NULL), m_logFile(NULL),
m_display(NULL), m_display(NULL),

2
src/lib/barrier/ArgsBase.h
View File

@ -30,7 +30,7 @@ public:
bool m_backend; bool m_backend;
bool m_restartable; bool m_restartable;
bool m_noHooks; bool m_noHooks;
const char* m_pname; std::string m_exename;
const char* m_logFilter; const char* m_logFilter;
const char* m_logFile; const char* m_logFile;
const char* m_display; const char* m_display;

6
src/lib/barrier/ClientApp.cpp
View File

@ -95,7 +95,7 @@ ClientApp::parseArgs(int argc, const char* const* argv)
// Priddy. // Priddy.
if (!args().m_restartable || e.getError() == XSocketAddress::kBadPort) { if (!args().m_restartable || e.getError() == XSocketAddress::kBadPort) {
LOG((CLOG_PRINT "%s: %s" BYE, LOG((CLOG_PRINT "%s: %s" BYE,
args().m_pname, e.what(), args().m_pname)); args().m_exename.c_str(), e.what(), args().m_exename.c_str()));
m_bye(kExitFailed); m_bye(kExitFailed);
} }
} }
@ -120,7 +120,7 @@ ClientApp::help()
std::ostringstream buffer; std::ostringstream buffer;
buffer << "Start the barrier client and connect to a remote server component." << std::endl buffer << "Start the barrier client and connect to a remote server component." << std::endl
<< std::endl << std::endl
<< "Usage: " << args().m_pname << " [--yscroll <delta>]" << WINAPI_ARG << HELP_SYS_ARGS << "Usage: " << args().m_exename << " [--yscroll <delta>]" << WINAPI_ARG << HELP_SYS_ARGS
<< HELP_COMMON_ARGS << " <server-address>" << std::endl << HELP_COMMON_ARGS << " <server-address>" << std::endl
<< std::endl << std::endl
<< "Options:" << std::endl << "Options:" << std::endl
@ -516,7 +516,7 @@ ClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc
{ {
// general initialization // general initialization
m_serverAddress = new NetworkAddress; m_serverAddress = new NetworkAddress;
args().m_pname = PathUtilities::basename(argv[0]).c_str(); args().m_exename = PathUtilities::basename(argv[0]);
// install caller's output filter // install caller's output filter
if (outputter != NULL) { if (outputter != NULL) {

8
src/lib/barrier/ServerApp.cpp
View File

@ -101,7 +101,7 @@ ServerApp::parseArgs(int argc, const char* const* argv)
} }
catch (XSocketAddress& e) { catch (XSocketAddress& e) {
LOG((CLOG_PRINT "%s: %s" BYE, LOG((CLOG_PRINT "%s: %s" BYE,
args().m_pname, e.what(), args().m_pname)); args().m_exename.c_str(), e.what(), args().m_exename.c_str()));
m_bye(kExitArgs); m_bye(kExitArgs);
} }
} }
@ -126,7 +126,7 @@ ServerApp::help()
std::ostringstream buffer; std::ostringstream buffer;
buffer << "Start the barrier server component." << std::endl buffer << "Start the barrier server component." << std::endl
<< std::endl << std::endl
<< "Usage: " << args().m_pname << "Usage: " << args().m_exename
<< " [--address <address>]" << " [--address <address>]"
<< " [--config <pathname>]" << " [--config <pathname>]"
<< WINAPI_ARGS << HELP_SYS_ARGS << HELP_COMMON_ARGS << std::endl << WINAPI_ARGS << HELP_SYS_ARGS << HELP_COMMON_ARGS << std::endl
@ -207,7 +207,7 @@ ServerApp::loadConfig()
} }
if (!loaded) { if (!loaded) {
LOG((CLOG_PRINT "%s: no configuration available", args().m_pname)); LOG((CLOG_PRINT "%s: no configuration available", args().m_exename.c_str()));
m_bye(kExitConfig); m_bye(kExitConfig);
} }
} }
@ -780,7 +780,7 @@ ServerApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc
// general initialization // general initialization
m_barrierAddress = new NetworkAddress; m_barrierAddress = new NetworkAddress;
args().m_config = new Config(m_events); args().m_config = new Config(m_events);
args().m_pname = PathUtilities::basename(argv[0]).c_str(); args().m_exename = PathUtilities::basename(argv[0]);
// install caller's output filter // install caller's output filter
if (outputter != NULL) { if (outputter != NULL) {

2
src/lib/platform/MSWindowsWatchdog.cpp
View File

@ -404,7 +404,7 @@ MSWindowsWatchdog::getCommand() const
} }
// seems like a fairly convoluted way to get the process name // seems like a fairly convoluted way to get the process name
const char* launchName = App::instance().argsBase().m_pname; const char* launchName = App::instance().argsBase().m_exename.c_str();
std::string args = ARCH->commandLine(); std::string args = ARCH->commandLine();
// build up a full command line // build up a full command line