Make improvements

- Improved async signal safety of read() particularly for longjmp()
- Started adding cancel cleanup handlers for locks / etc on Windows
- Make /dev/tty work better particularly for uses like `foo | less`
- Eagerly read console input into a linked list, so poll can signal
- Fix some libc definitional bugs, which configure scripts detected

libc/intrin/describefdset.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 2021 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/dce.h"
+#include "libc/intrin/asan.internal.h"
+#include "libc/intrin/bsr.h"
+#include "libc/intrin/kprintf.h"
+#include "libc/sock/select.h"
+#include "libc/sock/select.internal.h"
+
+#define N 100
+
+#define append(...) o += ksnprintf(buf + o, N - o, __VA_ARGS__)
+
+const char *(DescribeFdSet)(char buf[N], ssize_t rc, int nfds, fd_set *fds) {
+  int o = 0;
+
+  if (!fds) return "NULL";
+  if ((!IsAsan() && kisdangerous(fds)) ||
+      (IsAsan() && !__asan_is_valid(fds, sizeof(*fds) * nfds))) {
+    ksnprintf(buf, N, "%p", fds);
+    return buf;
+  }
+
+  append("{");
+
+  bool gotsome = false;
+  for (int fd = 0; fd < nfds; fd += 64) {
+    uint64_t w = fds->fds_bits[fd >> 6];
+    while (w) {
+      unsigned o = _bsr(w);
+      w &= ~((uint64_t)1 << o);
+      if (fd + o < nfds) {
+        if (!gotsome) {
+          gotsome = true;
+          append(", ");
+          append("%d", fd);
+        }
+      }
+    }
+  }
+
+  append("}");
+
+  return buf;
+}

libc/intrin/g_fds.c

@@ -19,6 +19,7 @@
 #include "libc/calls/state.internal.h"
 #include "libc/calls/struct/fd.internal.h"
 #include "libc/calls/ttydefaults.h"
+#include "libc/dce.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/extend.internal.h"
 #include "libc/intrin/getenv.internal.h"
@@ -26,6 +27,12 @@
 #include "libc/intrin/nomultics.internal.h"
 #include "libc/intrin/pushpop.internal.h"
 #include "libc/intrin/weaken.h"
+#include "libc/nt/console.h"
+#include "libc/nt/createfile.h"
+#include "libc/nt/enum/accessmask.h"
+#include "libc/nt/enum/creationdisposition.h"
+#include "libc/nt/enum/fileflagandattributes.h"
+#include "libc/nt/enum/filesharemode.h"
 #include "libc/nt/runtime.h"
 #include "libc/runtime/memtrack.internal.h"
 #include "libc/runtime/runtime.h"
@@ -116,10 +123,10 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
     SetupWinStd(fds, 0, kNtStdInputHandle, sockset);
     SetupWinStd(fds, 1, kNtStdOutputHandle, sockset);
     SetupWinStd(fds, 2, kNtStdErrorHandle, sockset);
+    __veof = CTRL('D');
+    __vintr = CTRL('C');
+    __vquit = CTRL('\\');
   }
   fds->p[1].flags = O_WRONLY | O_APPEND;
   fds->p[2].flags = O_WRONLY | O_APPEND;
-  __veof = CTRL('D');
-  __vintr = CTRL('C');
-  __vquit = CTRL('\\');
 }

libc/intrin/nomultics.c

@@ -25,3 +25,4 @@ unsigned char __veof;
 unsigned char __vintr;
 unsigned char __vquit;
 unsigned char __vtime;
+unsigned char __mousebuttons;

libc/intrin/nomultics.internal.h

@@ -11,6 +11,7 @@ extern unsigned char __veof;
 extern unsigned char __vintr;
 extern unsigned char __vquit;
 extern unsigned char __vtime;
+extern unsigned char __mousebuttons;
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

libc/intrin/putenv.c

@@ -1,111 +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/intrin/getenv.internal.h"
-#include "libc/intrin/leaky.internal.h"
-#include "libc/intrin/strace.internal.h"
-#include "libc/intrin/weaken.h"
-#include "libc/macros.internal.h"
-#include "libc/mem/internal.h"
-#include "libc/mem/mem.h"
-#include "libc/runtime/runtime.h"
-#include "libc/sysv/errfuns.h"
-
-#define ToUpper(c) ((c) >= 'a' && (c) <= 'z' ? (c) - 'a' + 'A' : (c))
-
-static char **expected;
-static size_t capacity;
-
-static size_t GetEnvironLen(char **env) {
-  char **p = env;
-  while (*p) ++p;
-  return p - env;
-}
-
-static char **GrowEnviron(char **a) {
-  size_t n, c;
-  char **b, **p;
-  if (!a) a = environ;
-  n = a ? GetEnvironLen(a) : 0;
-  c = MAX(16ul, n) << 1;
-  if (_weaken(malloc) && (b = _weaken(malloc)(c * sizeof(char *)))) {
-    if (a) {
-      for (p = b; *a;) {
-        *p++ = *a++;
-      }
-    } else {
-      b[0] = 0;
-    }
-    environ = b;
-    expected = b;
-    capacity = c;
-    return b;
-  } else {
-    enomem();
-    return 0;
-  }
-}
-
-IGNORE_LEAKS(GrowEnviron)
-
-int PutEnvImpl(char *s, bool overwrite) {
-  char **p;
-  struct Env e;
-  if (!(p = environ)) {
-    if (!(p = GrowEnviron(0))) {
-      return -1;
-    }
-  }
-  e = __getenv(p, s);
-  if (e.s && !overwrite) {
-    return 0;
-  }
-  if (e.s) {
-    p[e.i] = s;
-    return 0;
-  }
-  if (p != expected) {
-    capacity = e.i;
-  }
-  if (e.i + 1 >= capacity) {
-    if (!(p = GrowEnviron(p))) {
-      return -1;
-    }
-  }
-  p[e.i + 1] = 0;
-  p[e.i] = s;
-  return 0;
-}
-
-/**
- * Emplaces environment key=value.
- *
- * @param s should be a string that looks like `"name=value"` and it'll
- *     become part of the environment; changes to its memory will change
- *     the environment too
- * @return 0 on success, or non-zero w/ errno on error
- * @raise ENOMEM if we require more vespene gas
- * @see setenv(), getenv()
- * @threadunsafe
- */
-int putenv(char *s) {
-  int rc;
-  rc = PutEnvImpl(s, true);
-  STRACE("putenv(%#s) → %d% m", s, rc);
-  return rc;
-}

libc/intrin/strace.internal.h

@@ -16,13 +16,12 @@
 COSMOPOLITAN_C_START_
 
 #ifdef SYSDEBUG
-#define STRACE(FMT, ...)                                   \
-  do {                                                     \
-    if (UNLIKELY(__strace > 0) && strace_enabled(0) > 0) { \
-      ftrace_enabled(-1);                                  \
-      __stracef(STRACE_PROLOGUE FMT "\n", ##__VA_ARGS__);  \
-      ftrace_enabled(+1);                                  \
-    }                                                      \
+#define STRACE(FMT, ...)                                  \
+  do {                                                    \
+    if (UNLIKELY(strace_enter())) {                       \
+      __stracef(STRACE_PROLOGUE FMT "\n", ##__VA_ARGS__); \
+      ftrace_enabled(+1);                                 \
+    }                                                     \
   } while (0)
 #else
 #define STRACE(FMT, ...) (void)0

libc/intrin/strace_enter.c

@@ -1,7 +1,7 @@
 /*-*- 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                              │
+│ 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         │
@@ -16,42 +16,16 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/leaky.internal.h"
-#include "libc/intrin/strace.internal.h"
-#include "libc/intrin/weaken.h"
-#include "libc/mem/internal.h"
-#include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
-#include "libc/str/str.h"
-#include "libc/sysv/errfuns.h"
+#ifdef SYSDEBUG
 
-/**
- * Copies variable to environment.
- *
- * @return 0 on success, or -1 w/ errno and environment is unchanged
- * @raise ENOMEM if out of memory or malloc() wasn't linked
- * @raise EINVAL if `name` is empty or contains `'='`
- * @see putenv(), getenv()
- * @threadunsafe
- */
-int setenv(const char *name, const char *value, int overwrite) {
-  int rc;
-  char *s;
-  size_t n, m;
-  const char *t;
-  if (!name || !*name || !value) return einval();
-  for (t = name; *t; ++t) {
-    if (*t == '=') return einval();
+dontinstrument bool strace_enter(void) {
+  if (strace_enabled(0) > 0) {
+    ftrace_enabled(-1);
+    return true;
+  } else {
+    return false;
   }
-  n = strlen(name);
-  m = strlen(value);
-  if (!_weaken(malloc) || !(s = _weaken(malloc)(n + 1 + m + 1))) {
-    return enomem();
-  }
-  memcpy(mempcpy(mempcpy(s, name, n), "=", 1), value, m + 1);
-  rc = PutEnvImpl(s, overwrite);
-  STRACE("setenv(%#s, %#s, %d) → %d% m", name, value, overwrite, rc);
-  return rc;
 }
 
-IGNORE_LEAKS(setenv)
+#endif /* SYSDEBUG */