[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  7e8fe82e04e25ce11305377e5f2992edb031e9fb (commit)
       via  17f43dbe8412ffed4994dc975e785e4c9cfd5b45 (commit)
      from  109ed351c3c8b3b43757f6322edf83a509418e88 (commit)

Summary of changes:
 cpp/src/IceBox/ServiceManagerI.cpp |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 7e8fe82e04e25ce11305377e5f2992edb031e9fb
Merge: 109ed35 17f43db
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Mar 31 13:26:42 2011 -0230

    Small fix to deal with paths with spaces when the path to the IceBox service
    is fully specified in configuration.


commit 17f43dbe8412ffed4994dc975e785e4c9cfd5b45
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Mar 24 16:41:26 2011 -0230

    Add a little tweak to help the service manager exclude paths with spaces from
    the service argument parsing logic.

diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 6a636c6..c4b189d 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -83,9 +83,18 @@ struct StartServiceInfo
         name = service;
 
         //
+        // Start looking for the delimiter for the entry point, but leave some room for a drive letter and colon.
+        //
+        string::size_type colon = value.find(':', 2); 
+        if(colon == string::npos)
+        {
+           colon = 0;
+        }
+
+        //
         // Separate the entry point from the arguments.
         //
-        string::size_type pos = value.find_first_of(" \t\n");
+        string::size_type pos = value.find_first_of(" \t\n", colon);
         if(pos == string::npos)
         {
             entryPoint = value;

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git