From 38d0728107a528d7e12f6dc10f33917dd4083559 Mon Sep 17 00:00:00 2001
From: Gavin Hayes <gavin@computoid.com>
Date: Fri, 26 Apr 2024 01:02:54 -0400
Subject: [PATCH] move back to proc, __static_yoink in paginate.c does not work

---
 libc/{x => proc}/paginate.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename libc/{x => proc}/paginate.c (93%)

diff --git a/libc/x/paginate.c b/libc/proc/paginate.c
similarity index 93%
rename from libc/x/paginate.c
rename to libc/proc/paginate.c
index 5b86705d0..dc37ad339 100644
--- a/libc/x/paginate.c
+++ b/libc/proc/paginate.c
@@ -19,7 +19,9 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
+#include "libc/intrin/kprintf.h"
 #include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
@@ -28,6 +30,8 @@
 #include "libc/temp.h"
 #include "libc/x/x.h"
 
+__static_yoink("__utf16to8");
+
 static char *get_pagerpath(char *pathbuf, size_t pathbufsz) {
   char *pagerpath;
   if (strcmp(nulltoempty(getenv("TERM")), "dumb") && isatty(0) && isatty(1) &&
@@ -43,9 +47,10 @@ static char *get_pagerpath(char *pathbuf, size_t pathbufsz) {
 static bool run_pager(char *args[hasatleast 3]) {
   char16_t widepath[PATH_MAX];
   int n, pid;
+  kprintf("utf16to8 %p\n", _weaken(__utf16to8));
   if (IsWindows() && !strcasecmp(args[0], "/C/Windows/System32/more.com") &&
-      (((n = __mkntpath(args[1], widepath)) == -1) ||
-       !(args[1] = gc(utf16to8(widepath, n, 0))))) {
+      (!_weaken(__utf16to8) || ((n = __mkntpath(args[1], widepath)) == -1) ||
+       !(args[1] = gc(_weaken(__utf16to8)(widepath, n, 0))))) {
     return false;
   }
   if ((pid = fork()) != -1) {