diff options
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/pbd/system_exec.h | 2 | ||||
-rw-r--r-- | libs/pbd/system_exec.cc | 33 |
2 files changed, 35 insertions, 0 deletions
diff --git a/libs/pbd/pbd/system_exec.h b/libs/pbd/pbd/system_exec.h index c5fb583152..5e543e76ae 100644 --- a/libs/pbd/pbd/system_exec.h +++ b/libs/pbd/pbd/system_exec.h @@ -118,6 +118,8 @@ class LIBPBD_API SystemExec virtual ~SystemExec (); + static char* format_key_value_parameter (std::string, std::string); + std::string to_s() const; /** fork and execute the given program diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc index cc5d8d99fe..26f50146c8 100644 --- a/libs/pbd/system_exec.cc +++ b/libs/pbd/system_exec.cc @@ -236,6 +236,39 @@ SystemExec::SystemExec (std::string command, const std::map<char, std::string> s make_envp(); } +char* +SystemExec::format_key_value_parameter (std::string key, std::string value) +{ + size_t start_pos = 0; + std::string v1 = value; + while((start_pos = v1.find_first_not_of( + "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789(),.\"'", + start_pos)) != std::string::npos) + { + v1.replace(start_pos, 1, "_"); + start_pos += 1; + } + + start_pos = 0; + while((start_pos = v1.find("\"", start_pos)) != std::string::npos) { + v1.replace(start_pos, 1, "\\\""); + start_pos += 2; + } + + size_t len = key.length() + v1.length() + 4; + char *mds = (char*) calloc(len, sizeof(char)); +#ifdef PLATFORM_WINDOWS + /* SystemExec::make_wargs() adds quotes around the complete argument + * windows uses CreateProcess() with a parameter string + * (and not an array list of separate arguments) + */ + snprintf(mds, len, "%s=%s", key.c_str(), v1.c_str()); +#else + snprintf(mds, len, "%s=\"%s\"", key.c_str(), v1.c_str()); +#endif + return mds; +} + void SystemExec::make_argp_escaped(std::string command, const std::map<char, std::string> subs) { |