nicole/cellar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix spaces in args

Browse Source
This commit is contained in:
Nicholas O'Connor
2017-04-07 21:37:58 -07:00
parent 9039e57790
commit c68f95b73d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/launch/launch.cpp
View File

@@ -14,11 +14,8 @@ using namespace std;
using namespace cellar; using namespace cellar;
void cellar::launch::launch_program(vector<string> args) { void cellar::launch::launch_program(vector<string> args) {
vector<string> wineargs = args; args[0] = "wine";
wineargs[0] = "wine"; launch::popen(args);
string winelaunch = boost::algorithm::join(wineargs, " ");
launch::popen(winelaunch);
} }
void cellar::launch::launch_command(int argc, vector<string> args) { void cellar::launch::launch_command(int argc, vector<string> args) {
@@ -30,6 +27,8 @@ void cellar::launch::launch_command(int argc, vector<string> args) {
} }
void cellar::launch::popen(string argv) { void cellar::launch::popen(string argv) {
output::warning("use of deprecated string based function", true);
output::statement("launching program: " + argv, true);
vector<string> argvsplit; vector<string> argvsplit;
boost::algorithm::split(argvsplit, argv, boost::is_any_of(" ")); boost::algorithm::split(argvsplit, argv, boost::is_any_of(" "));
string exec = argvsplit[0]; string exec = argvsplit[0];
@@ -43,6 +42,7 @@ void cellar::launch::popen(string argv) {
} }
void cellar::launch::popen(vector<string> argv) { void cellar::launch::popen(vector<string> argv) {
output::statement("launching program: " + boost::algorithm::join(argv, " "), true);
string exec = argv[0]; string exec = argv[0];
vector<string> subargv; vector<string> subargv;
for (int curarg = 1; curarg < argv.size(); curarg++) { for (int curarg = 1; curarg < argv.size(); curarg++) {