Merge pull request #24 from chungongyu/dev-c++11

fix: return 1 if execute with bad args

src/runner.h

@@ -83,25 +83,10 @@ class RunnerManager {
  return false;
  }
 
- int help(int argc, char* argv[]) const {
- static std::string shortopt("vh");
- static option longopts[] = {
- {"version", no_argument, NULL, 'v'}, 
- {"help", no_argument, NULL, 'h'}, 
- {NULL, 0, NULL, 0}
- };
- int opt = -1;
- while ((opt = getopt_long(argc, argv, shortopt.c_str(), longopts, NULL)) != -1) {
- switch ((char)opt) {
- case 'v':
- std::cout << boost::format("%s version %s") % PACKAGE_NAME % PACKAGE_VERSION << std::endl;
- return 256;
- }
- }
-
+ int help(int ret = 0) const {
  std::cout << boost::format("%s version %s, report bugs to [%s]") % PACKAGE_NAME % PACKAGE_VERSION % PACKAGE_BUGREPORT << std::endl;
  std::cout << std::endl;
- std::cout << boost::format("usage: %s <command> [<args>]") % PACKAGE_NAME << std::endl;
+ std::cout << boost::format("Usage: %s <command> [<args>]") % PACKAGE_NAME << std::endl;
  std::cout << std::endl;
  std::cout << boost::format("The most commonly used %s commands are:") % PACKAGE_NAME << std::endl;
 
@@ -129,7 +114,27 @@ class RunnerManager {
  std::cout << std::endl;
  std::cout << boost::format("See '%s <command> -h' to read about a specific subcommand.") % PACKAGE_NAME << std::endl;
  std::cout << boost::format("Further help: %s") % PACKAGE_URL << std::endl;
- return 256;
+
+ return ret;
+ }
+ int help(int argc, char* argv[]) const {
+ static std::string shortopt("vh");
+ static option longopts[] = {
+ {"version", no_argument, NULL, 'v'}, 
+ {"help", no_argument, NULL, 'h'}, 
+ {NULL, 0, NULL, 0}
+ };
+ int opt = -1;
+ while ((opt = getopt_long(argc, argv, shortopt.c_str(), longopts, NULL)) != -1) {
+ switch ((char)opt) {
+ case 'v':
+ std::cout << boost::format("%s version %s") % PACKAGE_NAME % PACKAGE_VERSION << std::endl;
+ return 0;
+ case 'h':
+ return help(0);
+ }
+ }
+ return help(1);
  }
 private:
  struct Cmp {

src/utils.h

@@ -1,7 +1,7 @@
 #ifndef utils_h_
 #define utils_h_
 
-#include <string>
+#include <cstring>
 
 #ifndef SIZEOF_BITS
 #define SIZEOF_BITS(x) (8 * sizeof(x))