Merge branch '2.4.2' into lexer2

This commit is contained in:
Paul Beckingham 2015-02-22 14:06:01 -05:00
commit 9898aa15b5
2 changed files with 12 additions and 4 deletions

View file

@ -299,9 +299,11 @@ int execute (
if (dup2 (pin[0], STDIN_FILENO) == -1)
throw std::string (std::strerror (errno));
close (pin[0]);
if (dup2 (pout[1], STDOUT_FILENO) == -1)
throw std::string (std::strerror (errno));
close (pout[1]);
char** argv = new char* [args.size () + 2];
argv[0] = (char*) executable.c_str ();