parse opt finished

src/mainclass.cpp

@@ -13,11 +13,11 @@ MainClass::MainClass(int argc, char* argv[])
 
 int MainClass::usage()
 {
-  std::cerr << "Usage: " << basename(argv_[0]) <<
-    " [--device DEVICE|--device=DEVICE|-e DEVICE]" <<
-    " [--up OUTPUT|--up=OUTPUT|-u OUTPUT]" <<
-    " [--down OUTPUT|--down=OUPUT|-d OUTPUT]" <<
-    " [--sleep MS|--sleep=MS|-s MS]" <<
+  std::cerr << "Usage: " << basename(argv_[0]) << std::endl <<
+    " [--device DEVICE|--device=DEVICE|-e DEVICE]" << std::endl <<
+    " [--up OUTPUT|--up=OUTPUT|-u OUTPUT]" << std::endl <<
+    " [--down OUTPUT|--down=OUPUT|-d OUTPUT]" << std::endl <<
+    " [--sleep MS|--sleep=MS|-s MS]" << std::endl <<
     " [--help|-h]" << std::endl;
   std::cerr << std::endl << "Controls the output pins of a PiFace digital IO."
     << std::endl << std::endl;
@@ -31,10 +31,19 @@ int MainClass::usage()
     << std::endl << "MS \t: The number of milliseconds to sleep. 0 <= MS <= "
     << UINT_MAX << "."
     << std::endl << "DEVICE \t: The device number. Default is 0. "
-    "0 <= DEVICE <= 4" << std::endl;
+    "0 <= DEVICE <= 4." << std::endl;
   return EX_USAGE;
 }
 
+bool MainClass::bad_value_()
+{
+  extern int optind;
+  extern char* optarg;
+  std::cerr << "Bad value " << optarg <<
+    " for option " << argv_[optind - 2] << std::endl << std::endl;
+  return false;
+}
+
 bool MainClass::build_actions_()
 {
   option opts[] = {
@@ -47,19 +56,38 @@ bool MainClass::build_actions_()
   };
   int opt;
   extern int optind;
+  extern char* optarg;
+  char* endptr;
   while ((opt = getopt_long(argc_, argv_, "e:u:d:s:h", opts, 0)) != -1)
   {
+    if (!optarg)
+      return false;
+    long int arg = strtol(optarg, &endptr, 10);
+    if (arg < 0)
+      return bad_value_();
     if (opt == 'e')
     {
+      if (arg > 4)
+        return bad_value_();
+      actions_.push_back([arg]() -> bool
+          {
+          return true;
+          });
     }
     else if (opt == 'u')
     {
+      if (arg > 7)
+        return bad_value_();
     }
     else if (opt == 'd')
     {
+      if (arg > 7)
+        return bad_value_();
     }
     else if (opt == 's')
     {
+      if (arg > UINT_MAX)
+        return bad_value_();
     }
     else
       return false;
@@ -71,5 +99,8 @@ int MainClass::execute()
 {
   if (argc_ <= 2 || !build_actions_())
     return usage();
+  for (auto f : actions_)
+    if (!f())
+      return 1;
   return 0;
 }

src/mainclass.hh

@@ -1,5 +1,7 @@
 #ifndef MAINCLASS_HH
 # define MAINCLASS_HH
+# include <vector>
+# include <memory>
 class MainClass
 {
   public:
@@ -10,7 +12,9 @@ class MainClass
 
   private:
     bool build_actions_();
+    bool bad_value_();
     int argc_;
     char** argv_;
+    std::vector<std::function<bool()>> actions_;
 };
 #endif /* !MAINCLASS_HH */