summaryrefslogtreecommitdiffstats
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/Makefile6
-rw-r--r--stdlib/header.c106
-rw-r--r--stdlib/headernt.c64
3 files changed, 162 insertions, 14 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 39b27a4fa..0deb58b8f 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -34,10 +34,10 @@ stdlib.cma: $(OBJS)
stdlib.cmxa: $(OBJS:.cmo=.cmx)
$(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx)
-camlheader: header.c ../config/Makefile
+camlheader: sharpbang header.c ../config/Makefile
if $(SHARPBANGSCRIPTS); \
- then echo "#!$(BINDIR)/ocamlrun" > camlheader; \
- else $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) '-DRUNTIME_NAME="$(BINDIR)/ocamlrun"' header.c -o camlheader; \
+ then cp sharpbang camlheader; \
+ else $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) header.c -o camlheader; \
strip camlheader; \
fi
diff --git a/stdlib/header.c b/stdlib/header.c
index 6e86ab551..6166aa965 100644
--- a/stdlib/header.c
+++ b/stdlib/header.c
@@ -4,19 +4,115 @@
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
+/* Copyright 1998 Institut National de Recherche en Informatique et */
/* Automatique. Distributed only by permission. */
/* */
/***********************************************************************/
/* $Id$ */
-char runtime_name [] = RUNTIME_NAME;
-char errmsg [] = "Cannot exec ocamlrun.\n";
+/* The launcher for bytecode executables (if #! is not working) */
+
+#include <stdlib.h>
+#include <string.h>
+#include "../config/s.h"
+#ifdef HAS_UNISTD
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "../byterun/exec.h"
+
+#define MAXPATHLEN 1024
+
+#ifndef S_ISREG
+#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
+
+static char * searchpath(char * name)
+{
+ static char fullname[MAXPATHLEN + 1];
+ char * path;
+ char * p;
+ char * q;
+ struct stat st;
+
+ for (p = name; *p != 0; p++) {
+ if (*p == '/') return name;
+ }
+ path = getenv("PATH");
+ if (path == NULL) return name;
+ while(1) {
+ for (p = fullname; *path != 0 && *path != ':'; p++, path++)
+ if (p < fullname + MAXPATHLEN) *p = *path;
+ if (p != fullname && p < fullname + MAXPATHLEN)
+ *p++ = '/';
+ for (q = name; *q != 0; p++, q++)
+ if (p < fullname + MAXPATHLEN) *p = *q;
+ *p = 0;
+ if (stat(fullname, &st) == 0 && S_ISREG(st.st_mode)) break;
+ if (*path == 0) return name;
+ path++;
+ }
+ return fullname;
+}
+
+static unsigned long read_size(char * ptr)
+{
+ unsigned char * p = (unsigned char *) ptr;
+ return ((unsigned long) p[0] << 24) + ((unsigned long) p[1] << 16) +
+ ((unsigned long) p[2] << 8) + p[3];
+}
+
+static int read_runtime_path(int fd, char *runtime_path)
+{
+ char buffer[TRAILER_SIZE];
+ unsigned path_size, code_size, prim_size, data_size;
+ unsigned symbol_size, debug_size, size;
+
+ lseek(fd, (long) -TRAILER_SIZE, SEEK_END);
+ if (read(fd, buffer, TRAILER_SIZE) < TRAILER_SIZE) return -1;
+ path_size = read_size(buffer);
+ code_size = read_size(buffer + 4);
+ prim_size = read_size(buffer + 8);
+ data_size = read_size(buffer + 12);
+ symbol_size = read_size(buffer + 16);
+ debug_size = read_size(buffer + 20);
+ if (path_size > MAXPATHLEN) return -1;
+ size = path_size + code_size + prim_size +
+ data_size + symbol_size + debug_size + TRAILER_SIZE;
+ lseek(fd, -size, SEEK_END);
+ if (read(fd, runtime_path, path_size) != path_size) return -1;
+ runtime_path[path_size - 1] = 0;
+ return 0;
+}
+
+static void errwrite(char * msg)
+{
+ write(2, msg, strlen(msg));
+}
int main(int argc, char ** argv)
{
- execv(runtime_name, argv);
- write(2, errmsg, sizeof(errmsg)-1);
+ char * truename;
+ int fd;
+ char runtime_path[MAXPATHLEN];
+
+ truename = searchpath(argv[0]);
+ fd = open(truename, O_RDONLY);
+ if (fd == -1 || read_runtime_path(fd, runtime_path) == -1) {
+ errwrite(truename);
+ errwrite(" not found or is not a bytecode executable file\n");
+ return 2;
+ }
+ execv(runtime_path, argv);
+ errwrite("Cannot exec ");
+ errwrite(runtime_path);
+ errwrite("\n");
return 2;
}
diff --git a/stdlib/headernt.c b/stdlib/headernt.c
index a0c2d6454..c8529281b 100644
--- a/stdlib/headernt.c
+++ b/stdlib/headernt.c
@@ -4,30 +4,81 @@
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
+/* Copyright 1998 Institut National de Recherche en Informatique et */
/* Automatique. Distributed only by permission. */
/* */
/***********************************************************************/
/* $Id$ */
+#include <string.h>
#include <wtypes.h>
#include <winbase.h>
#include <process.h>
+#include "../byterun/exec.h"
-char * runtime_name = "ocamlrun.exe";
-char * errmsg = "Cannot find ocamlrun.exe\n";
+#define MAXPATHLEN 1024 /*check*/
+
+static unsigned long read_size(char * ptr)
+{
+ unsigned char * p = (unsigned char *) ptr;
+ return ((unsigned long) p[0] << 24) + ((unsigned long) p[1] << 16) +
+ ((unsigned long) p[2] << 8) + p[3];
+}
+
+static int read_runtime_path(HANDLE h, char *runtime_path)
+{
+ char buffer[TRAILER_SIZE];
+ DWORD nread;
+ struct exec_trailer tr;
+ long size;
+
+ if (SetFilePointer(h, -TRAILER_SIZE, NULL, FILE_END) == -1) return -1;
+ if (! ReadFile(h, buffer, TRAILER_SIZE, nread, NULL)) return -1;
+ if (nread != TRAILER_SIZE) return -1;
+ tr.path_size = read_size(buffer);
+ tr.code_size = read_size(buffer + 4);
+ tr.prim_size = read_size(buffer + 8);
+ tr.data_size = read_size(buffer + 12);
+ tr.symbol_size = read_size(buffer + 16);
+ tr.debug_size = read_size(buffer + 20);
+ if (tr.path_size > sizeof(runtime_path)) return -1;
+ size = tr.path_size + tr.code_size + tr.prim_size +
+ tr.data_size + tr.symbol_size + tr.debug_size + TRAILER_SIZE;
+ if (SetFilePointer(h, -size, FILE_END) == -1) return -1;
+ if (! ReadFile(h, runtime_path, tr.path_size, &nread, NULL)) return -1;
+ if (nread != tr.path_size) return -1;
+ runtime_path[tr.path_size - 1] = 0;
+ return 0;
+}
+
+static void errwrite(char * msg)
+{
+ DWORD numwritten;
+ WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, strlen(msg),
+ &numwritten, NULL);
+}
int main(int argc, char ** argv)
{
- int retcode;
+ char * truename = GetModuleFileName();
char * cmdline = GetCommandLine();
- retcode = spawnlp(P_WAIT, runtime_name, cmdline, NULL);
+ char runtime_path[MAXPATHLEN];
+
+ h = CreateFile(truename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
+ if (h == INVALID_HANDLE_VALUE || read_runtime_path(h, runtime_path) == -1) {
+ errwrite(truename);
+ errwrite(" not found or is not a bytecode executable file\r\n");
+ return 2;
+ }
+ retcode = spawnlp(P_WAIT, runtime_path, cmdline, NULL);
/* We use P_WAIT instead of P_OVERLAY here because under NT,
P_OVERLAY returns to the command interpreter, displaying the prompt
before executing the command. */
if (retcode == -1) {
- write(2, errmsg, strlen(errmsg));
+ errwrite("Cannot exec ");
+ errwrite(runtime_path);
+ errwrite("\r\n");
return 2;
}
return retcode;
@@ -37,3 +88,4 @@ int main(int argc, char ** argv)
performs command-line processing (we don't need it) */
static void _setargv() { }
+
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-22 22:44:35 +0000