Make improvements

- Introduce path module to redbean
- Fix glitch with linenoise printing extra line on eof
- Introduce closefrom() and close_range() system calls
- Make file descriptor closing more secure in pledge.com

test/libc/calls/closefrom_test.c

@@ -0,0 +1,61 @@
+/*-*- 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 2022 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/dce.h"
+#include "libc/errno.h"
+#include "libc/runtime/runtime.h"
+#include "libc/sysv/consts/f.h"
+#include "libc/testlib/testlib.h"
+
+void SetUp(void) {
+  if (closefrom(3) == -1) {
+    if (IsOpenbsd()) {
+      ASSERT_EQ(EBADF, errno);
+    } else {
+      ASSERT_EQ(ENOSYS, errno);
+      exit(0);
+    }
+  }
+}
+
+TEST(closefrom, test) {
+  ASSERT_SYS(0, 3, dup(2));
+  ASSERT_SYS(0, 4, dup(2));
+  ASSERT_SYS(0, 5, dup(2));
+  ASSERT_SYS(0, 6, dup(2));
+  EXPECT_SYS(0, 0, closefrom(3));
+  ASSERT_SYS(0, 0, fcntl(2, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(3, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(4, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(5, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(6, F_GETFD));
+}
+
+TEST(close_range, test) {
+  ASSERT_SYS(0, 3, dup(2));
+  ASSERT_SYS(0, 4, dup(2));
+  ASSERT_SYS(0, 5, dup(2));
+  ASSERT_SYS(0, 6, dup(2));
+  EXPECT_SYS(0, 0, close_range(3, -1, 0));
+  ASSERT_SYS(0, 0, fcntl(2, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(3, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(4, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(5, F_GETFD));
+  ASSERT_SYS(EBADF, -1, fcntl(6, F_GETFD));
+}

test/libc/fmt/joinpaths_test.c

@@ -16,23 +16,37 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/mem/mem.h"
 #include "libc/str/path.h"
+#include "libc/testlib/ezbench.h"
 #include "libc/testlib/testlib.h"
+#include "libc/x/x.h"
+
+char b[PATH_MAX];
 
 TEST(xjoinpaths, test) {
-  char b[PATH_MAX];
   EXPECT_EQ(NULL, _joinpaths(b, sizeof(b), 0, 0));
   EXPECT_STREQ("x", _joinpaths(b, sizeof(b), "x", 0));
   EXPECT_STREQ("x", _joinpaths(b, sizeof(b), 0, "x"));
   EXPECT_STREQ("", _joinpaths(b, sizeof(b), "", ""));
+  EXPECT_STREQ("", _joinpaths(b, sizeof(b), "", 0));
+  EXPECT_STREQ("", _joinpaths(b, sizeof(b), 0, ""));
+  EXPECT_STREQ("", _joinpaths(b, sizeof(b), "", ""));
   EXPECT_STREQ("b", _joinpaths(b, sizeof(b), "", "b"));
+  EXPECT_STREQ("a/", _joinpaths(b, sizeof(b), "a", ""));
   EXPECT_STREQ("a/b", _joinpaths(b, sizeof(b), "a", "b"));
   EXPECT_STREQ("a/b", _joinpaths(b, sizeof(b), "a/", "b"));
   EXPECT_STREQ("a/b/", _joinpaths(b, sizeof(b), "a", "b/"));
   EXPECT_STREQ("/b", _joinpaths(b, sizeof(b), "a", "/b"));
-  EXPECT_STREQ("b", _joinpaths(b, sizeof(b), ".", "b"));
+  EXPECT_STREQ("./b", _joinpaths(b, sizeof(b), ".", "b"));
+  EXPECT_STREQ("b/.", _joinpaths(b, sizeof(b), "b", "."));
   EXPECT_EQ(NULL, _joinpaths(b, 3, "a", "b/"));
   EXPECT_EQ(NULL, _joinpaths(b, 4, "a", "b/"));
   EXPECT_STREQ("a/b", _joinpaths(b, 4, "a/", "b"));
   EXPECT_STREQ("a/b/", _joinpaths(b, 5, "a", "b/"));
 }
+
+BENCH(joinpaths, bench) {
+  EZBENCH2("_joinpaths", donothing, _joinpaths(b, sizeof(b), "care", "bear"));
+  EZBENCH2("xjoinpaths", donothing, free(xjoinpaths("care", "bear")));
+}

test/libc/mem/unveil_test.c

@@ -182,6 +182,18 @@ TEST(unveil, dirfdHacking_doesntWork) {
   EXITS(0);
 }
 
+TEST(unveil, mostRestrictivePolicy) {
+  if (IsOpenbsd()) return;  // openbsd behaves oddly; see docs
+  SPAWN();
+  ASSERT_SYS(0, 0, mkdir("jail", 0755));
+  ASSERT_SYS(0, 0, mkdir("garden", 0755));
+  ASSERT_SYS(0, 0, touch("garden/secret.txt", 0644));
+  ASSERT_SYS(0, 0, unveil(0, 0));
+  ASSERT_SYS(EACCES_OR_ENOENT, -1, open("jail", O_RDONLY | O_DIRECTORY));
+  ASSERT_SYS(EACCES_OR_ENOENT, -1, open("garden/secret.txt", O_RDONLY));
+  EXITS(0);
+}
+
 TEST(unveil, overlappingDirectories_inconsistentBehavior) {
   SPAWN();
   ASSERT_SYS(0, 0, makedirs("f1/f2", 0755));

test/libc/runtime/tls_test.c

@@ -0,0 +1,28 @@
+/*-*- 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 2022 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/runtime/runtime.h"
+#include "libc/testlib/testlib.h"
+
+_Thread_local int x;
+_Thread_local int y = 40;
+int z = 2;
+
+TEST(tls, test) {
+  EXPECT_EQ(42, x + y + z);
+}

test/tool/net/path_test.lua

@@ -0,0 +1,77 @@
+-- Copyright 2022 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.
+
+assert("/usr/lib" == path.dirname("/usr/lib/foo.bar"))
+assert("/usr" == path.dirname("/usr/lib"))
+assert("usr" == path.dirname("usr/lib"))
+assert("/" == path.dirname("/usr//"))
+assert("/" == path.dirname("/usr/"))
+assert("." == path.dirname("usr"))
+assert("/" == path.dirname("/"))
+assert("." == path.dirname("."))
+assert("." == path.dirname(".."))
+assert("." == path.dirname(""))
+assert("." == path.dirname(nil))
+
+--------------------------------------------------------------------------------
+
+assert("lib" == path.basename("/usr/lib"))
+assert("lib" == path.basename("usr/lib"))
+assert("usr" == path.basename("/usr/"))
+assert("usr" == path.basename("/usr"))
+assert("/" == path.basename("/"))
+assert("." == path.basename("."))
+assert(".." == path.basename(".."))
+assert("." == path.basename(""))
+assert("foo" == path.basename("foo/"))
+assert("foo" == path.basename("foo//"))
+assert("/" == path.basename("///"))
+assert("0" == path.basename(0))
+assert("." == path.basename(nil))
+
+--------------------------------------------------------------------------------
+
+assert("a" == path.join("a"))
+assert("a/b/c" == path.join("a", "b", "c"))
+assert("/c" == path.join("a", "b", "/c"))
+assert("/b/c" == path.join("a", "/b", "c"))
+assert("/c" == path.join("a", "/b", "/c"))
+assert("./." == path.join(".", "."))
+assert("./.." == path.join(".", ".."))
+assert("../." == path.join("..", "."))
+assert("./a" == path.join(".", "a"))
+assert("c//c" == path.join("c//", "c"))
+assert("a/." == path.join("a", "."))
+assert("a/b" == path.join("a", "b"))
+assert("a/b" == path.join("a/", "b"))
+assert("a/b/" == path.join("a", "b/"))
+assert("/b" == path.join("a", "/b"))
+assert("./b" == path.join(".", "b"))
+assert("a" * 3000 .."/123/".. "b" * 3000 .. "/123" == path.join("a" * 3000, 123, "b" * 3000, 123))
+assert("1/2/3" == path.join(1, 2, 3))
+assert(nil == path.join(nil))
+assert(nil == path.join(nil, nil))
+assert("a" == path.join("a", nil))
+assert("a" == path.join(nil, "a"))
+assert("a/a" == path.join("a", nil, "a"))
+assert("a/a" == path.join("a/", nil, "a"))
+assert("" == path.join(""))
+assert("" == path.join("", ""))
+assert("b" == path.join("", "b"))
+assert("a" == path.join("", "a"))
+assert("a/" == path.join("a", ""))
+assert("a/b" == path.join("a", "", "b"))
+assert("a/b" == path.join("a", "", "", "b"))
+assert("a/b/" == path.join("a", "", "", "b", ""))