[NY Flight] Improvements in parser dispatching.

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index f8a394d41b591f3526a8292b056ede5660642c48..66f580f611aa8ff43ab117339d9e1eb0ac933d34 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -724,7 +724,7 @@ int CheckParametersSet(REQUEST * req)
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------

-int mainGet(int argc, char **argv)
+bool mainGet(int argc, char **argv)

 {
 int c;
 REQUEST req;
 {
 int c;
 REQUEST req;


@@ -890,7 +890,7 @@ else
     return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
 }
 //-----------------------------------------------------------------------------
     return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
 }
 //-----------------------------------------------------------------------------

-int mainSet(int argc, char **argv)
+bool mainSet(int argc, char **argv)

 {
 string str;
 
 {
 string str;
 


@@ -1087,7 +1087,10 @@ char rstr[rLen];
 memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);
 memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);

-return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr, isMessage);
+if (isMessage)
+    return ProcessSendMessage(req.server, req.port, req.admLogin, req.admPasswd, rstr);
+
+return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr);

 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)


@@ -1106,7 +1109,9 @@ if (strcmp(argv[1], "get") == 0)
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");

-    return mainSet(argc - 1, argv + 1);
+    if (mainSet(argc - 1, argv + 1) )
+        return 0;
+    return -1;

     }
 else
     {
     }
 else
     {