Merge branch 'master' into loadergolf

ape/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # OVERVIEW
 #

ape/aarch64.lds

@@ -1,5 +1,5 @@
 /*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set noet sts=2 sw=2 fenc=utf-8                                       :vi │
+│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/thread/tls.h"
 

ape/ape-m1.c

@@ -316,21 +316,12 @@ __attribute__((__noreturn__)) static void Pexit(const char *c, int failed,
 }
 
 static char AccessCommand(struct PathSearcher *ps, unsigned long pathlen) {
-  char buf[PATH_MAX];
-  size_t n;
   if (pathlen + 1 + ps->namelen + 1 > sizeof(ps->path)) {
     return 0;
   }
   if (pathlen && ps->path[pathlen - 1] != '/') ps->path[pathlen++] = '/';
   memmove(ps->path + pathlen, ps->name, ps->namelen);
   ps->path[pathlen + ps->namelen] = 0;
-  if (!realpath(ps->path, buf)) {
-    Pexit(ps->path, -errno, "realpath");
-  }
-  if ((n = strlen(buf)) >= sizeof(ps->path)) {
-    Pexit(buf, 0, "too long");
-  }
-  memcpy(ps->path, buf, n + 1);
   if (!access(ps->path, X_OK)) {
     if (ps->indirect) {
       ps->namelen -= 4;

ape/ape.lds

@@ -1,5 +1,5 @@
 /*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set noet sts=2 sw=2 fenc=utf-8                                       :vi │
+│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

ape/loader.c

@@ -545,40 +545,6 @@ __attribute__((__noreturn__)) static void Pexit(int os, const char *c, int rc,
   Exit(127, os);
 }
 
-#define PSFD "/proc/self/fd/"
-
-static int RealPath(int os, int fd, char *path, char **resolved) {
-  char buf[PATH_MAX];
-  int rc;
-  if (IsLinux()) {
-    char psfd[sizeof(PSFD) + 19];
-    MemMove(psfd, PSFD, sizeof(PSFD) - 1);
-    Utoa(psfd + sizeof(PSFD) - 1, fd);
-    rc = SystemCall(-100, (long)psfd, (long)buf, PATH_MAX, 0, 0, 0,
-                    IsAarch64() ? 78 : 267);
-    if (rc >= 0) {
-      if (rc == PATH_MAX) {
-        rc = -36;
-      } else {
-        buf[rc] = 0;
-      }
-    }
-  } else if (IsXnu()) {
-    rc = SystemCall(fd, 50, (long)buf, 0, 0, 0, 0, 92 | 0x2000000);
-  } else if (IsOpenbsd()) {
-    rc = SystemCall((long)path, (long)buf, 0, 0, 0, 0, 0, 115);
-  } else {
-    *resolved = 0;
-    return 0;
-  }
-  if (rc >= 0) {
-    MemMove(path, buf, StrLen(buf) + 1);
-    *resolved = path;
-    rc = 0;
-  }
-  return rc;
-}
-
 static char AccessCommand(struct PathSearcher *ps, unsigned long pathlen) {
   if (pathlen + 1 + ps->namelen + 1 > sizeof(ps->path)) return 0;
   if (pathlen && ps->path[pathlen - 1] != '/') ps->path[pathlen++] = '/';
@@ -644,9 +610,8 @@ static char *Commandv(struct PathSearcher *ps, int os, const char *name,
   }
 }
 
-__attribute__((__noreturn__)) static void Spawn(int os, const char *exe,
+__attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
-                                                char *path, int fd, long *sp,
+                                                long *sp, unsigned long pagesz,
-                                                unsigned long pagesz,
                                                 struct ElfEhdr *e,
                                                 struct ElfPhdr *p) {
   long rc;
@@ -803,12 +768,12 @@ __attribute__((__noreturn__)) static void Spawn(int os, const char *exe,
   Msyscall(dynbase + code, codesize, os);
 
   /* call program entrypoint */
-  Launch(IsFreebsd() ? sp : 0, dynbase + e->e_entry, path, sp, os);
+  Launch(IsFreebsd() ? sp : 0, dynbase + e->e_entry, exe, sp, os);
 }
 
 static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
-                          const char *exe, char *path, int fd, long *sp,
+                          char *exe, int fd, long *sp, long *auxv,
-                          long *auxv, unsigned long pagesz, int os) {
+                          unsigned long pagesz, int os) {
   long i, rc;
   unsigned size;
   struct ElfEhdr *e;
@@ -923,7 +888,7 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
   }
 
   /* we're now ready to load */
-  Spawn(os, exe, path, fd, sp, pagesz, e, p);
+  Spawn(os, exe, fd, sp, pagesz, e, p);
 }
 
 __attribute__((__noreturn__)) static void ShowUsage(int os, int fd, int rc) {
@@ -1066,8 +1031,6 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
     Pexit(os, prog, 0, "not found (maybe chmod +x or ./ needed)");
   } else if ((fd = Open(exe, O_RDONLY, 0, os)) < 0) {
     Pexit(os, exe, fd, "open");
-  } else if ((rc = RealPath(os, fd, exe, &prog)) < 0) {
-    Pexit(os, exe, rc, "realpath");
   } else if ((rc = Pread(fd, ebuf->buf, sizeof(ebuf->buf), 0, os)) < 0) {
     Pexit(os, exe, rc, "read");
   } else if ((unsigned long)rc < sizeof(ebuf->ehdr)) {
@@ -1107,9 +1070,9 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
         }
       }
       if (i >= sizeof(ebuf->ehdr)) {
-        TryElf(M, ebuf, exe, prog, fd, sp, auxv, pagesz, os);
+        TryElf(M, ebuf, exe, fd, sp, auxv, pagesz, os);
       }
     }
   }
-  Pexit(os, exe, 0, TryElf(M, ebuf, exe, prog, fd, sp, auxv, pagesz, os));
+  Pexit(os, exe, 0, TryElf(M, ebuf, exe, fd, sp, auxv, pagesz, os));
 }

ape/loader.lds

@@ -1,5 +1,5 @@
 /*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set noet sts=2 sw=2 fenc=utf-8                                       :vi │
+│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2023 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

dsp/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 .PHONY:		o/$(MODE)/dsp
 o/$(MODE)/dsp:	o/$(MODE)/dsp/core	\

dsp/core/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += DSP_CORE
 

dsp/core/core.h

@@ -9,8 +9,9 @@ int mulaw(int);
 int unmulaw(int);
 void *double2byte(long, const void *, double, double) vallocesque;
 void *byte2double(long, const void *, double, double) vallocesque;
-void *dct(float[8][8], float, float, float, float, float);
+void *dct(float[restrict hasatleast 8][8], unsigned,
-void *dctjpeg(float[8][8]);
+          float, float, float, float, float);
+void *dctjpeg(float[restrict hasatleast 8][8], unsigned);
 double det3(const double[3][3]) nosideeffect;
 void *inv3(double[restrict 3][3], const double[restrict 3][3], double);
 void *matmul3(double[restrict 3][3], const double[3][3], const double[3][3]);

dsp/core/dct.c

@@ -18,40 +18,40 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
 
-#define DCT(A, B, C, D, E, F, G, H, T, C0, C1, C2, C3, C4)    \
+#define DCT(A, B, C, D, E, F, G, H, T, C0, C1, C2, C3, C4) \
-  do {                                                        \
+  do {                                                     \
-    T z1, z2, z3, z4, z5, z11, z13;                           \
+    T z1, z2, z3, z4, z5, z11, z13;                        \
-    T t0, t1, t2, t3, t4, t5, t6, t7, t10, t11, t12, t13;     \
+    T t0, t1, t2, t3, t4, t5, t6, t7, t10, t11, t12, t13;  \
-    t0 = A + H;                                               \
+    t0 = A + H;                                            \
-    t7 = A - H;                                               \
+    t7 = A - H;                                            \
-    t1 = B + G;                                               \
+    t1 = B + G;                                            \
-    t6 = B - G;                                               \
+    t6 = B - G;                                            \
-    t2 = C + F;                                               \
+    t2 = C + F;                                            \
-    t5 = C - F;                                               \
+    t5 = C - F;                                            \
-    t3 = D + E;                                               \
+    t3 = D + E;                                            \
-    t4 = D - E;                                               \
+    t4 = D - E;                                            \
-    t10 = t0 + t3;                                            \
+    t10 = t0 + t3;                                         \
-    t13 = t0 - t3;                                            \
+    t13 = t0 - t3;                                         \
-    t11 = t1 + t2;                                            \
+    t11 = t1 + t2;                                         \
-    t12 = t1 - t2;                                            \
+    t12 = t1 - t2;                                         \
-    A = t10 + t11;                                            \
+    A = t10 + t11;                                         \
-    E = t10 - t11;                                            \
+    E = t10 - t11;                                         \
-    z1 = (t12 + t13) * C0;                                    \
+    z1 = (t12 + t13) * C0;                                 \
-    C = t13 + z1;                                             \
+    C = t13 + z1;                                          \
-    G = t13 - z1;                                             \
+    G = t13 - z1;                                          \
-    t10 = t4 + t5;                                            \
+    t10 = t4 + t5;                                         \
-    t11 = t5 + t6;                                            \
+    t11 = t5 + t6;                                         \
-    t12 = t6 + t7;                                            \
+    t12 = t6 + t7;                                         \
-    z5 = (t10 - t12) * C1;                                    \
+    z5 = (t10 - t12) * C1;                                 \
-    z2 = t10 * C2 + z5;                                       \
+    z2 = t10 * C2 + z5;                                    \
-    z4 = t12 * C3 + z5;                                       \
+    z4 = t12 * C3 + z5;                                    \
-    z3 = t11 * C4;                                            \
+    z3 = t11 * C4;                                         \
-    z11 = t7 + z3;                                            \
+    z11 = t7 + z3;                                         \
-    z13 = t7 - z3;                                            \
+    z13 = t7 - z3;                                         \
-    F = z13 + z2;                                             \
+    F = z13 + z2;                                          \
-    D = z13 - z2;                                             \
+    D = z13 - z2;                                          \
-    B = z11 + z4;                                             \
+    B = z11 + z4;                                          \
-    H = z11 - z4;                                             \
+    H = z11 - z4;                                          \
   } while (0)
 
 /**
@@ -65,20 +65,21 @@
  *
  * @cost ~100ns
  */
-void *dct(float M[8][8], float c0, float c1, float c2, float c3, float c4) {
+void *dct(float M[restrict hasatleast 8][8], unsigned stride,
+          float c0, float c1, float c2, float c3, float c4) {
   unsigned y, x;
-  for (y = 0; y < 8; ++y) {
+  for (y = 0; y < stride * 8; y += stride) {
     DCT(M[y][0], M[y][1], M[y][2], M[y][3], M[y][4], M[y][5], M[y][6], M[y][7],
         float, c0, c1, c2, c3, c4);
   }
-  for (x = 0; x < 8; ++x) {
+  for (x = 0; x < stride * 8; x += stride) {
     DCT(M[0][x], M[1][x], M[2][x], M[3][x], M[4][x], M[5][x], M[6][x], M[7][x],
         float, c0, c1, c2, c3, c4);
   }
   return M;
 }
 
-void *dctjpeg(float M[8][8]) {
+void *dctjpeg(float M[restrict hasatleast 8][8], unsigned stride) {
-  return dct(M, .707106781f, .382683433f, .541196100f, 1.306562965f,
+  return dct(M, stride, .707106781f, .382683433f, .541196100f, 1.306562965f,
              .707106781f);
 }

dsp/mpeg/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += DSP_MPEG
 

dsp/mpeg/idct.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:4;tab-width:4;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=4 sw=4 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=4 sw=4 fenc=utf-8                                     :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │  PL_MPEG - MPEG1 Video decoder, MP2 Audio decoder, MPEG-PS demuxer           │
 │  Dominic Szablewski - https://phoboslab.org                                  │

dsp/mpeg/macroblock.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:4;tab-width:4;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=4 sw=4 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=4 sw=4 fenc=utf-8                                     :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │  PL_MPEG - MPEG1 Video decoder, MP2 Audio decoder, MPEG-PS demuxer           │
 │  Dominic Szablewski - https://phoboslab.org                                  │

dsp/mpeg/mpeg1.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:4;tab-width:4;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=4 sw=4 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=4 sw=4 fenc=utf-8                                     :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │  PL_MPEG - MPEG1 Video decoder, MP2 Audio decoder, MPEG-PS demuxer           │
 │  Dominic Szablewski - https://phoboslab.org                                  │

dsp/mpeg/slowrgb.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:4;tab-width:4;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=4 sw=4 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=4 sw=4 fenc=utf-8                                     :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │  PL_MPEG - MPEG1 Video decoder, MP2 Audio decoder, MPEG-PS demuxer           │
 │  Dominic Szablewski - https://phoboslab.org                                  │

dsp/scale/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += DSP_SCALE
 

dsp/tty/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += DSP_TTY
 

examples/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += EXAMPLES
 

examples/package/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

examples/package/lib/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

examples/pyapp/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

examples/pylife/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

examples/unbourne.c

@@ -157,14 +157,14 @@
 
 /*
  * The follow should be set to reflect the type of system you have:
- *	JOBS -> 1 if you have Berkeley job control, 0 otherwise.
+ *  JOBS -> 1 if you have Berkeley job control, 0 otherwise.
- *	SHORTNAMES -> 1 if your linker cannot handle long names.
+ *  SHORTNAMES -> 1 if your linker cannot handle long names.
- *	define BSD if you are running 4.2 BSD or later.
+ *  define BSD if you are running 4.2 BSD or later.
- *	define SYSV if you are running under System V.
+ *  define SYSV if you are running under System V.
- *	define DEBUG=1 to compile in debugging ('set -o debug' to turn on)
+ *  define DEBUG=1 to compile in debugging ('set -o debug' to turn on)
- *	define DEBUG=2 to compile in and turn on debugging.
+ *  define DEBUG=2 to compile in and turn on debugging.
- *	define DO_SHAREDVFORK to indicate that vfork(2) shares its address
+ *  define DO_SHAREDVFORK to indicate that vfork(2) shares its address
- *	       with its parent.
+ *         with its parent.
  *
  * When debugging is on, debugging info will be written to ./trace and
  * a quit signal will generate a core dump.
@@ -6604,10 +6604,10 @@ static struct job *growjobtab(void) {
  * own process group.  Jp is a job structure that the job is to be added to.
  * N is the command that will be evaluated by the child.  Both jp and n may
  * be NULL.  The mode parameter can be one of the following:
- *	FORK_FG - Fork off a foreground process.
+ *  FORK_FG - Fork off a foreground process.
- *	FORK_BG - Fork off a background process.
+ *  FORK_BG - Fork off a background process.
- *	FORK_NOJOB - Like FORK_FG, but don't give the process its own
+ *  FORK_NOJOB - Like FORK_FG, but don't give the process its own
- *		     process group even if job control is on.
+ *               process group even if job control is on.
  *
  * When job control is turned off, background processes have their standard
  * input redirected to /dev/null (except for the second and later processes
@@ -8403,10 +8403,10 @@ static void nlnoprompt(void) {
 /*
  * Read the next input token.
  * If the token is a word, we set backquotelist to the list of cmds in
- *	backquotes.  We set quoteflag to true if any part of the word was
+ *  backquotes.  We set quoteflag to true if any part of the word was
- *	quoted.
+ *  quoted.
  * If the token is TREDIR, then we set redirnode to a structure containing
- *	the redirection.
+ *  the redirection.
  *
  * [Change comment:  here documents and internal procedures]
  * [Readtoken shouldn't have any arguments.  Perhaps we should make the
@@ -9767,7 +9767,7 @@ out:
 
 /*
  * Print SysV echo(1) style escape string
- *	Halts processing string if a \c escape is encountered.
+ *  Halts processing string if a \c escape is encountered.
  */
 static int conv_escape_str(char *str, char **sp) {
   int c;
@@ -9941,10 +9941,10 @@ static int echocmd(int argc, char **argv) {
  */
 
 /* test(1) accepts the following grammar:
-        oexpr	::= aexpr | aexpr "-o" oexpr ;
+        oexpr ::= aexpr | aexpr "-o" oexpr ;
-        aexpr	::= nexpr | nexpr "-a" aexpr ;
+        aexpr ::= nexpr | nexpr "-a" aexpr ;
-        nexpr	::= primary | "!" primary
+        nexpr ::= primary | "!" primary
-        primary	::= unary-operator operand
+        primary ::= unary-operator operand
                 | operand binary-operator operand
                 | operand
                 | "(" oexpr ")"

libc/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC
 

libc/calls/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

libc/calls/getprogramexecutablename.greg.c

@@ -23,6 +23,7 @@
 #include "libc/cosmo.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
+#include "libc/fmt/libgen.h"
 #include "libc/intrin/getenv.internal.h"
 #include "libc/serialize.h"
 #include "libc/limits.h"
@@ -50,15 +51,65 @@ static inline int IsAlpha(int c) {
   return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
 }
 
+static inline int AllNumDot(const char *s) {
+  while (true) {
+    switch (*s++) {
+      default:  return 0;
+      case 0:   return 1;
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9': case '.':
+        ; /* continue */
+    }
+  }
+}
+
+// old loaders do not pass __program_executable_name, so we need to
+// check for them when we use KERN_PROC_PATHNAME et al.
+static int OldApeLoader(char *s) {
+  char *b;
+  return !strcmp(s, "/usr/bin/ape") ||
+         (!strncmp((b = basename(s)), ".ape-", 5) &&
+          AllNumDot(b + 5));
+}
+
+// if q exists then turn it into an absolute path. we also try adding
+// a .com suffix since the ape auto-appends it when resolving
+static int TryPath(const char *q, int com) {
+  char c, *p, *e;
+  if (!q) return 0;
+  p = g_prog.u.buf;
+  e = p + sizeof(g_prog.u.buf);
+  if (*q != '/') {
+    if (q[0] == '.' && q[1] == '/') {
+      q += 2;
+    }
+    int got = __getcwd(p, e - p - 1 /* '/' */ - com * 4);
+    if (got != -1) {
+      p += got - 1;
+      *p++ = '/';
+    }
+  }
+  while ((c = *q++)) {
+    if (p + com * 4 + 1 /* nul */ < e) {
+      *p++ = c;
+    } else {
+      return 0;
+    }
+  }
+  *p = 0;
+  if (!sys_faccessat(AT_FDCWD, g_prog.u.buf, F_OK, 0)) return 1;
+  if (!com) return 0;
+  p = WRITE32LE(p, READ32LE(".com"));
+  *p = 0;
+  if (!sys_faccessat(AT_FDCWD, g_prog.u.buf, F_OK, 0)) return 1;
+  return 0;
+}
+
 static inline void InitProgramExecutableNameImpl(void) {
   size_t n;
   ssize_t got;
   char c, *q, *b;
 
-  if (__program_executable_name) {
-    /* already set by the loader */
-    return;
-  }
   if (IsWindows()) {
     int n = GetModuleFileName(0, g_prog.u.buf16, ARRAYLEN(g_prog.u.buf16));
     for (int i = 0; i < n; ++i) {
@@ -83,6 +134,22 @@ static inline void InitProgramExecutableNameImpl(void) {
     return;
   }
 
+  // loader passed us a path. it may be relative.
+  if (__program_executable_name) {
+    if (*__program_executable_name == '/') {
+      return;
+    }
+    if (TryPath(__program_executable_name, 0)) {
+      goto UseBuf;
+    }
+    /* if TryPath fails, it probably failed because getcwd() was too long.
+       we are out of options now; KERN_PROC_PATHNAME et al will return the
+       name of the loader not the binary, and argv et al will at best have
+       the same problem. just use the relative path we got from the loader
+       as-is, and accept that if we chdir then things will break. */
+    return;
+  }
+
   b = g_prog.u.buf;
   n = sizeof(g_prog.u.buf) - 1;
   if (IsFreebsd() || IsNetbsd()) {
@@ -96,7 +163,7 @@ static inline void InitProgramExecutableNameImpl(void) {
     }
     cmd[3] = -1;  // current process
     if (sys_sysctl(cmd, ARRAYLEN(cmd), b, &n, 0, 0) != -1) {
-      if (strcmp(b, "/usr/bin/ape")) {  // XX old loader; warn?
+      if (!OldApeLoader(b)) {
         goto UseBuf;
       }
     }
@@ -105,54 +172,27 @@ static inline void InitProgramExecutableNameImpl(void) {
     if ((got = sys_readlinkat(AT_FDCWD, "/proc/self/exe", b, n)) > 0 ||
         (got = sys_readlinkat(AT_FDCWD, "/proc/curproc/file", b, n)) > 0) {
       b[got] = 0;
-      if (strcmp(b, "/usr/bin/ape")) {
+      if (!OldApeLoader(b)) {
         goto UseBuf;
       }
     }
   }
 
+  // don't trust argument parsing if set-id.
   if (issetugid()) {
-    /* give up prior to using less secure methods */
     goto UseEmpty;
   }
 
-  // if argv[0] exists then turn it into an absolute path. we also try
+  // try argv[0], then argv[0].com, then $_, then $_.com.
-  // adding a .com suffix since the ape auto-appends it when resolving
+  if (TryPath(__argv[0], 1) ||
-  if ((q = __argv[0])) {
+      /* TODO(mrdomino): remove after next loader mint */
-    char *p = g_prog.u.buf;
+      TryPath(__getenv(__envp, "COSMOPOLITAN_PROGRAM_EXECUTABLE").s, 0) ||
-    char *e = p + sizeof(g_prog.u.buf);
+      TryPath(__getenv(__envp, "_").s, 1)) {
-    if (*q != '/') {
+    goto UseBuf;
-      if (q[0] == '.' && q[1] == '/') {
-        q += 2;
-      }
-      int got = __getcwd(p, e - p - 1 - 4);  // for / and .com
-      if (got != -1) {
-        p += got - 1;
-        *p++ = '/';
-      }
-    }
-    while ((c = *q++)) {
-      if (p + 1 + 4 < e) {  // for nul and .com
-        *p++ = c;
-      }
-    }
-    *p = 0;
-    if (!sys_faccessat(AT_FDCWD, g_prog.u.buf, F_OK, 0)) goto UseBuf;
-    p = WRITE32LE(p, READ32LE(".com"));
-    *p = 0;
-    if (!sys_faccessat(AT_FDCWD, g_prog.u.buf, F_OK, 0)) goto UseBuf;
-  }
-
-  /* the previous loader supplied the full program path as the first
-     environment variable. we also try "_". */
-  if ((q = __getenv(__envp, "COSMOPOLITAN_PROGRAM_EXECUTABLE").s) ||
-      (q = __getenv(__envp, "_").s)) {
-    goto CopyString;
   }
 
   // give up and just copy argv[0] into it
   if ((q = __argv[0])) {
-  CopyString:
     char *p = g_prog.u.buf;
     char *e = p + sizeof(g_prog.u.buf);
     while ((c = *q++)) {
@@ -164,8 +204,8 @@ static inline void InitProgramExecutableNameImpl(void) {
     goto UseBuf;
   }
 
-  // if we don't even have that then empty the string
 UseEmpty:
+  // if we don't even have that then empty the string
   g_prog.u.buf[0] = 0;
 
 UseBuf:

libc/calls/gettimeofday.c

@@ -38,8 +38,8 @@
  * @param tz is completely ignored
  * @return 0 on success, or -1 w/ errno
  * @raise EFAULT if `tv` points to invalid memory
- * @see	clock_gettime() for nanosecond precision
+ * @see clock_gettime() for nanosecond precision
- * @see	strftime() for string formatting
+ * @see strftime() for string formatting
  * @asyncsignalsafe
  * @vforksafe
  */

libc/crt/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

libc/dlopen/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_DLOPEN
 

libc/dns/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_DNS
 

libc/elf/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_ELF
 

libc/fmt/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

libc/intrin/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_INTRIN
 

libc/intrin/kpollnames.S

@@ -31,7 +31,7 @@
 	.balign	4
 	.underrun
 kPollNames:
-        .e	POLLNVAL	"POLLNVAL"
+	.e	POLLNVAL	"POLLNVAL"
 	.e	POLLWRNORM	"POLLWRNORM"
 	.e	POLLWRBAND	"POLLWRBAND"
 	.e	POLLRDNORM	"POLLRDNORM"

libc/intrin/kstarttsc.c

@@ -20,7 +20,7 @@
 /**
  * Timestamp of process start.
  *
- * @see	libc/runtime/winmain.greg.h
+ * @see libc/runtime/winmain.greg.h
- * @see	libc/crt/crt.S
+ * @see libc/crt/crt.S
  */
 uint64_t kStartTsc;

libc/irq/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_IRQ
 

libc/log/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_LOG
 

libc/mem/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_MEM
 

libc/mem/qsort.c

@@ -63,7 +63,7 @@ static inline void	 swapfunc(char *, char *, size_t, int);
 		TYPE	t = *pi;			\
 		*pi++ = *pj;				\
 		*pj++ = t;				\
-        } while (--i > 0);				\
+	} while (--i > 0);				\
 }
 
 static inline void
@@ -110,7 +110,7 @@ med3(char *a, char *b, char *c, CMPPAR)
 {
 	return CMP(a, b) < 0 ?
 	       (CMP(b, c) < 0 ? b : (CMP(a, c) < 0 ? c : a ))
-              :(CMP(b, c) > 0 ? b : (CMP(a, c) < 0 ? a : c ));
+	      :(CMP(b, c) > 0 ? b : (CMP(a, c) < 0 ? a : c ));
 }
 
 static void

libc/nexgen32e/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_NEXGEN32E
 

libc/nexgen32e/blink_linux_aarch64.S

@@ -36,7 +36,7 @@ blink_linux_aarch64:
 	.endobj	blink_linux_aarch64,globl
 blink_linux_aarch64_size = . - blink_linux_aarch64
 
-        .section .emush,"a",@progbits
+	.section .emush,"a",@progbits
 	.ascii	"if [ \"$s\" = Linux ]; then\n"
 	.ascii	"if [ \"$m\" = aarch64 ] || [ \"$m\" = arm64 ]; then\n"
 	.ascii	"if ! [ -x \"$e\" ]; then\n"

libc/nexgen32e/blink_xnu_aarch64.S

@@ -36,7 +36,7 @@ blink_xnu_aarch64:
 	.endobj	blink_xnu_aarch64,globl
 blink_xnu_aarch64_size = . - blink_xnu_aarch64
 
-        .section .emush,"a",@progbits
+	.section .emush,"a",@progbits
 	.ascii	"if [ \"$s\" = Darwin ] && [ \"$m\" = arm64 ]; then\n"
 	.ascii	"if ! [ -x \"$e\" ]; then\n"
 	.ascii	"echo \"extracting blink-darwin-aarch64 to ${e}\" >&2\n"

libc/nt/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_NT
 

libc/nt/codegen.sh

@@ -1,5 +1,5 @@
 /usr/bin/env echo ' -*-mode:sh;indent-tabs-mode:nil;tab-width:8;coding:utf-8-*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set et ft=sh ts=8 sts=2 sw=2 fenc=utf-8                              :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
@@ -61,9 +61,9 @@ imp() {
 thunk() {
   printf '
 	.text.windows
-        .ftrace1
+	.ftrace1
 %s:
-        .ftrace2
+	.ftrace2
 #ifdef __x86_64__
 	push	%%rbp
 	mov	%%rsp,%%rbp
@@ -81,9 +81,9 @@ thunk() {
 thunk0() {
   printf '
 	.text.windows
-        .ftrace1
+	.ftrace1
 %s:
-        .ftrace2
+	.ftrace2
 #ifdef __x86_64__
 	push	%%rbp
 	mov	%%rsp,%%rbp
@@ -102,9 +102,9 @@ thunk0() {
 thunk1() {
   printf '
 	.text.windows
-        .ftrace1
+	.ftrace1
 %s:
-        .ftrace2
+	.ftrace2
 #ifdef __x86_64__
 	push	%%rbp
 	mov	%%rsp,%%rbp

libc/nt/master.sh

@@ -1,5 +1,5 @@
 /usr/bin/env echo ' -*-mode:sh;indent-tabs-mode:nil;tab-width:8;coding:utf-8-*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set noet ft=sh ts=8 sts=8 sw=8 fenc=utf-8                            :vi │
 ╚────────────────────────────────────────────────────────────────'>/dev/null #*/
 . libc/nt/codegen.sh
 

libc/proc/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_PROC
 

libc/runtime/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

libc/sock/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_SOCK
 

libc/stdio/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_STDIO
 

libc/stdio/clearerr.c

@@ -22,7 +22,7 @@
  * Clears eof and error state indicators on stream.
  *
  * @param f is file object stream pointer
- * @see	clearerr_unlocked()
+ * @see clearerr_unlocked()
  */
 void clearerr(FILE *f) {
   flockfile(f);

libc/stdio/clearerr_unlocked.c

@@ -23,7 +23,7 @@
  * Clears eof and error state indicators on stream.
  *
  * @param f is file object stream pointer
- * @see	clearerr()
+ * @see clearerr()
  */
 void clearerr_unlocked(FILE *f) {
   f->state = 0;

libc/stdio/feof.c

@@ -22,7 +22,7 @@
  * Returns true if stream is in end-of-file state.
  *
  * @param f is file object stream pointer
- * @see	feof_unlocked()
+ * @see feof_unlocked()
  */
 int feof(FILE *f) {
   int rc;

libc/stdio/feof_unlocked.c

@@ -23,7 +23,7 @@
  * Returns true if stream is in end-of-file state.
  *
  * @param f is file object stream pointer
- * @see	feof()
+ * @see feof()
  */
 int feof_unlocked(FILE *f) {
   return f->state == -1;

libc/stdio/iconv.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set noet ft=c ts=2 sts=2 sw=2 fenc=utf-8                             :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Musl Libc                                                                   │

libc/str/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_STR
 

libc/sysv/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_SYSV
 LIBC_SYSV_LIBS = $(foreach x,$(LIBC_SYSV_ARTIFACTS),$($(x)_A))

libc/sysv/consts.sh

@@ -1,5 +1,5 @@
 /*bin/echo   ' -*- mode:sh; indent-tabs-mode:nil; tab-width:8; coding:utf-8 -*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set noet ft=sh ts=8 sts=8 sw=8 fenc=utf-8                            :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/sysv/dos2errno.sh

@@ -1,5 +1,5 @@
 /*bin/echo   ' -*- mode:sh; indent-tabs-mode:nil; tab-width:8; coding:utf-8 -*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set noet ft=sh ts=8 sts=8 sw=8 fenc=utf-8                            :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/sysv/errno.c

@@ -27,9 +27,9 @@
  * defined as variables. By convention, system calls and other
  * functions do not update this variable when nothing's broken.
  *
- * @see	libc/sysv/consts.sh
+ * @see libc/sysv/consts.sh
- * @see	libc/sysv/errfuns.h
+ * @see libc/sysv/errfuns.h
- * @see	__errno_location() stable abi
+ * @see __errno_location() stable abi
  */
 errno_t __errno;
 

libc/sysv/gen.sh

@@ -1,5 +1,5 @@
 /*bin/echo   ' -*- mode:sh; indent-tabs-mode:nil; tab-width:8; coding:utf-8 -*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set et ft=sh ts=8 sts=2 sw=2 fenc=utf-8                              :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/sysv/syscalls.sh

@@ -1,5 +1,5 @@
 /*bin/echo   ' -*- mode:sh; indent-tabs-mode:nil; tab-width:8; coding:utf-8 -*-│
-│ vi: set et ft=sh ts=2 sts=2 sw=2 fenc=utf-8                              :vi │
+│ vi: set noet ft=sh ts=8 sts=8 sw=8 fenc=utf-8                            :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/testlib/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 # Description:
 #   Cosmopolitan Testing Library.
 

libc/thread/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_THREAD
 

libc/time/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_TIME
 

libc/time/localtime.c

@@ -118,7 +118,7 @@ static const char	gmt[] = "GMT";
 #endif
 
 struct ttinfo {				/* time type information */
-	int32_t	tt_utoff;	/* UT offset in seconds */
+	int32_t		tt_utoff;	/* UT offset in seconds */
 	bool		tt_isdst;	/* used to set tm_isdst */
 	int		tt_desigidx;	/* abbreviation list index */
 	bool		tt_ttisstd;	/* transition is std time */
@@ -127,7 +127,7 @@ struct ttinfo {				/* time type information */
 
 struct lsinfo {				/* leap second information */
 	time_t		ls_trans;	/* transition time */
-	int32_t	ls_corr;	/* correction to apply */
+	int32_t		ls_corr;	/* correction to apply */
 };
 
 #define SMALLEST(a, b)	(((a) < (b)) ? (a) : (b))
@@ -1093,8 +1093,8 @@ localtime_tzparse(const char *name, struct state *sp, struct state *basep)
 	size_t				stdlen;
 	size_t				dstlen;
 	size_t				charcnt;
-	int32_t			stdoffset;
+	int32_t				stdoffset;
-	int32_t			dstoffset;
+	int32_t				dstoffset;
 	register char *			cp;
 	register bool			load_ok;
 	time_t atlo = TIME_T_MIN, leaplo = TIME_T_MIN;

libc/time/strptime.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:2;tab-width:8;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=2 sw=8 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=2 sw=8 fenc=utf-8                                     :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Musl Libc                                                                   │

libc/tinymath/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_TINYMATH
 

libc/tinymath/atan2f.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/atan_data.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/atanf_data.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/exp2f_data.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:t;c-basic-offset:8;tab-width:8;coding:utf-8   -*-│
-│ vi: set noet ft=c ts=8 sw=8 fenc=utf-8                                   :vi │
+│ vi: set et ft=c ts=8 sw=8 fenc=utf-8                                     :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Musl Libc                                                                   │

libc/tinymath/expl.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set noet ft=c ts=2 sts=2 sw=2 fenc=utf-8                             :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2023 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/tinymath/log1pf.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/log1pf_data.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/powl.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2021 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/tinymath/remainderf.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2023 Justine Alexandra Roberts Tunney                              │
 │                                                                              │

libc/tinymath/sincosf.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/tinymath/sincosf_data.c

@@ -1,5 +1,5 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+│ vi: set et ft=c ts=8 sts=2 sw=2 fenc=utf-8                               :vi │
 ╚──────────────────────────────────────────────────────────────────────────────╝
 │                                                                              │
 │  Optimized Routines                                                          │

libc/vga/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += LIBC_VGA
 

libc/x/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 #
 # SYNOPSIS
 #

net/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 .PHONY: 	o/$(MODE)/net
 o/$(MODE)/net:	o/$(MODE)/net/finger	\

net/finger/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += NET_FINGER
 

net/http/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += NET_HTTP
 

net/https/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += NET_HTTPS
 

net/turfwar/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += NET_TURFWAR
 

test/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 .PHONY:		o/$(MODE)/test
 o/$(MODE)/test:	o/$(MODE)/test/dsp	\

test/dsp/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 .PHONY:			o/$(MODE)/test/dsp
 o/$(MODE)/test/dsp:	o/$(MODE)/test/dsp/core		\

test/dsp/core/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_DSP_CORE
 

test/dsp/scale/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_DSP_SCALE
 

test/dsp/tty/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_DSP_TTY
 

test/libc/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 .PHONY:		o/$(MODE)/test/libc
 o/$(MODE)/test/libc:					\

test/libc/calls/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_CALLS
 

test/libc/dns/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_DNS
 

test/libc/fmt/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_FMT
 

test/libc/intrin/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_INTRIN
 

test/libc/log/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_LOG
 

test/libc/mem/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_MEM
 

test/libc/nexgen32e/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_NEXGEN32E
 

test/libc/proc/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 PKGS += TEST_LIBC_PROC
 

test/libc/release/BUILD.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
 
 ifneq ($(MODE), dbg)
 ifneq ($(MODE), asan)