Changeset 11403

Timestamp:

07/14/11 09:01:17 (13 years ago)

Author:

tbretz

Message:

Use Vec instead of Get and make sure 'console' is not accessed if not available.

File:

• trunk/FACT++/src/dimctrl.cc (modified) (3 diffs)

trunk/FACT++/src/dimctrl.cc

@@ -18 +18 @@
             win << kRed << "ERROR - Couldn't open log-file " << conf.Get<string>("log") << ": " << strerror(errno) << endl;
 
-    if (conf.Has("cmd"))
-    {
-        const vector<string> v = conf.Get<vector<string>>("cmd");
-        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
-            shell.ProcessLine(*it);
-    }
+    const vector<string> v1 = conf.Vec<string>("cmd");
+    for (vector<string>::const_iterator it=v1.begin(); it!=v1.end(); it++)
+        shell.ProcessLine(*it);
 
-    if (conf.Has("exec"))
-    {
-        const vector<string> v = conf.Get<vector<string>>("exec");
-        for (vector<string>::const_iterator it=v.begin(); it!=v.end(); it++)
-            shell.Execute(*it);
-    }
+    const vector<string> v2 = conf.Vec<string>("exec");
+    for (vector<string>::const_iterator it=v2.begin(); it!=v2.end(); it++)
+        shell.Execute(*it);
 
     if (conf.Get<bool>("quit"))
@@ -48 +42 @@
         ("dns",       var<string>("localhost"), "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
         ("log,l",     var<string>(n), "Write log-file")
-        ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
+        ("console,c", var<int>(0),    "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
         ("cmd",       vars<string>(), "Execute one or more commands at startup")
         ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
@@ -122 +116 @@
 
     if (conf.Get<int>("console")==0)
+        //Main<RemoteShell, DummyService>(conf);
         RunShell<RemoteShell>(conf);
     else
+        //Main<RemoteConsole, DummyService>(conf);
         RunShell<RemoteConsole>(conf);