+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
#include <sys/wait.h>
#include <iostream>
-#include <msp/iter.h>
+#include <cstring>
+#include <cstdlib>
+#include <msp/fs/dir.h>
#include "builder.h"
#include "externalaction.h"
using namespace std;
using namespace Msp;
-int ExternalAction::check()
-{
- if(builder.get_dry_run())
- {
- signal_done.emit();
- return 0;
- }
-
- if(!pid)
- return exit_code;
-
- int status;
- if(waitpid(pid, &status, WNOHANG)==pid)
- {
- signal_done.emit();
- if(WIFEXITED(status))
- exit_code=WEXITSTATUS(status);
- else
- exit_code=254;
- pid=0;
- return exit_code;
- }
- else
- return -1;
-}
-
-/**
-Starts the external program. Fill in argv before calling this.
-*/
void ExternalAction::launch()
{
if(builder.get_verbose()>=2)
}
cout<<'\n';
}
-
+
if(builder.get_dry_run())
pid=-1;
else
if(pid==0)
{
char *argv_[argv.size()+1];
- for(CountingIterator<string, StringList::iterator> 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;
+
+ if(!work_dir.empty())
+ FS::chdir(work_dir);
execvp(argv_[0], argv_);
cout<<"Couldn't execute "<<argv.front()<<'\n';
exit(1);
pid=0;
}
}
+
+int ExternalAction::check()
+{
+ if(builder.get_dry_run())
+ {
+ signal_done.emit();
+ return 0;
+ }
+
+ if(!pid)
+ return exit_code;
+
+ int status;
+ if(waitpid(pid, &status, WNOHANG)==pid)
+ {
+ signal_done.emit();
+ if(WIFEXITED(status))
+ exit_code=WEXITSTATUS(status);
+ else
+ exit_code=254;
+ pid=0;
+ return exit_code;
+ }
+ else
+ return -1;
+}