get zipos execve working again

jart · Jan 19, 2024 · a319f34 · a319f34
1 parent f53a1f4
commit a319f34
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/libc/proc/execve.c b/libc/proc/execve.c
@@ -76,7 +76,7 @@ int execve(const char *prog, char *const argv[], char *const envp[]) {
       rc = _weaken(sys_pledge_linux)(__execpromises, __pledge_mode);
     }
     if (!rc) {
-      if (0 && _weaken(__zipos_parseuri) &&
+      if (_weaken(__zipos_parseuri) &&
           (_weaken(__zipos_parseuri)(prog, &uri) != -1)) {
         rc = _weaken(__zipos_open)(&uri, O_RDONLY | O_CLOEXEC);
         if (rc != -1) {

diff --git a/test/libc/proc/execve_test.c b/test/libc/proc/execve_test.c
@@ -103,7 +103,6 @@ TEST(execve, elfIsUnreadable_mayBeExecuted) {
   ASSERT_STREQ("hi\n", buf);
 }
 
-/*
 TEST(execve, ziposELF) {
   if (IsFreebsd()) return;                        // TODO: fixme on freebsd
   if (IsLinux() && !__is_linux_2_6_23()) return;  // TODO: fixme on old linux
@@ -118,9 +117,7 @@ TEST(execve, ziposELF) {
   kprintf("execve failed: %m\n");
   EXITS(42);
 }
-*/
 
-/*
 TEST(execve, ziposAPE) {
   if (IsFreebsd()) return;                        // TODO: fixme on freebsd
   if (IsLinux() && !__is_linux_2_6_23()) return;  // TODO: fixme on old linux
@@ -135,7 +132,6 @@ TEST(execve, ziposAPE) {
   kprintf("execve failed: %m\n");
   EXITS(42);
 }
-*/
 
 // clang-format off
 #define TINY_ELF_PROGRAM "\