fix call to system() when brackets present in path

wheybags · Mar 6, 2020 · eaac98a · eaac98a
1 parent c912d5b
commit eaac98a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/apps/freeablo/fa_main.cpp b/apps/freeablo/fa_main.cpp
@@ -116,7 +116,7 @@ int fa_main(int argc, char** argv)
     if (!(settings.loadUserSettings() && dataFilesSetUp(settings)))
     {
         filesystem::path path = (filesystem::path(argv[0]).parent_path() / "launcher").make_absolute();
-        system(Misc::escapeSpacesOnPath(path.str()).c_str());
+        system(Misc::escapePathForShell(path.str()).c_str());
         return EXIT_SUCCESS;
     }
 

diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
@@ -200,7 +200,7 @@ int main(int, char** argv)
     if (runFreeablo)
     {
         filesystem::path path = (filesystem::path(argv[0]).parent_path() / "freeablo").make_absolute();
-        system(Misc::escapeSpacesOnPath(path.str()).c_str());
+        system(Misc::escapePathForShell(path.str()).c_str());
     }
 
     return 0;

diff --git a/components/misc/misc.cpp b/components/misc/misc.cpp
@@ -35,22 +35,21 @@ namespace Misc
         return ss.str() + suffix;
     }
 
-    std::string escapeSpacesOnPath(const std::string& path)
+    std::string escapePathForShell(const std::string& path)
     {
-#ifdef _WIN32
-        return "\"" + path + "\"";
-#else
         std::stringstream ret;
+
+        ret << '"';
         for (char c : path)
         {
-            if (c == ' ')
-                ret << "\\ ";
+            if (c == '"')
+                ret << "\\\"";
             else
                 ret << c;
         }
+        ret << '"';
 
         return ret.str();
-#endif
     }
 
     std::string argv0;

diff --git a/components/misc/misc.h b/components/misc/misc.h
@@ -30,7 +30,7 @@ namespace Misc
 
     std::string numberToHumanFileSize(double sizeInBytes);
 
-    std::string escapeSpacesOnPath(const std::string& str);
+    std::string escapePathForShell(const std::string& str);
 }
 
 template <typename T> class NonNullPtr