Index: src/IceBox/ServiceManagerI.cpp =================================================================== RCS file: /home/cvsroot/ice/src/IceBox/ServiceManagerI.cpp,v retrieving revision 1.53.2.3 diff -c -r1.53.2.3 ServiceManagerI.cpp *** src/IceBox/ServiceManagerI.cpp 13 Jan 2006 15:26:00 -0000 1.53.2.3 --- src/IceBox/ServiceManagerI.cpp 23 Jan 2006 17:51:55 -0000 *************** *** 8,13 **** --- 8,14 ---- // ********************************************************************** #include + #include #include #include #include *************** *** 207,227 **** else { entryPoint = value.substr(0, pos); ! string::size_type beg = value.find_first_not_of(" \t\n", pos); ! while(beg != string::npos) ! { ! string::size_type end = value.find_first_of(" \t\n", beg); ! if(end == string::npos) ! { ! args.push_back(value.substr(beg)); ! beg = end; ! } ! else ! { ! args.push_back(value.substr(beg, end - beg)); ! beg = value.find_first_not_of(" \t\n", end); ! } ! } } start(name, entryPoint, args); --- 208,223 ---- else { entryPoint = value.substr(0, pos); ! try ! { ! args = IceUtil::Options::split(value.substr(pos + 1)); ! } ! catch(const IceUtil::Options::BadQuote& ex) ! { ! FailureException e(__FILE__, __LINE__); ! e.reason = "ServiceManager: invalid arguments for service `" + name + "':\n" + ex.reason; ! throw e; ! } } start(name, entryPoint, args); Index: src/IceGrid/ServerI.cpp =================================================================== RCS file: /home/cvsroot/ice/src/IceGrid/ServerI.cpp,v retrieving revision 1.56.2.3 diff -c -r1.56.2.3 ServerI.cpp *** src/IceGrid/ServerI.cpp 20 Jan 2006 09:52:51 -0000 1.56.2.3 --- src/IceGrid/ServerI.cpp 23 Jan 2006 17:51:57 -0000 *************** *** 1874,1880 **** ServiceDescriptorPtr s = ServiceDescriptorPtr::dynamicCast(p->descriptor); const string path = serverDir + "/config/config_" + s->name; props.push_back(createProperty("IceBox.Service." + s->name, ! s->entry + " --Ice.Config=" + path)); servicesStr += s->name + " "; } props.push_back(createProperty("IceBox.LoadOrder", servicesStr)); --- 1874,1880 ---- ServiceDescriptorPtr s = ServiceDescriptorPtr::dynamicCast(p->descriptor); const string path = serverDir + "/config/config_" + s->name; props.push_back(createProperty("IceBox.Service." + s->name, ! s->entry + " --Ice.Config=\"" + path + "\"")); servicesStr += s->name + " "; } props.push_back(createProperty("IceBox.LoadOrder", servicesStr));