diff options
| author | Peter Hatina <phatina@redhat.com> | 2012-07-10 13:33:44 +0200 |
|---|---|---|
| committer | Peter Hatina <phatina@redhat.com> | 2012-07-11 09:07:37 +0200 |
| commit | 9269678cbc7ed59f87375a7660624cedb472820e (patch) | |
| tree | aeda3cb99e4d1dee3791033436ce387c75cf521e /generator | |
| parent | 9ea57d02e5d17446d8f5e8813d9d6af7956351fb (diff) | |
generator, fix binary name
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/Makefile.am | 2 | ||||
| -rw-r--r-- | generator/options.cpp | 6 | ||||
| -rw-r--r-- | generator/options.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/generator/Makefile.am b/generator/Makefile.am index b6a01f2..ce7f42c 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = spice_xpi_generator +bin_PROGRAMS = spice-xpi-generator spice_xpi_generator_SOURCES = \ generator.cpp \ main.cpp \ diff --git a/generator/options.cpp b/generator/options.cpp index 723ca7e..67acb87 100644 --- a/generator/options.cpp +++ b/generator/options.cpp @@ -16,6 +16,7 @@ * ***** END LICENSE BLOCK ***** */ #include <iostream> +#include <cstring> extern "C" { # include <getopt.h> } @@ -25,7 +26,8 @@ Options::Options(int argc, char **argv): m_help(false), m_good(true), m_input_filename(), - m_output_filename() + m_output_filename(), + m_bin_name(argv && argv[0] ? basename(argv[0]) : "spice-xpi-generator") { static struct option longopts[] = { { "input", required_argument, NULL, 'i' }, @@ -60,7 +62,7 @@ Options::~Options() void Options::printHelp() const { std::cout << "Spice-xpi test page generator\n\n" - << "Usage: ./generator [-h] [-i input] [-o output]\n\n" + << "Usage: " << m_bin_name << " [-h] [-i input] [-o output]\n\n" << "Application options:\n" << " -i, --input input filename (stdin used, if not specified)\n" << " -o, --output output filename (stdout used, if not specified)\n" diff --git a/generator/options.h b/generator/options.h index 7c990e5..dfac369 100644 --- a/generator/options.h +++ b/generator/options.h @@ -37,6 +37,7 @@ private: bool m_good; std::string m_input_filename; std::string m_output_filename; + const std::string m_bin_name; }; #endif // OPTIONS_H |