try escaping output and search paths

Author: dromer

Source/Heavy/CppExporter.h

@@ -33,7 +33,7 @@ class CppExporter final : public ExporterBase {
     {
         exportingView->showState(ExportingProgressView::Exporting);
 
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir };
 
         name = name.replaceCharacter('-', '_');
         args.add("-n" + name);
@@ -55,9 +55,8 @@ class CppExporter final : public ExporterBase {
         if (shouldQuit)
             return true;
 
-        auto compileString = args.joinIntoString(" ");
-        exportingView->logToConsole("Command: " + compileString + "\n");
-        start(compileString);
+        exportingView->logToConsole("Command: " + args.joinIntoString(" ") + "\n");
+        start(args);
 
         waitForProcessToFinish(-1);
         exportingView->flushConsole();

Source/Heavy/DPFExporter.h

@@ -136,7 +136,7 @@ class DPFExporter final : public ExporterBase {
     {
         exportingView->showState(ExportingProgressView::Exporting);
 
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir };
 
         name = name.replaceCharacter('-', '_');
         args.add("-n" + name);
@@ -221,9 +221,8 @@ class DPFExporter final : public ExporterBase {
         if (shouldQuit)
             return true;
 
-        auto compileString = args.joinIntoString(" ");
-        exportingView->logToConsole("Command: " + compileString + "\n");
-        start(compileString);
+        exportingView->logToConsole("Command: " + args.joinIntoString(" ") + "\n");
+        start(args);
 
         waitForProcessToFinish(-1);
         exportingView->flushConsole();

Source/Heavy/DaisyExporter.h

@@ -249,14 +249,15 @@ class DaisyExporter final : public ExporterBase {
         auto size = getValue<int>(patchSizeValue);
         auto appType = getValue<int>(appTypeValue);
 
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir};
 
         name = name.replaceCharacter('-', '_');
         args.add("-n" + name);
 
         if (copyright.isNotEmpty()) {
             args.add("--copyright");
-            args.add("\"" + copyright + "\"");
+            args.add(copyright.quoted());
         }
 
         // set board definition
@@ -331,7 +332,7 @@ class DaisyExporter final : public ExporterBase {
 
         metaJson->setProperty("daisy", metaDaisy);
         auto metaJsonFile = createMetaJson(metaJson);
-        args.add("-m" + metaJsonFile.getFullPathName());
+        args.add("-m" + metaJsonFile.getFullPathName().quoted());
 
         args.add("-v");
         args.add("-gdaisy");
@@ -343,9 +344,8 @@ class DaisyExporter final : public ExporterBase {
 
         args.add(paths);
 
-        auto compileString = args.joinIntoString(" ");
-        exportingView->logToConsole("Command: " + compileString + "\n");
-        start(compileString);
+        exportingView->logToConsole("Command: " + args.joinIntoString(" ") + "\n");
+        start(args);
         waitForProcessToFinish(-1);
         exportingView->flushConsole();
 
@@ -385,15 +385,15 @@ class DaisyExporter final : public ExporterBase {
 #if JUCE_WINDOWS
             auto buildScript = make.getFullPathName().replaceCharacter('\\', '/')
                 + " -j4 -f "
-                + sourceDir.getChildFile("Makefile").getFullPathName().replaceCharacter('\\', '/')
+                + sourceDir.getChildFile("Makefile").getFullPathName().replaceCharacter('\\', '/').quoted()
                 + " GCC_PATH="
                 + gccPath.replaceCharacter('\\', '/')
                 + " PROJECT_NAME=" + name;
 
             Toolchain::startShellScript(buildScript, this);
 #else
             String buildScript = make.getFullPathName()
-                + " -j4 -f " + sourceDir.getChildFile("Makefile").getFullPathName()
+                + " -j4 -f " + sourceDir.getChildFile("Makefile").getFullPathName().quoted()
                 + " GCC_PATH=" + gccPath
                 + " PROJECT_NAME=" + name;
 

Source/Heavy/ExporterBase.h

@@ -140,7 +140,7 @@ struct ExporterBase : public Component
         }
 
         // Add original file location to search paths
-        auto searchPaths = StringArray { realPatchFile.getParentDirectory().getFullPathName() };
+        auto searchPaths = StringArray { realPatchFile.getParentDirectory().getFullPathName().quoted()};
 
         editor->pd->setThis();
 
@@ -149,12 +149,8 @@ struct ExporterBase : public Component
         int numItems;
         pd::Interface::getSearchPaths(paths, &numItems);
 
-        if (realPatchFile.existsAsFile()) {
-            searchPaths.add(realPatchFile.getParentDirectory().getFullPathName());
-        }
-
         for (int i = 0; i < numItems; i++) {
-            searchPaths.add(paths[i]);
+            searchPaths.add(String(paths[i]).quoted());
         }
 
         // Make sure we don't add the file location twice

Source/Heavy/OWLExporter.h

@@ -94,7 +94,7 @@ class OWLExporter : public ExporterBase {
         bool store = getValue<int>(exportTypeValue) == 4;
         int slot = getValue<int>(storeSlotValue);
 
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir };
 
         name = name.replaceCharacter('-', '_');
         args.add("-n" + name);
@@ -114,9 +114,8 @@ class OWLExporter : public ExporterBase {
 
         args.add(paths);
 
-        auto compileString = args.joinIntoString(" ");
-        exportingView->logToConsole("Command: " + compileString + "\n");
-        start(compileString);
+        exportingView->logToConsole("Command: " + args.joinIntoString(" ") + "\n");
+        start(args);
 
         waitForProcessToFinish(-1);
         exportingView->flushConsole();

Source/Heavy/PdExporter.h

@@ -65,7 +65,7 @@ class PdExporter final : public ExporterBase {
     {
         exportingView->showState(ExportingProgressView::Exporting);
 
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir };
 
         name = name.replaceCharacter('-', '_');
         args.add("-n" + name);
@@ -88,9 +88,8 @@ class PdExporter final : public ExporterBase {
         if (shouldQuit)
             return true;
 
-        auto compileString = args.joinIntoString(" ");
-        exportingView->logToConsole("Command: " + compileString + "\n");
-        start(compileString);
+        exportingView->logToConsole("Command: " + args.joinIntoString(" ") + "\n");
+        start(args);
 
         waitForProcessToFinish(-1);
         exportingView->flushConsole();

Source/Heavy/WASMExporter.h

@@ -65,7 +65,7 @@ class WASMExporter : public ExporterBase {
 #if JUCE_WINDOWS
         StringArray args = { heavyExecutable.getFullPathName().replaceCharacter('\\', '/'), pdPatch.replaceCharacter('\\', '/'), "-o" + outdir.replaceCharacter('\\', '/') };
 #else
-        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o" + outdir };
+        StringArray args = { heavyExecutable.getFullPathName(), pdPatch, "-o", outdir };
 #endif
 
         name = name.replaceCharacter('-', '_');