Fix paths and utils.

Add settings and www to resources.

Author: cztomczak

CMakeLists.txt

@@ -50,6 +50,27 @@ set(HELPER_SOURCES
 )
 set(RESOURCES
     icon.icns
+    settings.json
+    www/_pdo.php
+    www/cookies.php
+    www/dialogs.php
+    www/download.php
+    www/env-variables.php
+    www/forms.php
+    www/google.php
+    www/html5-video.php
+    www/index.php
+    www/loading-error.php
+    www/php-error.php
+    www/phpinfo.php
+    www/popup.php
+    www/pretty-urls.php
+    www/request-quota.php
+    www/session.php
+    www/sqlite.php
+    www/style.css
+    www/upload.php
+    www/window-close.php
 )
 set(PHPDESKTOP_OUT_DIR "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
 set(PHPDESKTOP_APP "${PHPDESKTOP_OUT_DIR}/PHP Desktop.app")

buildandrun.sh

@@ -10,4 +10,3 @@ if [ $retval -ne 0 ]; then
     exit $retval
 fi
 open -W --stdout $(tty) --stderr $(tty) "./Debug/PHP Desktop.app"
-#./Debug/PHP\ Desktop.app/Contents/MacOS/PHP\ Desktop

main.mm

@@ -117,6 +117,7 @@ int main(int argc, char **argv) {
     }
 
     LOG(INFO) << "Executable directory: " << GetExecutableDir();
+    LOG(INFO) << "Resources directory: " << GetResourcesDir();
 
     // If reading settings.json fails exit app immediately
     json_value* app_settings = Settings();

mongoose_server.cpp

@@ -80,7 +80,7 @@ bool mongoose_start() {
 
     // www_directory
     std::string www_directory((*app_settings)["web_server"]["www_directory"]);
-    www_directory = GetFullPath(www_directory);
+    www_directory = GetResourcesDir().append("/").append(www_directory);
     LOG(INFO) << "www_directory=" << www_directory;
 
     // index_files
@@ -102,9 +102,8 @@ bool mongoose_start() {
     LOG(INFO) << "index_files=" << index_files;
 
     // cgi_interpreter
-    std::string cgi_interpreter(
-            (*app_settings)["web_server"]["cgi_interpreter"]);
-    cgi_interpreter = GetFullPath(cgi_interpreter);
+    std::string cgi_interpreter((*app_settings)["web_server"]["cgi_interpreter"]);
+    cgi_interpreter = GetExecutableDir().append("/").append(cgi_interpreter);
     LOG(INFO) << "cgi_interpreter=" << cgi_interpreter;
 
     // cgi_pattern (from cgi_extensions)

settings.cpp

@@ -14,11 +14,10 @@ json_value* Settings()
         return ret;
     }
     settings_fetched = true;
-    LOG(INFO) << "Fetching settings from settings.json file";
 
-    std::string settings_file;
-    GetResourcesDir(settings_file);
-    settings_file.append("/settings.json");
+    std::string settings_file = GetResourcesDir().append("/settings.json");
+    LOG(INFO) << "Fetching settings from file: " << settings_file;
+
     std::string contents = GetFileContents(settings_file);
     if (contents.empty()) {
         g_SettingsError = "Error while reading settings.json file";

utils.h

@@ -4,7 +4,7 @@
 
 #include <string>
 
-bool GetResourcesDir(std::string& dir);
+std::string GetResourcesDir();
 std::string GetExecutableDir();
 std::string GetFileContents(std::string file);
 std::string GetFullPath(std::string path);

utils.mm

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Czarek Tomczak, PHP Desktop.
 
 #include "utils.h"
+#include <filesystem>
 #include <limits.h>
 #include <unistd.h>
 #include <fstream>
@@ -9,42 +10,38 @@
 #import <Foundation/Foundation.h>
 #include <mach-o/dyld.h>
 
-bool GetResourcesDir(std::string& dir)
+std::string RealPath(std::string path)
 {
-    static bool am_i_bundled = [[[NSBundle mainBundle] bundlePath] hasSuffix:@".app"];
-    uint32_t path_size = 0;
-    _NSGetExecutablePath(nullptr, &path_size);
-    if (path_size > 0) {
-        dir.resize(path_size);
-        _NSGetExecutablePath(const_cast<char*>(dir.c_str()), &path_size);
+    char buffer[PATH_MAX];
+    char* result = realpath(path.c_str(), buffer);
+    if (result) {
+        return buffer;
+    } else {
+        return path;
     }
+}
+
+std::string GetResourcesDir()
+{
+    static bool am_i_bundled = [[[NSBundle mainBundle] bundlePath] hasSuffix:@".app"];
+    std::string dir = GetExecutableDir();
     if (am_i_bundled) {
-        std::string::size_type last_sep = dir.find_last_of("/");
-        dir.resize(last_sep);
         dir.append("/../Resources");
-        return true;
+        return RealPath(dir);
     }
     dir.append("/Resources");
-    return true;
+    return dir;
 }
 
 std::string GetExecutableDir()
 {
     // Directory in which executable resides.
     char app_path[PATH_MAX] = {};
-    ssize_t pplen = readlink("/proc/self/exe", app_path, sizeof(app_path)-1);
-    if (pplen != -1) {
-        app_path[pplen] = '\0';
-    }
-    do {
-        pplen -= 1;
-        app_path[pplen+1] = '\0';
-    } while (app_path[pplen] != '/' && pplen > 0);
-    // No slash at the end.
-    if (pplen > 0 && app_path[pplen] == '/') {
-        app_path[pplen] = '\0';
+    uint32_t bufsize = PATH_MAX;
+    if (_NSGetExecutablePath(app_path, &bufsize) != 0) {
+        return "";
     }
-    return app_path;
+    return RealPath(std::filesystem::path{app_path}.parent_path());
 }
 
 std::string GetFileContents(std::string file)