From 2c81be72eef5363736cf1892646c74a3311ee4c1 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 17:03:17 -0400 Subject: add upstream 11.21 --- zen/process_exec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zen/process_exec.cpp') diff --git a/zen/process_exec.cpp b/zen/process_exec.cpp index 0c5789d5..6b670508 100644 --- a/zen/process_exec.cpp +++ b/zen/process_exec.cpp @@ -44,8 +44,8 @@ namespace std::pair processExecuteImpl(const Zstring& filePath, const std::vector& arguments, std::optional timeoutMs) //throw SysError, SysErrorTimeOut { - const Zstring tempFilePath = appendSeparator(getTempFolderPath()) + //throw FileError - Zstr("FFS-") + utfTo(formatAsHexString(generateGUID())); + const Zstring tempFilePath = appendPath(getTempFolderPath(), //throw FileError + Zstr("FFS-") + utfTo(formatAsHexString(generateGUID()))); /* can't use popen(): does NOT return the exit code on Linux (despite the documentation!), although it works correctly on macOS => use pipes instead: https://linux.die.net/man/2/waitpid bonus: no need for "2>&1" to redirect STDERR to STDOUT -- cgit