Wip++...

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 4dd53150f784f3f5f680d19b46e7082c80bb8a32..d51fee22843a3803d878815bae0cc8d6fb7ff924 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -34,6 +34,8 @@ namespace {
 
 int opt::parse_args(int* argc, char* argv[])
 {
 
 int opt::parse_args(int* argc, char* argv[])
 {

+    int result = 1;
+

     char* tmp = strrchr(argv[0], '/');
     opt::program_name = (tmp ? tmp + 1 : argv[0]);
 
     char* tmp = strrchr(argv[0], '/');
     opt::program_name = (tmp ? tmp + 1 : argv[0]);
 


@@ -54,29 +56,35 @@ int opt::parse_args(int* argc, char* argv[])
             opt::version_requested = true;
             break;
         case '?':
             opt::version_requested = true;
             break;
         case '?':

-            WARN1("invalid option -- '%c'", optopt);
+            ERROR1("invalid option -- '%c'", optopt);
+            result = 0;

             break;
         }
     }
     if (opt::version_requested || opt::help_requested)
         return 1;
 
             break;
         }
     }
     if (opt::version_requested || opt::help_requested)
         return 1;
 

-    switch (*argc - optind) {
+    int rem_args = *argc - optind;
+    switch (rem_args) {

     case 0:
         ERROR0("missing parameter -- <plaform_file>");
     case 1:
         ERROR0("missing parameter -- <application_file>");
     case 0:
         ERROR0("missing parameter -- <plaform_file>");
     case 1:
         ERROR0("missing parameter -- <application_file>");

-        return 0;
+        result = 0;
+        break;

 
     default:
         opt::platform_file = argv[optind];
         opt::application_file = argv[optind + 1];
 
     default:
         opt::platform_file = argv[optind];
         opt::application_file = argv[optind + 1];

+        if (rem_args == 2)
+            break;

         for (int i = optind + 2 ; i < *argc ; ++i)
         for (int i = optind + 2 ; i < *argc ; ++i)

-            WARN1("unused parameter -- \"%s\"", argv[i]);
+            ERROR1("unused parameter -- \"%s\"", argv[i]);
+        result = 0;

         break;
     }
 
         break;
     }
 

-    return 1;
+    return result;

 }
 
 void opt::print()
 }
 
 void opt::print()


@@ -106,6 +114,7 @@ void opt::usage()
               << "print help and exit (use -hh or -hhh for extended help)\n";
     if (opt::help_requested < 1)
         return;
               << "print help and exit (use -hh or -hhh for extended help)\n";
     if (opt::help_requested < 1)
         return;

+

     std::clog << o("-V") << "print version and exit\n";
     std::clog << o("-b") << "activate bookkeeping\n";
     std::clog << oo("-c", "[fn,...]f0")
     std::clog << o("-V") << "print version and exit\n";
     std::clog << o("-b") << "activate bookkeeping\n";
     std::clog << oo("-c", "[fn,...]f0")