Cleanup socket code

libc/calls/close-nt.c

@@ -22,20 +22,19 @@
 #include "libc/nt/runtime.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int sys_close_nt(int fd) {
+textwindows int sys_close_nt(struct Fd *fd) {
   bool32 ok;
-  if (g_fds.p[fd].kind == kFdFile &&
-      GetFileType(g_fds.p[fd].handle) == kNtFileTypeDisk) {
+  if (fd->kind == kFdFile && GetFileType(fd->handle) == kNtFileTypeDisk) {
     /*
      * Like Linux, closing a file on Windows doesn't guarantee it's
      * immediately synced to disk. But unlike Linux, this could cause
      * subsequent operations, e.g. unlink() to break w/ access error.
      */
-    FlushFileBuffers(g_fds.p[fd].handle);
+    FlushFileBuffers(fd->handle);
   }
-  ok = CloseHandle(g_fds.p[fd].handle);
-  if (g_fds.p[fd].kind == kFdConsole) {
-    ok &= CloseHandle(g_fds.p[fd].extra);
+  ok = CloseHandle(fd->handle);
+  if (fd->kind == kFdConsole) {
+    ok &= CloseHandle(fd->extra);
   }
   return ok ? 0 : __winerr();
 }

libc/calls/close.c

@@ -44,11 +44,11 @@ int close(int fd) {
   } else if (!IsWindows()) {
     rc = sys_close(fd);
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdSocket) {
-    rc = weaken(sys_closesocket_nt)(fd);
+    rc = weaken(sys_closesocket_nt)(g_fds.p + fd);
   } else if (fd < g_fds.n &&
              (g_fds.p[fd].kind == kFdFile || g_fds.p[fd].kind == kFdConsole ||
               g_fds.p[fd].kind == kFdProcess)) {
-    rc = sys_close_nt(fd);
+    rc = sys_close_nt(g_fds.p + fd);
   } else {
     rc = ebadf();
   }

libc/calls/internal.h

@@ -1,17 +1,21 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_
 #include "libc/calls/calls.h"
+#include "libc/calls/internal.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/itimerval.h"
+#include "libc/calls/struct/sigaction-xnu.internal.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
 #include "libc/limits.h"
 #include "libc/macros.h"
+#include "libc/nt/struct/context.h"
 #include "libc/nt/struct/ntexceptionpointers.h"
 #include "libc/nt/struct/securityattributes.h"
 #include "libc/nt/struct/startupinfo.h"
 #include "libc/nt/struct/systeminfo.h"
+#include "libc/nt/struct/win32fileattributedata.h"
 #include "libc/runtime/runtime.h"
 #include "libc/time/struct/timezone.h"
 #include "libc/time/struct/utimbuf.h"
@@ -23,12 +27,6 @@ COSMOPOLITAN_C_START_
 
 #define kIoMotion ((const int8_t[3]){1, 0, 0})
 
-struct NtContext;
-struct NtWin32FileAttributeData;
-struct ZiposHandle;
-struct __darwin_siginfo;
-struct __darwin_ucontext;
-
 struct IoctlPtmGet {
   int theduxfd;
   int workerfd;
@@ -56,8 +54,8 @@ struct Fd {
 };
 
 struct Fds {
-  size_t f;  // lowest free slot
-  size_t n;  // monotonic capacity
+  size_t f; /* lowest free slot */
+  size_t n; /* monotonic capacity */
   struct Fd *p;
   struct Fd __init_p[OPEN_MAX];
 };
@@ -75,7 +73,6 @@ hidden extern const struct NtSecurityAttributes kNtIsInheritable;
 int __reservefd(void) hidden;
 void __releasefd(int) hidden;
 int __ensurefds(int) hidden;
-void __removefd(int) hidden;
 
 forceinline bool __isfdopen(int fd) {
   return 0 <= fd && fd < g_fds.n && g_fds.p[fd].kind != kFdEmpty;
@@ -231,7 +228,7 @@ bool32 sys_isatty_nt(int) hidden;
 char *sys_getcwd_nt(char *, size_t) hidden;
 i64 sys_lseek_nt(int, i64, int) hidden;
 int sys_chdir_nt(const char *) hidden;
-int sys_close_nt(int) hidden;
+int sys_close_nt(struct Fd *) hidden;
 int sys_dup_nt(int, int, int) hidden;
 int sys_execve_nt(const char *, char *const[], char *const[]) hidden;
 int sys_faccessat_nt(int, const char *, int, uint32_t) hidden;

libc/calls/removefd.c

@@ -1,27 +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/internal.h"
-#include "libc/macros.h"
-
-void __removefd(int fd) {
-  if (__isfdopen(fd)) {
-    g_fds.p[fd].kind = kFdEmpty;
-    g_fds.f = MIN(g_fds.f, fd);
-  }
-}