Beautified error notification.

diff --git a/projects/sgconf/actions.h b/projects/sgconf/actions.h
index 886e17e2568619da73bcdaf31873c0698c93853a..c88de14dc7f5f306e5b0ee0421485a5945f5724f 100644 (file)
--- a/projects/sgconf/actions.h
+++ b/projects/sgconf/actions.h
@@ -118,6 +118,10 @@ template <typename T>
 inline
 PARSER_STATE PARAM_ACTION<T>::Parse(int argc, char ** argv)
 {
 inline
 PARSER_STATE PARAM_ACTION<T>::Parse(int argc, char ** argv)
 {

+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");

 T value;
 if (str2x(*argv, value))
     throw ERROR(std::string("Bad argument: '") + *argv + "'");
 T value;
 if (str2x(*argv, value))
     throw ERROR(std::string("Bad argument: '") + *argv + "'");


@@ -129,6 +133,10 @@ template <>
 inline
 PARSER_STATE PARAM_ACTION<std::string>::Parse(int argc, char ** argv)
 {
 inline
 PARSER_STATE PARAM_ACTION<std::string>::Parse(int argc, char ** argv)
 {

+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");

 m_param = *argv;
 return PARSER_STATE(false, --argc, ++argv);
 }
 m_param = *argv;
 return PARSER_STATE(false, --argc, ++argv);
 }

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index a1c8df8f0fb8f85ab3dc26d7a0851db7ee416e00..c1fc4c3e58a34c3388ca97dfc48666a743456e78 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -178,6 +178,10 @@ class CONFIG_ACTION : public ACTION
 
 PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
 {
 
 PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
 {

+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");

 char * pos = strchr(*argv, '@');
 if (pos != NULL)
     {
 char * pos = strchr(*argv, '@');
 if (pos != NULL)
     {


@@ -1214,7 +1218,18 @@ blocks.Add("Connection options")
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
 
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
 

-SGCONF::PARSER_STATE state(blocks.Parse(--argc, ++argv)); // Skipping self name
+
+SGCONF::PARSER_STATE state(false, argc, argv);
+
+try
+{
+state = blocks.Parse(--argc, ++argv); // Skipping self name
+}
+catch (const SGCONF::OPTION::ERROR& ex)
+{
+std::cerr << ex.what() << "\n";
+return -1;
+}

 
 if (state.stop)
     return 0;
 
 if (state.stop)
     return 0;

diff --git a/projects/sgconf/options.cpp b/projects/sgconf/options.cpp
index 06889174b0b2d7eb5aedb57f9c402ad0ce08fde1..6fddaf38583a4e5462a69426d5210fcc000d479a 100644 (file)
--- a/projects/sgconf/options.cpp
+++ b/projects/sgconf/options.cpp
@@ -103,7 +103,10 @@ try
     }
 catch (const ACTION::ERROR & ex)
     {
     }
 catch (const ACTION::ERROR & ex)
     {

-    throw ERROR(m_longName + ": " + ex.what());
+    if (m_longName.empty())
+        throw ERROR("-" + m_shortName + ": " + ex.what());
+    else
+        throw ERROR("--" + m_longName + ", -" + m_shortName + ": " + ex.what());

     }
 }
 
     }
 }