diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-17 11:22:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-17 11:59:23 +0100 |
| commit | 051439813e2cfcbba69c9b0c0eb00b43f9dde825 (patch) | |
| tree | c1f91eb9eceed87fc5033471a4c36fa23cc45ddb /src/util | |
| parent | 263f53e2d07acfbb5c301b654cab7ba63fd96784 (diff) | |
| parent | 4e9efac678a9c0ea4e4c7dd956ea036ae6cf17ec (diff) | |
| download | bitcoin-051439813e2cfcbba69c9b0c0eb00b43f9dde825.tar.xz | |
Merge #13339: wallet: Replace %w by wallet name in -walletnotify script
4e9efac678a9c0ea4e4c7dd956ea036ae6cf17ec test: Check wallet name in -walletnotify script (João Barbosa)
9a5b5ee81f15b1d89cb25ff3e137a672536cdc46 wallet: Replace %w by wallet name in -walletnotify script (João Barbosa)
Pull request description:
Fixes #13237.
ACKs for top commit:
laanwj:
ACK 4e9efac678a9c0ea4e4c7dd956ea036ae6cf17ec
Tree-SHA512: 189dd1c785485f2e974d7c12531851b2a977778b3b954aa95efd527322ba3345924cfd587fb9c90b0fa979202af0ab2d90e53d125fe266a36c94f757e4176203
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/system.cpp | 10 | ||||
| -rw-r--r-- | src/util/system.h | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 13ff99c663..b0a538b527 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -63,6 +63,7 @@ #include <malloc.h> #endif +#include <boost/algorithm/string/replace.hpp> #include <thread> #include <typeinfo> #include <univalue.h> @@ -1047,6 +1048,15 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate) } #endif +#ifndef WIN32 +std::string ShellEscape(const std::string& arg) +{ + std::string escaped = arg; + boost::replace_all(escaped, "'", "'\"'\"'"); + return "'" + escaped + "'"; +} +#endif + #if HAVE_SYSTEM void runCommand(const std::string& strCommand) { diff --git a/src/util/system.h b/src/util/system.h index bb69181de9..3138522b5c 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -81,6 +81,9 @@ fs::path GetConfigFile(const std::string& confPath); #ifdef WIN32 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true); #endif +#ifndef WIN32 +std::string ShellEscape(const std::string& arg); +#endif #if HAVE_SYSTEM void runCommand(const std::string& strCommand); #endif |