From 6f3873100951fbbf6cc747ced9dbf410d5dec725 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 27 Jun 2019 08:24:32 +0200 Subject: Improvements in bbasm Signed-off-by: Clifford Wolf --- bba/main.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bba/main.cc b/bba/main.cc index 0d4181c5..d3c81445 100644 --- a/bba/main.cc +++ b/bba/main.cc @@ -77,10 +77,11 @@ int main(int argc, char **argv) namespace po = boost::program_options; po::positional_options_description pos; po::options_description options("Allowed options"); - options.add_options()("v", "verbose output"); - options.add_options()("d", "debug output"); - options.add_options()("b", "big endian"); - options.add_options()("c", "write c strings"); + options.add_options()("help,h", "verbose output"); + options.add_options()("verbose,v", "verbose output"); + options.add_options()("debug,d", "debug output"); + options.add_options()("be,b", "big endian"); + options.add_options()("c,c", "write c strings"); options.add_options()("files", po::value>(), "file parameters"); pos.add("files", -1); @@ -95,11 +96,15 @@ int main(int argc, char **argv) std::cout << e.what() << "\n"; return 1; } - if (vm.count("v")) + if (vm.count("help")) { + std::cout << options; + return 0; + } + if (vm.count("verbose")) verbose = true; - if (vm.count("d")) + if (vm.count("debug")) debug = true; - if (vm.count("b")) + if (vm.count("be")) bigEndian = true; if (vm.count("c")) writeC = true; @@ -183,6 +188,7 @@ int main(int argc, char **argv) const char *value = skipWhitespace(strtok(nullptr, "\r\n")); assert(*value != 0); char *end = strchr((char *)value + 1, *value); + assert(end != nullptr); *end = 0; value += 1; const char *comment = skipWhitespace(strtok(end+1, "\r\n")); -- cgit v1.2.3