Fix ctype.h and wctype.h

ctl/istream.cc

@@ -17,6 +17,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include "istream.h"
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"

ctl/istringstream.cc

@@ -17,6 +17,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include "istringstream.h"
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/str/str.h"
 

examples/kilo.c

@@ -60,6 +60,7 @@ Contact: [email protected]");
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
 #include "libc/calls/weirdtypes.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/log/log.h"
 #include "libc/mem/alg.h"

examples/ttyinfo.c

@@ -14,6 +14,7 @@
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/termios.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"

examples/unbourne.c

@@ -119,6 +119,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/struct/tms.h"
 #include "libc/calls/termios.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
@@ -11142,7 +11143,9 @@ static void exitreset() {
     inps4 = 0;
   }
   /* from expand.c: */
-  { ifsfree(); }
+  {
+    ifsfree();
+  }
   /* from redir.c: */
   {
     /*
@@ -11165,9 +11168,13 @@ static void forkreset() {
     }
   }
   /* from main.c: */
-  { handler = &main_handler; }
+  {
+    handler = &main_handler;
+  }
   /* from redir.c: */
-  { redirlist = NULL; }
+  {
+    redirlist = NULL;
+  }
   /* from trap.c: */
   {
     char **tp;
@@ -11198,7 +11205,9 @@ static void reset() {
     popallfiles();
   }
   /* from var.c: */
-  { unwindlocalvars(0); }
+  {
+    unwindlocalvars(0);
+  }
 }
 
 static void calcsize(union node *n) {

examples/whois.c

@@ -30,6 +30,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/log/bsd.h"
 #include "libc/mem/mem.h"

libc/calls/read-nt.c

@@ -20,15 +20,16 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/cosmo.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
+#include "libc/intrin/fds.h"
 #include "libc/intrin/nomultics.h"
 #include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"

libc/calls/readlinkat-nt.c

@@ -18,6 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
+#include "libc/ctype.h"
 #include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/createfile.h"

libc/ctype.h

@@ -0,0 +1,26 @@
+#ifndef COSMOPOLITAN_CTYPE_H_
+#define COSMOPOLITAN_CTYPE_H_
+COSMOPOLITAN_C_START_
+
+#define _tolower(u) (0040 | (u))
+#define _toupper(u) (0137 & (u))
+
+int isascii(int) libcesque;
+int isspace(int) libcesque;
+int isalpha(int) libcesque;
+int isdigit(int) libcesque;
+int isalnum(int) libcesque;
+int isxdigit(int) libcesque;
+int isprint(int) libcesque;
+int islower(int) libcesque;
+int isupper(int) libcesque;
+int isblank(int) libcesque;
+int iscntrl(int) libcesque;
+int isgraph(int) libcesque;
+int tolower(int) libcesque;
+int ispunct(int) libcesque;
+int toupper(int) libcesque;
+int toascii(int) libcesque;
+
+COSMOPOLITAN_C_END_
+#endif /* COSMOPOLITAN_CTYPE_H_ */

libc/fmt/atoi.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/str/str.h"
 

libc/fmt/atol.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/str/str.h"
 

libc/fmt/internal.h

@@ -1,5 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_FMT_STRTOL_H_
 #define COSMOPOLITAN_LIBC_FMT_STRTOL_H_
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/str/str.h"
 

libc/fmt/sizetol.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/stdckdint.h"
 #include "libc/str/str.h"

libc/intrin/kprintf.greg.c

@@ -65,6 +65,7 @@
 #include "libc/thread/tls.h"
 #include "libc/thread/tls2.internal.h"
 #include "libc/vga/vga.internal.h"
+#include "libc/wctype.h"
 
 #define STACK_ERROR "kprintf error: stack is about to overflow\n"
 

libc/isystem/ctype.h

@@ -1,4 +1,4 @@
 #ifndef _CTYPE_H
 #define _CTYPE_H
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 #endif /* _CTYPE_H */

libc/isystem/wctype.h

@@ -1,6 +1,4 @@
 #ifndef _WCTYPE_H
 #define _WCTYPE_H
-#include "libc/calls/calls.h"
-#include "libc/fmt/conv.h"
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 #endif /* _WCTYPE_H */

libc/proc/cocmd.c

@@ -20,6 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/struct/timespec.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"

libc/sock/inet_aton.c

@@ -25,6 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/fmt/conv.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/sockaddr.h"

libc/sock/inet_pton.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/macros.internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"

libc/stdio/fmt.c

@@ -39,6 +39,7 @@
 │ THIS SOFTWARE.                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/divmod10.internal.h"

libc/stdio/readpassphrase.c

@@ -26,6 +26,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/termios.h"
+#include "libc/ctype.h"
 #include "libc/errno.h"
 #include "libc/paths.h"
 #include "libc/str/str.h"

libc/stdio/stdio.h

@@ -1,11 +1,10 @@
 #ifndef COSMOPOLITAN_LIBC_STDIO_H_
 #define COSMOPOLITAN_LIBC_STDIO_H_
 
-#define EOF    -1  /* end of file */
-#define WEOF   -1u /* end of file (multibyte) */
-#define _IOFBF 0   /* fully buffered */
-#define _IOLBF 1   /* line buffered */
-#define _IONBF 2   /* no buffering */
+#define EOF    -1 /* end of file */
+#define _IOFBF 0  /* fully buffered */
+#define _IOLBF 1  /* line buffered */
+#define _IONBF 2  /* no buffering */
 
 #define L_tmpnam     20
 #define L_ctermid    20

libc/str/isalnum.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is lower, alpha, or digit.

libc/str/isalpha.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is upper or lower.

libc/str/isascii.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is ascii.

libc/str/isblank.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is space or tab.

libc/str/iscntrl.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is C0 ASCII control code or DEL.

libc/str/isdigit.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is decimal digit.

libc/str/isgraph.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is printable ascii that isn't space.

libc/str/islower.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is lowercase alpha ascii character.

libc/str/isprint.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is printable ascii including space.

libc/str/ispunct.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if ``c ∈ !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~``

libc/str/isspace.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is space, \t, \r, \n, \f, or \v.

libc/str/isupper.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns nonzero if c is uppercase alpha ascii character.

libc/str/iswalnum.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is lower, alpha, or digit.

libc/str/iswalpha.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is alphabetical.

libc/str/iswblank.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is space or tab.

libc/str/iswcntrl.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is C0 or C1 control code.

libc/str/iswctype.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/macros.internal.h"
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 typedef int (*isw_f)(wint_t);
 

libc/str/iswdigit.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is decimal digit.

libc/str/iswgraph.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is printable and not a space.

libc/str/iswlower.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is lowercase letter.

libc/str/iswprint.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is printable.

libc/str/iswpunct.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is punctuation mark.

libc/str/iswseparator.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 static const unsigned short kCodes[][2] = {
     {0x00aa, 0x00aa}, /*     1x English */

libc/str/iswspace.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is space character.

libc/str/iswupper.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is uppercase letter.

libc/str/iswxdigit.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Returns nonzero if c is ascii hex digit.

libc/str/isxdigit.c

@@ -16,10 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/assert.h"
-#include "libc/calls/calls.h"
-#include "libc/limits.h"
-#include "libc/str/str.h"
+#include "libc/ctype.h"
 
 /**
  * Returns true if c is hexadecimal digit.

libc/str/str.h

@@ -3,9 +3,6 @@
 
 #define INVALID_CODEPOINT 0xfffd
 
-#define _tolower(u) (0040 | (u))
-#define _toupper(u) (0137 & (u))
-
 #ifdef _COSMO_SOURCE
 #define chomp         _chomp
 #define chomp16       _chomp16
@@ -20,42 +17,13 @@
 #define wcsstartswith _wcsstartswith
 #endif /* _COSMO_SOURCE */
 
+#ifndef WEOF
+#define WEOF -1u
+#endif
+
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-int isascii(int) libcesque;
-int isspace(int) libcesque;
-int isalpha(int) libcesque;
-int isdigit(int) libcesque;
-int isalnum(int) libcesque;
-int isxdigit(int) libcesque;
-int isprint(int) libcesque;
-int islower(int) libcesque;
-int isupper(int) libcesque;
-int isblank(int) libcesque;
-int iscntrl(int) libcesque;
-int isgraph(int) libcesque;
-int tolower(int) libcesque;
-int ispunct(int) libcesque;
-int toupper(int) libcesque;
-int toascii(int) libcesque;
-
-int iswalnum(wint_t) libcesque;
-int iswalpha(wint_t) libcesque;
-int iswblank(wint_t) libcesque;
-int iswcntrl(wint_t) libcesque;
-int iswdigit(wint_t) libcesque;
-int iswgraph(wint_t) libcesque;
-int iswlower(wint_t) libcesque;
-int iswspace(wint_t) libcesque;
-int iswupper(wint_t) libcesque;
-int iswxdigit(wint_t) libcesque;
-int iswpunct(wint_t) libcesque;
-int iswprint(wint_t) libcesque;
-int iswseparator(wint_t) libcesque;
-wint_t towlower(wint_t) libcesque;
-wint_t towupper(wint_t) libcesque;
-
 void *memset(void *, int, size_t) memcpyesque;
 void *memmove(void *, const void *, size_t) memcpyesque;
 void *memcpy(void *restrict, const void *restrict, size_t) memcpyesque;
@@ -157,14 +125,6 @@ int wctomb(char *, wchar_t) libcesque;
 int wctob(wint_t) libcesque;
 wint_t btowc(int) libcesque;
 
-typedef unsigned wctype_t;
-wctype_t wctype(const char *) strlenesque;
-pureconst int iswctype(wint_t, wctype_t) libcesque;
-
-typedef const int *wctrans_t;
-wctrans_t wctrans(const char *) libcesque;
-wint_t towctrans(wint_t, wctrans_t) libcesque;
-
 int getsubopt(char **, char *const *, char **) libcesque paramsnonnull();
 char *strsignal(int) returnsnonnull libcesque;
 char *strerror(int) returnsnonnull dontthrow dontcallback;

libc/str/strcasecmp16.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Compares NUL-terminated UCS-2 strings case-insensitively.

libc/str/strncasecmp16.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Compares NUL-terminated UCS-2 strings case-insensitively w/ limit.

libc/str/strverscmp.c

@@ -25,6 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/str/str.h"
 __static_yoink("musl_libc_notice");
 

libc/str/towctrans.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/str/str.h"
+#include "libc/wctype.h"
 
 wint_t towctrans(wint_t c, wctrans_t t) {
   if (t == (wctrans_t)1)

libc/str/wcscasecmp.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Compares NUL-terminated wide strings case-insensitively.

libc/str/wcsncasecmp.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
+#include "libc/wctype.h"
 
 /**
  * Compares NUL-terminated wide strings case-insensitively w/ limit.

libc/str/wctrans.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
+#include "libc/wctype.h"
 
 wctrans_t wctrans(const char *s) {
   if (!strcmp(s, "toupper"))

libc/str/wctype.c

@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/wctype.h"
 #include "libc/macros.internal.h"
 #include "libc/serialize.h"
-#include "libc/str/str.h"
 
 static const char kWcTypeNames[][8] = {
     "alnum",   //

libc/str/wcwidth.c

@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/likely.h"
-#include "libc/str/str.h"
 #include "libc/str/unicode.h"
 #include "libc/str/wcwidth_osx.internal.h"
+#include "libc/wctype.h"
 
 /**
  * Returns cell width of monospace character.

libc/testlib/formatint.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/atomic.h"
+#include "libc/ctype.h"
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/intrin/atomic.h"

libc/testlib/formatstr.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/intrin/atomic.h"
 #include "libc/serialize.h"
 #include "libc/str/str.h"

libc/vga/tty.greg.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/fmt/bing.internal.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/directmap.h"

libc/wctype.h

@@ -0,0 +1,35 @@
+#ifndef COSMOPOLITAN_WCTYPE_H_
+#define COSMOPOLITAN_WCTYPE_H_
+COSMOPOLITAN_C_START_
+
+#ifndef WEOF
+#define WEOF -1u
+#endif
+
+typedef unsigned wctype_t;
+typedef const int *wctrans_t;
+
+int iswalnum(wint_t) libcesque;
+int iswalpha(wint_t) libcesque;
+int iswblank(wint_t) libcesque;
+int iswcntrl(wint_t) libcesque;
+int iswdigit(wint_t) libcesque;
+int iswgraph(wint_t) libcesque;
+int iswlower(wint_t) libcesque;
+int iswspace(wint_t) libcesque;
+int iswupper(wint_t) libcesque;
+int iswxdigit(wint_t) libcesque;
+int iswpunct(wint_t) libcesque;
+int iswprint(wint_t) libcesque;
+int iswseparator(wint_t) libcesque;
+wint_t towlower(wint_t) libcesque;
+wint_t towupper(wint_t) libcesque;
+
+wctype_t wctype(const char *) strlenesque;
+pureconst int iswctype(wint_t, wctype_t) libcesque;
+
+wctrans_t wctrans(const char *) libcesque;
+wint_t towctrans(wint_t, wctrans_t) libcesque;
+
+COSMOPOLITAN_C_END_
+#endif /* COSMOPOLITAN_WCTYPE_H_ */

net/http/isacceptablehost.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/str/str.h"
 #include "net/http/http.h"
 

net/http/parsecidr.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/str/str.h"
 #include "net/http/ip.h"
 

net/http/parsecontentlength.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/stdckdint.h"
 #include "libc/str/str.h"
 #include "net/http/http.h"

net/http/parseforwarded.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/str/str.h"
 #include "net/http/http.h"
 

net/http/parsehttpmessage.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
+#include "libc/ctype.h"
 #include "libc/limits.h"
 #include "libc/mem/alg.h"
 #include "libc/mem/arraylist.internal.h"

net/http/parseip.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/ctype.h"
 #include "libc/stdckdint.h"
 #include "libc/str/str.h"
 #include "net/http/ip.h"

net/turfwar/blackholed.c

@@ -22,6 +22,7 @@
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/struct/timespec.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"

net/turfwar/turfwar.c

@@ -27,6 +27,7 @@
 #include "libc/calls/struct/sysinfo.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"

test/libc/calls/getcwd_test.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/libgen.h"

test/libc/calls/shm_open_test.c

@@ -5,6 +5,7 @@
 #include "libc/atomic.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/runtime/runtime.h"

test/libc/intrin/strcmp_test.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
+#include "libc/ctype.h"
 #include "libc/dce.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/gc.h"

test/libc/str/towupper_test.c

@@ -20,6 +20,7 @@
 #include "libc/str/str.h"
 #include "libc/testlib/ezbench.h"
 #include "libc/testlib/testlib.h"
+#include "libc/wctype.h"
 
 TEST(iswupper, test) {
   EXPECT_TRUE(iswupper(L'𝐵'));

test/tool/build/lib/interner_test.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/build/lib/interner.h"
+#include "libc/ctype.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"

third_party/chibicc/as.c

@@ -38,6 +38,7 @@
 #include "third_party/chibicc/file.h"
 #include "third_party/gdtoa/gdtoa.h"
 #include "libc/serialize.h"
+#include "libc/ctype.h"
 #include "tool/build/lib/elfwriter.h"
 
 #define OSZ  0x66

third_party/chibicc/asm.c

@@ -18,6 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bsf.h"
 #include "libc/intrin/bsr.h"
+#include "libc/ctype.h"
 #include "third_party/chibicc/chibicc.h"
 
 #define PRECIOUS 0b1111000000101000  // bx,bp,r12-r15

third_party/chibicc/tokenize.c

@@ -5,6 +5,7 @@
 #include "libc/str/tab.internal.h"
 #include "third_party/chibicc/chibicc.h"
 #include "third_party/chibicc/file.h"
+#include "libc/ctype.h"
 #include "third_party/chibicc/kw.h"
 
 // Input file

third_party/ctags/args.c

@@ -13,6 +13,7 @@
 #include "libc/str/str.h"
 #include "third_party/ctags/args.h"
 #include "third_party/ctags/debug.h"
+#include "libc/ctype.h"
 #include "third_party/ctags/routines.h"
 
 /*

third_party/ctags/asm.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/asp.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/awk.c

@@ -12,6 +12,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/basic.c

@@ -15,6 +15,7 @@
 /*
  *   INCLUDE FILES
  */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h" /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/beta.c

@@ -15,6 +15,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"	/* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/eiffel.c

@@ -14,6 +14,7 @@
 *   INCLUDE FILES
 */
 #include "libc/fmt/conv.h"
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #ifdef TYPE_REFERENCE_TOOL

third_party/ctags/entry.c

@@ -13,6 +13,7 @@
 *   INCLUDE FILES
 */
 #include "libc/runtime/runtime.h"
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/erlang.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/flex.c

@@ -22,6 +22,8 @@
 #include "third_party/ctags/general.h"	/* must always come first */
 #include "libc/str/str.h"	/* to define isalpha () */
 #include "libc/runtime/runtime.h"
+#include "libc/ctype.h"
+
 #ifdef DEBUG
 #include "libc/calls/calls.h"
 #include "libc/stdio/dprintf.h"

third_party/ctags/general.h

@@ -11,6 +11,7 @@
 #ifndef _GENERAL_H
 #define _GENERAL_H
 #include "third_party/ctags/config.h"
+#include "libc/ctype.h"
 
 /* Define standard error destination
  */

third_party/ctags/get.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/go.c

@@ -2,6 +2,7 @@
 *   INCLUDE FILES
 */
 #include "third_party/ctags/general.h"        /* must always come first */
+#include "libc/ctype.h"
 #include "libc/runtime/runtime.h"
 
 #include "third_party/ctags/debug.h"

third_party/ctags/jscript.c

@@ -21,6 +21,8 @@
 #include "third_party/ctags/general.h"	/* must always come first */
 #include "libc/str/str.h"	/* to define isalpha () */
 #include "libc/runtime/runtime.h"
+#include "libc/ctype.h"
+
 #ifdef DEBUG
 #include "libc/calls/calls.h"
 #include "libc/stdio/dprintf.h"

third_party/ctags/lisp.c

@@ -12,6 +12,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "third_party/ctags/parse.h"

third_party/ctags/lregex.c

@@ -16,6 +16,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/lua.c

@@ -12,6 +12,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/make.c

@@ -12,6 +12,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/parse.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/pascal.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"

third_party/ctags/perl.c

@@ -13,6 +13,7 @@
 /*
 *   INCLUDE FILES
 */
+#include "libc/ctype.h"
 #include "third_party/ctags/general.h"  /* must always come first */
 
 #include "libc/mem/alg.h"