X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexternalaction.cpp;h=bde453f8c18b7321d0835ad54ce3913f93e0dfce;hb=8bc8db44c47cd2906c57dccbfb589e41eff7f694;hp=0ae68ff05f30bd297b314de7a77ac3e471192cb0;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git diff --git a/source/externalaction.cpp b/source/externalaction.cpp index 0ae68ff..bde453f 100644 --- a/source/externalaction.cpp +++ b/source/externalaction.cpp @@ -1,6 +1,12 @@ +/* $Id$ + +This file is part of builder +Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Distributed under the LGPL +*/ + #include #include -#include #include "builder.h" #include "externalaction.h" @@ -14,7 +20,7 @@ int ExternalAction::check() signal_done.emit(); return 0; } - + if(!pid) return exit_code; @@ -48,7 +54,7 @@ void ExternalAction::launch() } cout<<'\n'; } - + if(builder.get_dry_run()) pid=-1; else @@ -57,10 +63,14 @@ void ExternalAction::launch() if(pid==0) { char *argv_[argv.size()+1]; - for(CountingIterator i=argv.begin(); i!=argv.end(); ++i) - argv_[i.count()]=strdup(i->c_str()); - argv_[argv.size()]=0; + + unsigned j=0; + for(StringList::iterator i=argv.begin(); i!=argv.end(); ++i) + argv_[j++]=strdup(i->c_str()); + argv_[j]=0; + execvp(argv_[0], argv_); + cout<<"Couldn't execute "<