Changeset 2956 in Sophya for trunk

Timestamp:

May 31, 2006, 2:30:13 PM (19 years ago)

Author:

ansari

Message:

correction gestion & pour ThrExec ds Commander - Reza 31/05/2006

File:

• trunk/SophyaLib/SysTools/commander.cc (modified) (2 diffs)

trunk/SophyaLib/SysTools/commander.cc

@@ -368 +368 @@
   _cmdex = cmdex;
   _keyw = keyw;
-  if (args.size() > 1)
-    for(size_t k=0; k<args.size()-1; k++) _args.push_back(args[k]); 
+  _args = args;
+  _args.erase(_args.end()-1);
   _toks = toks;
   for(size_t k=_toks.size()-1; k>0; k--) 
@@ -1963 +1963 @@
     if ((*it).second.cex) {
       // Doit-on l'executer sous forme de thread separe ? 
-      if ( (args.size()>0) && (args[args.size()-1] == "&") && 
-           ((*it).second.cex->IsThreadable(keyw)) ) {
-        ThrId++;
-        CommandExeThr * thr = new CommandExeThr(ThrId, (*it).second.cex, keyw, args, toks);
-        CmdThrExeList.push_back(thr);
-        cout << " Commander::ExecuteCommand() : Thread execution of command " << keyw << endl;
-        thr->start();
-        if (CmdThrExeList.size() > 5)  CleanThrList();
-        rc = 0;
+      if ( (args.size()>0) && (args[args.size()-1] == "&") ) { 
+        if ((*it).second.cex->IsThreadable(keyw) ) {
+          ThrId++;
+          CommandExeThr * thr = 
+            new CommandExeThr(ThrId, (*it).second.cex, keyw, args, toks);
+          CmdThrExeList.push_back(thr);
+          cout << " Commander::ExecuteCommand() : Thread execution of command " << keyw << endl;
+          thr->start();
+          if (CmdThrExeList.size() > 5)  CleanThrList();
+          rc = 0;
+        }
+        else {
+          args.erase(args.end()-1);
+          for(size_t k=toks.size()-1; k>0; k--) 
+            if (toks[k] == '&') { toks[k] = ' '; break; }
+          cout << " Commander::ExecuteCommand() : Thread execution NOT available for" << keyw << endl;
+          rc = (*it).second.cex->Execute(keyw, args, toks);
+        }
       }
       else  rc = (*it).second.cex->Execute(keyw, args, toks);