mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-26 02:14:22 +00:00
Code Activity

ApplicationBase: Assume UTF-8 commandline parameter encoding

Browse source
This commit is contained in:
reuk 2022-12-15 17:25:47 +00:00
parent 3b8c26eff3
commit c8753dcc9a
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/juce_events/messages/juce_ApplicationBase.cpp
View file

@ -199,14 +199,12 @@ String JUCEApplicationBase::getCommandLineParameters()
{
String argString;
for (int i = 1; i < juce_argc; ++i)
for (const auto& arg : getCommandLineParameterArray())
{
String arg { CharPointer_UTF8 (juce_argv[i]) };
if (arg.containsChar (' ') && ! arg.isQuotedString())
arg = arg.quoted ('"');
argString << arg << ' ';
const auto withQuotes = arg.containsChar (' ') && ! arg.isQuotedString()
? arg.quoted ('"')
: arg;
argString << withQuotes << ' ';
}
return argString.trim();
@ -214,7 +212,12 @@ String JUCEApplicationBase::getCommandLineParameters()
StringArray JUCEApplicationBase::getCommandLineParameterArray()
{
return StringArray (juce_argv + 1, juce_argc - 1);
StringArray result;
for (int i = 1; i < juce_argc; ++i)
result.add (CharPointer_UTF8 (juce_argv[i]));
return result;
}
int JUCEApplicationBase::main (int argc, const char* argv[])