diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-09 12:20:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 12:20:39 +0200 |
| commit | e8b9cca6147e2ea1aa0f9091460755c1e5ede3d7 (patch) | |
| tree | d93f82b88702eca664b9cc0da47ffa11eeb391ea /drivers | |
| parent | 17011f5d123879eb9fcd4ea25b92365f7d2061f7 (diff) | |
| parent | b6daa94a806063876820a78fa3c96a79e6bc3d99 (diff) | |
Merge pull request #11810 from marcelofg55/osx_export_improv
OS X export code improvements
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 8 | ||||
| -rw-r--r-- | drivers/unix/os_unix.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 29fe73f170..e0a62b316d 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -285,7 +285,7 @@ uint64_t OS_Unix::get_ticks_usec() const { return longtime; } -Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode) { +Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool read_stderr) { if (p_blocking && r_pipe) { @@ -297,7 +297,11 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo argss += String(" \"") + p_arguments[i] + "\""; } - argss += " 2>/dev/null"; //silence stderr + if (read_stderr) { + argss += " 2>&1"; // Read stderr too + } else { + argss += " 2>/dev/null"; //silence stderr + } FILE *f = popen(argss.utf8().get_data(), "r"); ERR_FAIL_COND_V(!f, ERR_CANT_OPEN); diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 1cc44c0ffd..87e73534c4 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -97,7 +97,7 @@ public: virtual void delay_usec(uint32_t p_usec) const; virtual uint64_t get_ticks_usec() const; - virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL); + virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false); virtual Error kill(const ProcessID &p_pid); virtual int get_process_id() const; |