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

Move zlib down

Browse source
This commit is contained in:
Justine Tunney 2023-08-31 15:17:35 -07:00
parent 4021cd0c1e
commit e2b3c3618e
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -131,7 +131,6 @@ include libc/tinymath/tinymath.mk # │ You can issue raw system calls
include libc/str/str.mk # │ include libc/str/str.mk # │
include third_party/xed/xed.mk # │ include third_party/xed/xed.mk # │
include third_party/puff/puff.mk # │ include third_party/puff/puff.mk # │
include third_party/zlib/zlib.mk # │
include libc/elf/elf.mk # │ include libc/elf/elf.mk # │
include ape/ape.mk # │ include ape/ape.mk # │
include libc/fmt/fmt.mk # │ include libc/fmt/fmt.mk # │
@ -147,6 +146,7 @@ include third_party/gdtoa/gdtoa.mk # ├──DYNAMIC RUNTIME
include third_party/nsync/mem/mem.mk # │ You can now use stdio include third_party/nsync/mem/mem.mk # │ You can now use stdio
include libc/thread/thread.mk # │ You can finally call malloc() include libc/thread/thread.mk # │ You can finally call malloc()
include tool/hello/hello.mk # │ include tool/hello/hello.mk # │
include third_party/zlib/zlib.mk # │
include libc/stdio/stdio.mk # │ include libc/stdio/stdio.mk # │
include libc/time/time.mk # │ include libc/time/time.mk # │
include net/net.mk # │ include net/net.mk # │

7
test/libc/calls/mkdir_test.c
View file

@ -26,6 +26,7 @@
#include "libc/runtime/runtime.h" #include "libc/runtime/runtime.h"
#include "libc/stdio/stdio.h" #include "libc/stdio/stdio.h"
#include "libc/str/str.h" #include "libc/str/str.h"
#include "libc/sysv/consts/at.h"
#include "libc/sysv/consts/o.h" #include "libc/sysv/consts/o.h"
#include "libc/testlib/testlib.h" #include "libc/testlib/testlib.h"
#include "libc/x/x.h" #include "libc/x/x.h"
@ -77,10 +78,14 @@ TEST(mkdir, enametoolong) {
EXPECT_SYS(ENAMETOOLONG, -1, mkdir(s, 0644)); EXPECT_SYS(ENAMETOOLONG, -1, mkdir(s, 0644));
} }
TEST(makedirs, testEmptyString_ENOENT) { TEST(mkdir, testEmptyString_ENOENT) {
EXPECT_SYS(ENOENT, -1, mkdir("", 0755)); EXPECT_SYS(ENOENT, -1, mkdir("", 0755));
} }
TEST(mkdir, slashSlash) {
EXPECT_SYS(0, 0, mkdirat(AT_FDCWD, "o//", 0777));
}
TEST(mkdirat, testRelativePath_opensRelativeToDirFd) { TEST(mkdirat, testRelativePath_opensRelativeToDirFd) {
int dirfd; int dirfd;
ASSERT_SYS(0, 0, mkdir("foo", 0755)); ASSERT_SYS(0, 0, mkdir("foo", 0755));

1
third_party/zlib/zlib.mk vendored
View file

@ -19,6 +19,7 @@ THIRD_PARTY_ZLIB_A_CHECKS = \
THIRD_PARTY_ZLIB_A_DIRECTDEPS = \ THIRD_PARTY_ZLIB_A_DIRECTDEPS = \
LIBC_INTRIN \ LIBC_INTRIN \
LIBC_NEXGEN32E \ LIBC_NEXGEN32E \
LIBC_MEM \
LIBC_STR \ LIBC_STR \
LIBC_SYSV LIBC_SYSV

10
third_party/zlib/zutil.c vendored
View file

@ -313,11 +313,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
unsigned size; unsigned size;
{ {
(void)opaque; (void)opaque;
if (_weaken(malloc)) { return malloc(items * size);
return _weaken(malloc)(items * size);
} else {
return 0;
}
} }
void ZLIB_INTERNAL zcfree (opaque, ptr) void ZLIB_INTERNAL zcfree (opaque, ptr)
@ -325,9 +321,7 @@ void ZLIB_INTERNAL zcfree (opaque, ptr)
voidpf ptr; voidpf ptr;
{ {
(void)opaque; (void)opaque;
if (_weaken(free)) { free(ptr);
_weaken(free)(ptr);
}
} }
#endif /* MY_ZCALLOC */ #endif /* MY_ZCALLOC */