diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2018-06-04 21:05:54 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2018-06-04 21:05:54 -0400 |
| commit | 4d1efbbd1aa971401202bb1bd436742c57170980 (patch) | |
| tree | a3eb68d768223982546ee6bf35bd533b1e0905bc /src/lib/barrier/ClientApp.cpp | |
| parent | 5f6625ebd476340745d578b08620dbe4d27d1a9b (diff) | |
| parent | 4a8bfd06e73d7f051f0b39e19e57616c7bbb8ad1 (diff) | |
Update upstream source from tag 'upstream/2.1.1+dfsg'
Update to upstream version '2.1.1+dfsg'
with Debian dir fae8a5463c58b9ee303cb04f24606a56a5a08fba
Diffstat (limited to 'src/lib/barrier/ClientApp.cpp')
| -rw-r--r-- | src/lib/barrier/ClientApp.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/barrier/ClientApp.cpp b/src/lib/barrier/ClientApp.cpp index 87686f2..17de18e 100644 --- a/src/lib/barrier/ClientApp.cpp +++ b/src/lib/barrier/ClientApp.cpp @@ -40,10 +40,7 @@ #include "base/TMethodJob.h" #include "base/Log.h" #include "common/Version.h" - -#if SYSAPI_WIN32 -#include "arch/win32/ArchMiscWindows.h" -#endif +#include "common/PathUtilities.h" #if WINAPI_MSWINDOWS #include "platform/MSWindowsScreen.h" @@ -98,7 +95,7 @@ ClientApp::parseArgs(int argc, const char* const* argv) // Priddy. if (!args().m_restartable || e.getError() == XSocketAddress::kBadPort) { 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); } } @@ -123,7 +120,7 @@ ClientApp::help() std::ostringstream buffer; buffer << "Start the barrier client and connect to a remote server component." << 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 << std::endl << "Options:" << std::endl @@ -134,9 +131,10 @@ ClientApp::help() << std::endl << "Default options are marked with a *" << std::endl << std::endl - << "The server address is of the form: [<hostname>][:<port>]. The hostname" << std::endl - << "must be the address or hostname of the server. The port overrides the" << std::endl - << "default port, " << kDefaultPort << "." << std::endl; + << "The server address is of the form: [<hostname>][:<port>]. The hostname" << std::endl + << "must be the address or hostname of the server. Placing brackets around" << std::endl + << "an IPv6 address is required when also specifying a port number and " << std::endl + << "optional otherwise. The default port number is " << kDefaultPort << "." << std::endl; LOG((CLOG_PRINT "%s", buffer.str().c_str())); } @@ -519,7 +517,7 @@ ClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc { // general initialization m_serverAddress = new NetworkAddress; - args().m_pname = ARCH->getBasename(argv[0]); + args().m_exename = PathUtilities::basename(argv[0]); // install caller's output filter if (outputter != NULL) { |