diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-05-05 02:33:17 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-05-05 02:33:17 -0700 |
commit | 2da81b0ae789c91c196f0ab6f154bf462bafec2d (patch) | |
tree | 4155ad8990697991e10caf0e972737c5eaac3de4 /exec.cpp | |
parent | d4c881791fb160b4b2cdc076313da00f29577e24 (diff) |
Formatting and style updates
Diffstat (limited to 'exec.cpp')
-rw-r--r-- | exec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -590,7 +590,8 @@ void exec(parser_t &parser, job_t *j) CHECK(j,); CHECK_BLOCK(); - if (no_exec) { + if (no_exec) + { exec_no_exec(parser, j); return; } @@ -1312,7 +1313,7 @@ void exec(parser_t &parser, job_t *j) /* Get argv and envv before we fork */ null_terminated_array_t<char> argv_array; convert_wide_array_to_narrow(p->get_argv_array(), &argv_array); - + /* Ensure that stdin is blocking before we hand it off (see issue #176). It's a little strange that we only do this with stdin and not with stdout or stderr. However in practice, setting or clearing O_NONBLOCK on stdin also sets it for the other two fds, presumably because they refer to the same underlying file (/dev/tty?) */ make_fd_blocking(STDIN_FILENO); |