mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 22:02:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make ZipOS and Qemu work better

Browse source 
This change improves the dirstream library in a lot of respects,
especially for /zip/... files. Also turn off MAP_STACK on Aarch64
because Qemu seems to implement it differently than Linux and it's
probably responsible for a lot of mysterious crashes.
This commit is contained in:
Justine Tunney 2023-08-15 18:24:53 -07:00
parent 4658ae539f
commit 110559ce6a
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
48 changed files with 748 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

69
test/libc/stdio/zipdir_test.c Normal file
View file

@ -0,0 +1,69 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2023 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/struct/dirent.h"
#include "libc/mem/gc.internal.h"
#include "libc/runtime/runtime.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/dt.h"
#include "libc/testlib/testlib.h"
__static_yoink("zipos");
__static_yoink("libc/testlib/hyperion.txt");
__static_yoink("libc/testlib/moby.txt");
__static_yoink("usr/share/zoneinfo/New_York");
DIR *dir;
struct dirent *ent;
TEST(zipdir, test) {
const char *path = "/zip/libc/testlib///";
ASSERT_NE(NULL, (dir = opendir(path)));
ASSERT_EQ(0, telldir(dir));
ASSERT_NE(NULL, (ent = readdir(dir)));
ASSERT_EQ(0, strcmp(ent->d_name, "."));
ASSERT_EQ(DT_DIR, ent->d_type);
ASSERT_NE(NULL, (ent = readdir(dir)));
ASSERT_EQ(0, strcmp(ent->d_name, ".."));
ASSERT_EQ(DT_DIR, ent->d_type);
ASSERT_NE(NULL, (ent = readdir(dir)));
ASSERT_EQ(0, strcmp(ent->d_name, "hyperion.txt"));
ASSERT_EQ(DT_REG, ent->d_type);
long pos = telldir(dir);
ASSERT_NE(NULL, (ent = readdir(dir)));
ASSERT_EQ(0, strcmp(ent->d_name, "moby.txt"));
ASSERT_EQ(DT_REG, ent->d_type);
ASSERT_EQ(NULL, (ent = readdir(dir)));
seekdir(dir, pos);
ASSERT_NE(NULL, (ent = readdir(dir)));
ASSERT_EQ(0, strcmp(ent->d_name, "moby.txt"));
ASSERT_EQ(DT_REG, ent->d_type);
ASSERT_EQ(NULL, (ent = readdir(dir)));
ASSERT_SYS(0, 0, closedir(dir));
}
TEST(dirstream, hasDirectoryEntry) {
bool gotsome = false;
const char *path = "/zip/usr/share/zoneinfo";
ASSERT_NE(NULL, (dir = opendir(path)));
while ((ent = readdir(dir))) {
gotsome = true;
}
ASSERT_SYS(0, 0, closedir(dir));
EXPECT_TRUE(gotsome);
}