summaryrefslogtreecommitdiff
path: root/zen/process_exec.cpp
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-05-22 21:09:26 +0000
committerB. Stack <bgstack15@gmail.com>2022-05-22 21:09:26 +0000
commit54c2e44d7b37b2c3efc449e054eef21fa414dfde (patch)
tree3894ba7e10c78750c195381a861da5e8166a6bfd /zen/process_exec.cpp
parentMerge branch 'b11.20' into 'master' (diff)
parentadd upstream 11.21 (diff)
downloadFreeFileSync-11.21.tar.gz
FreeFileSync-11.21.tar.bz2
FreeFileSync-11.21.zip
Merge branch 'b11.21' into 'master'11.21
add upstream 11.21 See merge request opensource-tracking/FreeFileSync!44
Diffstat (limited to 'zen/process_exec.cpp')
-rw-r--r--zen/process_exec.cpp4
1 files changed, 2 insertions, 2 deletions
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<int /*exit code*/, std::string> processExecuteImpl(const Zstring& filePath, const std::vector<Zstring>& arguments,
std::optional<int> timeoutMs) //throw SysError, SysErrorTimeOut
{
- const Zstring tempFilePath = appendSeparator(getTempFolderPath()) + //throw FileError
- Zstr("FFS-") + utfTo<Zstring>(formatAsHexString(generateGUID()));
+ const Zstring tempFilePath = appendPath(getTempFolderPath(), //throw FileError
+ Zstr("FFS-") + utfTo<Zstring>(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
bgstack15