From 886a64e02a0f7ce192c318f74cff1f16d5e15bfb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 13 Jan 2015 22:40:14 +0100 Subject: [PATCH] support [unescaped] double-quotes in jackdrc allow autostart of jackd on OSX where device-names can contain spaces. --- posix/JackPosixServerLaunch.cpp | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/posix/JackPosixServerLaunch.cpp b/posix/JackPosixServerLaunch.cpp index e4d3985c..f1e94c1f 100644 --- a/posix/JackPosixServerLaunch.cpp +++ b/posix/JackPosixServerLaunch.cpp @@ -148,16 +148,36 @@ static void start_server_classic_aux(const char* server_name) } } - result = strcspn(arguments + pos, " "); - if (result == 0) { + /* skip whitespace */ + while (pos < strlen(arguments) && arguments[pos] && arguments[pos] == ' ') { + ++pos; + } + + if (pos >= strlen(arguments)) { + break; + } + + if (arguments[pos] == '\"') { + ++pos; + result = strcspn(arguments + pos, "\""); + } else { + result = strcspn(arguments + pos, " "); + } + + if (0 == result) { break; } + argv[i] = (char*)malloc(result + 1); strncpy(argv[i], arguments + pos, result); argv[i][result] = '\0'; pos += result + 1; - ++i; + + if (++i > 253) { + break; + } } + argv[i] = 0; execv(command, argv);