ocran 1.4.4 → 1.4.5

data/src/stub.c

@@ -8,6 +8,10 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#ifdef __COSMOPOLITAN__
+#include <cosmo.h>           /* IsWindows() */
+#include <libc/nt/runtime.h> /* ExitProcess() */
+#endif
 #include "error.h"
 #include "system_utils.h"
 #include "inst_dir.h"
@@ -21,6 +25,7 @@ int main(int argc, char *argv[])
     OperationModes op_modes = 0;
     const char *extract_dir = NULL;
     char *image_path = NULL;
+    char *exe_dir = NULL;
 
     /*
        Initialize signal and control handling so the parent process remains
@@ -96,12 +101,41 @@ int main(int argc, char *argv[])
         goto cleanup;
     }
 
+    /* Resolve the executable's directory when the script should start
+       with its working directory next to the .exe (--chdir-exe-dir). */
+    if (IsChdirToExeDir(op_modes)) {
+        exe_dir = GetParentPath(image_path);
+        if (!exe_dir) {
+            FATAL("Failed to resolve the executable directory");
+            goto cleanup;
+        }
+        DEBUG("Will start script in executable directory: %s", exe_dir);
+    }
+#ifdef __COSMOPOLITAN__
+    /*
+       This stub is itself an APE.  It fork/execs the payload interpreter and
+       reads the result with WEXITSTATUS() (system_utils_posix.c), so on
+       Windows the child must keep Cosmopolitan's wait-status exit encoding
+       (status << 8) -- otherwise `exit 3` would come back looking like death
+       by signal 3.  CosmoRuby reports the plain status by default now, which
+       is right for a native parent but wrong for this one; the variable asks
+       it for the old encoding.  Harmless for interpreters that do not know
+       the variable, and a no-op off Windows.  This process still reports the
+       plain status to ITS native parent, at the end of main().
+    */
+    DEBUG("Set 'COSMORUBY_WAIT_STATUS_EXIT' so the payload's status survives waitpid()");
+    if (!SetEnvVar("COSMORUBY_WAIT_STATUS_EXIT", "1")) {
+        FATAL("The script cannot be launched due to a configuration error");
+        goto cleanup;
+    }
+#endif
+
     /*
        RunScript uses the current value of status as its initial value
        and then overwrites it with the external script’s return code.
     */
     DEBUG("Run application script");
-    if (!RunScript(argv, IsChdirBeforeScript(op_modes), &status)) {
+    if (!RunScript(argv, IsChdirBeforeScript(op_modes), exe_dir, &status)) {
         FATAL("Failed to run script");
         goto cleanup;
     }
@@ -119,6 +153,10 @@ cleanup:
         free(image_path);
     }
 
+    if (exe_dir) {
+        free(exe_dir);
+    }
+
     if (unpack_ctx) {
         ClosePackFile(unpack_ctx);
         unpack_ctx = NULL;
@@ -140,5 +178,17 @@ cleanup:
 
     FreeInstDir();
     extract_dir = NULL;
+
+#ifdef __COSMOPOLITAN__
+    /* On Windows, Cosmopolitan Libc's exit path encodes the full wait
+       status into the process exit code (code << 8) so that cosmo
+       parents can reconstruct it. Native Windows parents (cmd,
+       PowerShell, CI runners) expect the plain code, so bypass the
+       libc exit path and report the code as-is. */
+    if (IsWindows()) {
+        fflush(NULL);
+        ExitProcess(status);
+    }
+#endif
     return status;
 }

data/src/system_utils_posix.c

@@ -1,6 +1,9 @@
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
 #endif
+#ifdef __COSMOPOLITAN__
+#include <cosmo.h>  /* GetProgramExecutableName() */
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -360,6 +363,23 @@ bool ExportFile(const char *path, const void *buffer, size_t buffer_size) {
 /* ===== Path utilities ===== */
 
 char *GetImagePath(void) {
+#ifdef __COSMOPOLITAN__
+    /* Cosmopolitan Libc defines neither __linux__ nor __APPLE__; it resolves
+       the executable path itself on every OS the APE binary runs on. */
+    const char *exe = GetProgramExecutableName();
+    if (!exe || !*exe) {
+        FATAL("GetImagePath: GetProgramExecutableName failed");
+        return NULL;
+    }
+
+    char *result = strdup(exe);
+    if (!result) {
+        FATAL("GetImagePath: strdup failed");
+        return NULL;
+    }
+
+    return result;
+#else
     static char path_buffer[4096];
 #ifdef __APPLE__
     uint32_t size = sizeof(path_buffer);
@@ -388,10 +408,30 @@ char *GetImagePath(void) {
 
     strcpy(result, path_buffer);
     return result;
+#endif /* __COSMOPOLITAN__ */
 }
 
 char *GetTempDirectoryPath(void) {
     const char *tmpdir = getenv("TMPDIR");
+#ifdef __COSMOPOLITAN__
+    /* On Windows, Cosmopolitan Libc translates the magic "/tmp" prefix to
+       a real directory, but WHERE it points differs between cosmo
+       releases (%TMP% in some, C:\tmp in others). This stub and the
+       packed cosmopolitan Ruby may be built against different cosmo
+       versions, so a literal "/tmp/..." extraction path handed to the
+       child can resolve to a DIFFERENT directory than the one the stub
+       extracted into. TMP/TEMP, by contrast, are presented by cosmo in
+       its unambiguous drive-letter form (e.g. /C/Users/x/AppData/Local/
+       Temp) that every cosmo runtime resolves identically, so prefer
+       them. On POSIX hosts they are normally unset and the usual
+       TMPDIR -> /tmp behavior is preserved. */
+    if (!tmpdir || !*tmpdir) {
+        tmpdir = getenv("TMP");
+    }
+    if (!tmpdir || !*tmpdir) {
+        tmpdir = getenv("TEMP");
+    }
+#endif
     if (!tmpdir || !*tmpdir) {
         tmpdir = "/tmp";
     }

data/src/unpack.c

@@ -540,6 +540,10 @@ bool IsRunInExeDir(OperationModes modes) {
     return IsMode(modes, RUN_IN_EXE_DIR);
 }
 
+bool IsChdirToExeDir(OperationModes modes) {
+    return IsMode(modes, CHDIR_TO_EXE_DIR);
+}
+
 bool ProcessImage(const UnpackContext *context)
 {
     if (!context) {

data/src/unpack.h

@@ -74,6 +74,15 @@ typedef enum {
      * the stub executable. Restores the pre-1.4 (OCRA) wrapper behavior.
      */
     RUN_IN_EXE_DIR      = 0x20,
+
+    /**
+     * Change the current directory to the directory containing the
+     * executable before running the script. This makes relative file
+     * access resolve next to the .exe, regardless of how it was invoked
+     * (Explorer, command prompt, file association). Opt-in via the
+     * --chdir-exe-dir build option.
+     */
+    CHDIR_TO_EXE_DIR    = 0x40,
 } OperationModes;
 
 bool IsDebugMode(OperationModes modes);
@@ -82,6 +91,7 @@ bool IsAutoCleanInstDir(OperationModes modes);
 bool IsChdirBeforeScript(OperationModes modes);
 bool IsDataCompressed(OperationModes modes);
 bool IsRunInExeDir(OperationModes modes);
+bool IsChdirToExeDir(OperationModes modes);
 
 typedef struct UnpackContext UnpackContext;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocran
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Andi Idogawa
@@ -50,6 +50,7 @@ files:
 - lib/ocran/build_facade.rb
 - lib/ocran/build_helper.rb
 - lib/ocran/command_output.rb
+- lib/ocran/cosmo_toolchain.rb
 - lib/ocran/dir_builder.rb
 - lib/ocran/direction.rb
 - lib/ocran/ed_icon.rb
@@ -64,11 +65,14 @@ files:
 - lib/ocran/library_detector_posix.rb
 - lib/ocran/option.rb
 - lib/ocran/refine_pathname.rb
+- lib/ocran/rubyopt_processor.rb
 - lib/ocran/runner.rb
 - lib/ocran/runtime_environment.rb
 - lib/ocran/stub_builder.rb
 - lib/ocran/version.rb
 - lib/ocran/windows_command_escaping.rb
+- lib/ocran/zip_payload_builder.rb
+- lib/ocran/zip_writer.rb
 - share/ocran/lzma.exe
 - src/Makefile
 - src/error.c