godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

OS::execute can now read from stderr too when executing with a pipe.

Browse Source
This commit is contained in:
Marcelo Fernandez
2017-09-21 17:44:53 -03:00
parent 1391269a78
commit 253db95cba
7 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@@ -197,7 +197,7 @@ public:
virtual String get_installed_templates_path() const { return ""; } virtual String get_installed_templates_path() const { return ""; }
virtual String get_executable_path() const; virtual String get_executable_path() 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) = 0; 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) = 0;
virtual Error kill(const ProcessID &p_pid) = 0; virtual Error kill(const ProcessID &p_pid) = 0;
virtual int get_process_ID() const; virtual int get_process_ID() const;

8
drivers/unix/os_unix.cpp
View File

@@ -330,7 +330,7 @@ uint64_t OS_Unix::get_ticks_usec() const {
return longtime; 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) { if (p_blocking && r_pipe) {
@@ -342,7 +342,11 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
argss += String(" \"") + p_arguments[i] + "\""; 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"); FILE *f = popen(argss.utf8().get_data(), "r");
ERR_FAIL_COND_V(!f, ERR_CANT_OPEN); ERR_FAIL_COND_V(!f, ERR_CANT_OPEN);

2
drivers/unix/os_unix.h
View File

@@ -97,7 +97,7 @@ public:
virtual void delay_usec(uint32_t p_usec) const; virtual void delay_usec(uint32_t p_usec) const;
virtual uint64_t get_ticks_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 Error kill(const ProcessID &p_pid);
virtual int get_process_ID() const; virtual int get_process_ID() const;

2
platform/windows/os_windows.cpp
View File

@@ -1901,7 +1901,7 @@ void OS_Windows::set_cursor_shape(CursorShape p_shape) {
cursor_shape = p_shape; cursor_shape = p_shape;
} }
Error OS_Windows::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_Windows::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) { if (p_blocking && r_pipe) {

2
platform/windows/os_windows.h
View File

@@ -241,7 +241,7 @@ public:
virtual void delay_usec(uint32_t p_usec) const; virtual void delay_usec(uint32_t p_usec) const;
virtual uint64_t get_ticks_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 Error kill(const ProcessID &p_pid);
virtual int get_process_ID() const; virtual int get_process_ID() const;

2
platform/winrt/os_winrt.cpp
View File

@@ -771,7 +771,7 @@ void OSWinrt::set_cursor_shape(CursorShape p_shape) {
cursor_shape = p_shape; cursor_shape = p_shape;
} }
Error OSWinrt::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode) { Error OSWinrt::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) {
return FAILED; return FAILED;
}; };

2
platform/winrt/os_winrt.h
View File

@@ -226,7 +226,7 @@ public:
virtual void delay_usec(uint32_t p_usec) const; virtual void delay_usec(uint32_t p_usec) const;
virtual uint64_t get_ticks_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 Error kill(const ProcessID &p_pid);
virtual bool has_environment(const String &p_var) const; virtual bool has_environment(const String &p_var) const;