mirror of
https://github.com/godotengine/godot
synced 2024-09-05 19:49:39 +00:00
Merge pull request #26462 from SubSage/master
Fixes OS.execute; stderr was silenced; adds missing quote from exe args (windows)
This commit is contained in:
commit
06633a8074
|
@ -442,14 +442,14 @@ Error _OS::shell_open(String p_uri) {
|
|||
return OS::get_singleton()->shell_open(p_uri);
|
||||
};
|
||||
|
||||
int _OS::execute(const String &p_path, const Vector<String> &p_arguments, bool p_blocking, Array p_output) {
|
||||
int _OS::execute(const String &p_path, const Vector<String> &p_arguments, bool p_blocking, Array p_output, bool p_read_stderr) {
|
||||
|
||||
OS::ProcessID pid = -2;
|
||||
List<String> args;
|
||||
for (int i = 0; i < p_arguments.size(); i++)
|
||||
args.push_back(p_arguments[i]);
|
||||
String pipe;
|
||||
Error err = OS::get_singleton()->execute(p_path, args, p_blocking, &pid, &pipe);
|
||||
Error err = OS::get_singleton()->execute(p_path, args, p_blocking, &pid, &pipe, NULL, p_read_stderr);
|
||||
p_output.clear();
|
||||
p_output.push_back(pipe);
|
||||
if (err != OK)
|
||||
|
@ -1183,7 +1183,7 @@ void _OS::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("get_processor_count"), &_OS::get_processor_count);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("get_executable_path"), &_OS::get_executable_path);
|
||||
ClassDB::bind_method(D_METHOD("execute", "path", "arguments", "blocking", "output"), &_OS::execute, DEFVAL(Array()));
|
||||
ClassDB::bind_method(D_METHOD("execute", "path", "arguments", "blocking", "output", "read_stderr"), &_OS::execute, DEFVAL(Array()), DEFVAL(false));
|
||||
ClassDB::bind_method(D_METHOD("kill", "pid"), &_OS::kill);
|
||||
ClassDB::bind_method(D_METHOD("shell_open", "uri"), &_OS::shell_open);
|
||||
ClassDB::bind_method(D_METHOD("get_process_id"), &_OS::get_process_id);
|
||||
|
|
|
@ -214,7 +214,7 @@ public:
|
|||
bool is_in_low_processor_usage_mode() const;
|
||||
|
||||
String get_executable_path() const;
|
||||
int execute(const String &p_path, const Vector<String> &p_arguments, bool p_blocking, Array p_output = Array());
|
||||
int execute(const String &p_path, const Vector<String> &p_arguments, bool p_blocking, Array p_output = Array(), bool p_read_stderr = false);
|
||||
|
||||
Error kill(int p_pid);
|
||||
Error shell_open(String p_uri);
|
||||
|
|
|
@ -2475,7 +2475,13 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
|
|||
|
||||
for (const List<String>::Element *E = p_arguments.front(); E; E = E->next()) {
|
||||
|
||||
argss += String(" \"") + E->get() + "\"";
|
||||
argss += " \"" + E->get() + "\"";
|
||||
}
|
||||
|
||||
argss += "\"";
|
||||
|
||||
if (read_stderr) {
|
||||
argss += " 2>&1"; // Read stderr too
|
||||
}
|
||||
|
||||
FILE *f = _wpopen(argss.c_str(), L"r");
|
||||
|
|
Loading…
Reference in a new issue