From 72322d65d74f9ca9191fa242f933342e8458c04a Mon Sep 17 00:00:00 2001
From: Ryan Schmidt <git@ryandesign.com>
Date: Thu, 22 Sep 2022 06:33:02 -0500
Subject: [PATCH] MiniVMac.cc: New method FindFolder

Remove hardcoded Extensions and Startup Items folder names and get the
correct localized names from the System file's 'fld#' resource.
---
 LaunchAPPL/Client/MiniVMac.cc | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/LaunchAPPL/Client/MiniVMac.cc b/LaunchAPPL/Client/MiniVMac.cc
index 5e6046278f..ae58f1e2c6 100644
--- a/LaunchAPPL/Client/MiniVMac.cc
+++ b/LaunchAPPL/Client/MiniVMac.cc
@@ -81,6 +81,7 @@ class MiniVMacLauncher : public Launcher
     void CopySystemFile(const std::string& fn, bool required);
     void ReadSystemResources(const std::string& systemFileName);
     uint16_t GetSystemVersion();
+    std::string FindFolder(const std::string& folderType);
     void MakeAlias(const std::string& dest, const std::string& src);
     fs::path ConvertImage(const fs::path& path);
 public:
@@ -278,10 +279,11 @@ MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options)
     {
         CopySystemFile("Finder", true);
         CopySystemFile("System 7.5 Update", false);
-        if(hfs_chdir(sysvol, "Extensions") != -1)
+        std::string extensionsFolderName = FindFolder("extn");
+        if(hfs_chdir(sysvol, extensionsFolderName.c_str()) != -1)
         {
-            hfs_mkdir(vol, "Extensions");
-            if(hfs_chdir(vol, "Extensions") != -1)
+            hfs_mkdir(vol, extensionsFolderName.c_str());
+            if(hfs_chdir(vol, extensionsFolderName.c_str()) != -1)
             {
                 CopySystemFile("Appearance Extension", false);
                 CopySystemFile("System 7 Tuner", false);
@@ -320,8 +322,9 @@ MiniVMacLauncher::MiniVMacLauncher(po::variables_map &options)
     {
         CopySystemFile("AutQuit7", true);
         MakeAlias("AutQuit7 alias", "AutQuit7");
-        hfs_mkdir(vol, "Startup Items");
-        hfs_rename(vol, "AutQuit7 alias", "Startup Items");
+        std::string startupItemsFolderName = FindFolder("strt");
+        hfs_mkdir(vol, startupItemsFolderName.c_str());
+        hfs_rename(vol, "AutQuit7 alias", startupItemsFolderName.c_str());
     }
     else
     {
@@ -448,6 +451,21 @@ uint16_t MiniVMacLauncher::GetSystemVersion()
 }
 
 
+std::string MiniVMacLauncher::FindFolder(const std::string& folderType)
+{
+    Resource fld = systemRes->resources[ResRef('fld#', 0)];
+    size_t i = 0;
+    while (i < fld.getData().size())
+    {
+        unsigned char len = fld.getData()[i + 7];
+        if (fld.getData().substr(i, 4) == folderType)
+            return fld.getData().substr(i + 8, len);
+        i += 8 + len + len % 2;
+    }
+    return "unknown";
+}
+
+
 bool MiniVMacLauncher::Go(int timeout)
 {
     fs::current_path(tempDir);