Delete LIBC_CALLS_HEFTY

- fork() no longer requires malloc()
- readdir() moved to LIBC_STDIO
- Custom APIs moved to LIBC_X

test/libc/calls/hefty/dirstream_test.c

@@ -1,53 +0,0 @@
-/*-*- 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 2020 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/calls.h"
-#include "libc/calls/struct/dirent.h"
-#include "libc/rand/rand.h"
-#include "libc/runtime/gc.h"
-#include "libc/runtime/runtime.h"
-#include "libc/str/str.h"
-#include "libc/testlib/testlib.h"
-#include "libc/x/x.h"
-
-TEST(dirstream, test) {
-  DIR *dir;
-  struct dirent *ent;
-  char *dpath, *file1, *file2;
-  dpath = gc(xasprintf("%s%s%lu", kTmpPath, "dirstream", rand32()));
-  file1 = gc(xasprintf("%s/%s", dpath, "foo"));
-  file2 = gc(xasprintf("%s/%s", dpath, "bar"));
-  EXPECT_NE(-1, mkdir(dpath, 0755));
-  EXPECT_NE(-1, touch(file1, 0644));
-  EXPECT_NE(-1, touch(file2, 0644));
-
-  EXPECT_TRUE(NULL != (dir = opendir(dpath)));
-  bool hasfoo = false;
-  bool hasbar = false;
-  while ((ent = readdir(dir))) {
-    if (strcmp(ent->d_name, "foo")) hasfoo = true;
-    if (strcmp(ent->d_name, "bar")) hasbar = true;
-  }
-  EXPECT_TRUE(hasfoo);
-  EXPECT_TRUE(hasbar);
-  EXPECT_NE(-1, closedir(dir));
-
-  EXPECT_NE(-1, unlink(file2));
-  EXPECT_NE(-1, unlink(file1));
-  EXPECT_NE(-1, rmdir(dpath));
-}

test/libc/calls/mkntenvblock_test.c

@@ -24,13 +24,13 @@ char16_t envvars[ARG_MAX];
 
 TEST(mkntenvblock, emptyList_onlyOutputsDoubleNulStringTerminator) {
   char *envp[] = {NULL};
-  ASSERT_NE(-1, mkntenvblock(envvars, envp));
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, NULL));
   ASSERT_BINEQ(u"  ", envvars);
 }
 
 TEST(mkntenvblock, envp_becomesSortedDoubleNulTerminatedUtf16String) {
   char *envp[] = {"u=b", "c=d", "韩=非", "uh=d", "hduc=d", NULL};
-  ASSERT_NE(-1, mkntenvblock(envvars, envp));
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, NULL));
   ASSERT_BINEQ(u"c = d   "
                u"h d u c = d   "
                u"u = b   "
@@ -39,3 +39,16 @@ TEST(mkntenvblock, envp_becomesSortedDoubleNulTerminatedUtf16String) {
                u"  ",
                envvars);
 }
+
+TEST(mkntenvblock, extraVar_getsAdded) {
+  char *envp[] = {"u=b", "c=d", "韩=非", "uh=d", "hduc=d", NULL};
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, "a=a"));
+  ASSERT_BINEQ(u"a = a   "
+               u"c = d   "
+               u"h d u c = d   "
+               u"u = b   "
+               u"u h = d   "
+               u"Θù= ^ù  "
+               u"  ",
+               envvars);
+}

test/libc/calls/test.mk

@@ -4,8 +4,7 @@
 PKGS += TEST_LIBC_CALLS
 
 TEST_LIBC_CALLS_SRCS :=					\
-	$(wildcard test/libc/calls/*.c)			\
-	$(wildcard test/libc/calls/hefty/*.c)
+	$(wildcard test/libc/calls/*.c)
 TEST_LIBC_CALLS_SRCS_TEST = $(filter %_test.c,$(TEST_LIBC_CALLS_SRCS))
 
 TEST_LIBC_CALLS_OBJS =					\
@@ -26,13 +25,13 @@ TEST_LIBC_CALLS_CHECKS =				\
 
 TEST_LIBC_CALLS_DIRECTDEPS =				\
 	LIBC_CALLS					\
-	LIBC_CALLS_HEFTY				\
 	LIBC_FMT					\
 	LIBC_INTRIN					\
 	LIBC_LOG					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
 	LIBC_RAND					\
+	LIBC_STDIO					\
 	LIBC_RUNTIME					\
 	LIBC_STR					\
 	LIBC_STUBS					\