From 11789707280277ebd9929f0530533098234ea049 Mon Sep 17 00:00:00 2001 From: Hayodea Hakol Date: Wed, 8 Jan 2025 15:07:42 -0400 Subject: [PATCH] cmd:opts: Now set OptionParser::argv0 to argv[0] --- hcore/include/opts.h | 1 + hcore/opts.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hcore/include/opts.h b/hcore/include/opts.h index 2b2ec92..6f21621 100644 --- a/hcore/include/opts.h +++ b/hcore/include/opts.h @@ -23,6 +23,7 @@ public: } public: + std::string argv0; std::string senseApiLibPath; std::vector senseApiLibs; std::string deviceSpecs; diff --git a/hcore/opts.cpp b/hcore/opts.cpp index 2f53510..7a82389 100644 --- a/hcore/opts.cpp +++ b/hcore/opts.cpp @@ -25,6 +25,9 @@ void OptionParser::parseArguments(int argc, char *argv[]) { int opt; int optionIndex = 0; + + argv0 = argv[0]; + optind = 1; // Reset optind to 1 before parsing while ((opt = getopt_long( argc, argv, "s:d:a:p:v?", longOptions, &optionIndex)) != -1) @@ -80,7 +83,7 @@ void OptionParser::parseArguments(int argc, char *argv[]) std::string OptionParser::getUsage() const { - return "Usage: program [-s|--devicespec|--spec|--devspec ] " + return "Usage: " + argv0 + " [-s|--devicespec|--spec|--devspec ] " "[-d|--devfile|--devicefile ] " "[-a|--sense-api-lib|--senseapi ] " "[-p|--sense-api-path ] "