Merge pull request 'Fix file descriptor leakage' (#35) from lda/Cytoplasm:tls-file-leak into master

Reviewed-on: Telodendria/Cytoplasm#35

.gitea/workflows/compile.yaml

@@ -0,0 +1,25 @@
+name: Compile Cytoplasm
+run-name: Compile Cytoplasm on ${{ gitea.actor }}
+on: [push]
+
+jobs:
+    "Compile Cytoplasm":
+        strategy:
+            matrix:
+                os: [debian-v12.4, alpine-v3.19, openbsd-v7.4, freebsd-v14.0, netbsd-v9.3]
+                arch: [x86, x86_64]
+                exclude:
+                    # 32-bit OpenBSD does not behave well in QEMU. Even when using
+                    # QEMU to emulate i386, it utilizes 100% of its CPU core and is
+                    # still extremely sluggish. Thus, we don't have a working 32-bit
+                    # OpenBSD runner, so exclude it from the matrix configuration.
+                    - os: openbsd-v7.4
+                      arch: x86
+        runs-on: ["${{ matrix.os }}", "${{ matrix.arch }}"]
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v3
+            - name: Configure Cytoplasm
+              run: ./configure
+            - name: Build Cytoplasm
+              run: make

CHANGELOG.md

@@ -0,0 +1,35 @@
+# Cytoplasm Change Log
+
+This document contains the complete change log for every official release of
+Cytoplasm. It is intended to be updated with every commit that makes a user-facing
+change worth reporting in the change log. As such, it changes frequently between
+releases. Final change log entries are published as [Releases](releases).
+
+## v0.4.1
+
+Cytoplasm is now a C99 library! Upgrading from C89 to C99 makes Cytoplasm more portable
+than ever.
+
+### New Features
+
+- Added an option to `j2s` to allow additional fields in structures and ignore them in
+encoding and decoding. Note that additional fields are totally untouched—they
+are not even initialized to a default value.
+- Fixed a memory leak that would occur in code generated by `j2s` under
+  specific circumstances.
+- Added `JsonMerge()` to the JSON API to merge two JSON objects together.
+- Make `HttpRouter` decode path parts before matching them on regular expressions.
+- Fixed a bug in `ArraySort()` that would crash programs if the passed array has no
+  elements.
+
+## v0.4.0
+
+**Released on November 1, 2023**
+
+This is the first independent release of Cytoplasm! Last month, Cytoplasm was
+split off of [Telodendria](/Telodendria/Telodendria) to become its own independent
+project with its own independent releases. This allows it to develop at a much more
+rapid pace than Telodendria.
+
+Changes in future releases will be reported here. Since this is the first release,
+there are no changes to show.

LICENSE.txt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

README.md

@@ -1,31 +1,39 @@
-# Cytoplasm (libcytoplasm)
+<p align="center"><img src="https://telodendria.io/user/themes/bancino/images/logo/Cytoplasm.png"></p>
+<h1 align="center">Cytoplasm (<code>libcytoplasm</code>)</h1>
 
-Cytoplasm is a general-purpose C library and runtime stub for creating high-level (particularly networked and multi-threaded) C applications. It allows applications to take advantage of the speed, flexibility, and simplicity of the C programming language, while providing helpful code to perform various complex tasks. Cytoplasm provides high-level data structures, a basic logging facility, an HTTP client and server, and more.
+Cytoplasm is a general-purpose C library for creating high-level (particularly networked and multi-threaded) C applications. It allows applications to take advantage of the speed, flexibility, and simplicity of the C programming language, while providing helpful code to allow applications to perform various complex tasks with minimal effort. Cytoplasm provides high-level data structures, a basic logging facility, an HTTP client and server, and more. It also reports memory leaks, which can aid in debugging, particularly on systems that don't have advanced tools like `valgrind`.
 
-Cytoplasm aims not to only do one thing well, but to do many things good enough. The primary target of Cytoplasm is simple, yet higher level C applications that have to perform relatively complex tasks, but don't want to pull in a large number of dependencies.
+Cytoplasm aims not to only do one thing well, but to do many things good enough. This is in contrast to other libraries, which only do one thing and thus require the developer to pull in many different libraries for a broad range of functionality. The primary target of Cytoplasm is simple yet higher level C applications that have to perform relatively complex tasks, but don't want to depend on a large number of dependencies.
 
-Cytoplasm is extremely opinionated on the way programs using it are written. It strives to create a comprehensive and tightly-integrated programming environment, while also maintaining C programming correctness. It doesn't do any macro magic or make C look like anything other than C. It is written entirely in C89, and depends only on a POSIX environment. This differentiates it from other general-purpose libraries that often require modern compilers and non-standard language and environment features. Cytoplasm is intended to be extremely portable and simple, while still providing some of the functionality expected in higher-level programming languages in a platform-agnostic manner. In the case of TLS, Cytoplasm wraps low-level TLS libraries to offer a single, unified interface to TLS so that programs do not have to care about the underlying implementation.
+Cytoplasm is extremely opinionated on the way programs using it are written. It strives to create a comprehensive and tightly-integrated programming environment, while also maintaining C programming correctness. It doesn't do any macro magic or make C look like anything other than C. It is written entirely in C99, and depends only on a POSIX environment. This differentiates it from other general-purpose libraries that often require more modern compilers and non-standard language and environment features. Cytoplasm is intended to be extremely portable and simple, while still providing some of the functionality expected in higher-level programming languages in a platform-agnostic manner. In the case of TLS, Cytoplasm wraps low-level TLS libraries to offer a single, unified interface to TLS so that programs do not have to care about the underlying implementation.
 
-Cytoplasm is probably not suitable for embedded programming. It makes liberal use of the heap, and while data structures are designed to conserve memory where possible and practical, minimal memory usage is not really a design goal for Cytoplasm, although Cytoplasm takes care not to use any more memory than it absolutely needs. Cytoplasm also wraps a few standard libraries with additional logic and checking. While this ensures better runtime safetly, this inevitably adds a little overhead.
+Cytoplasm is probably not suitable for embedded programming. It makes liberal use of the heap, and while data structures are designed to conserve memory where possible and practical, minimal memory usage is not really a design goal for Cytoplasm, although Cytoplasm takes care not to use any more memory than it absolutely needs. Cytoplasm also wraps a few standard libraries with additional logic and checking. While this ensures better runtime safety, this inevitably adds a little overhead, which may be unsuitable for time- or space-critical tasks.
 
-Originally a part of Telodendria (https://telodendria.io), a Matrix homeserver written in C, Cytoplasm was split off into its own project due to the desire of some Telodendria developers to use Telodendria's code in other projects. Cytoplasm is still a Telodendria project, and is maintained along side of Telodendria itself, even living in the same CVS module, but it is designed specifically to be distributed and used totally independent of Telodendria.
+Originally a part of Telodendria ([Website](https://telodendria.io), [Repo](/Telodendria/Telodendria)), a Matrix homeserver written in C, Cytoplasm was split off into its own project due to the desire of some Telodendria developers to use Telodendria's code in other projects. Cytoplasm is still an official Telodendria project, but it is designed specifically to be distributed and used totally independent of Telodendria.
 
-The name "Cytoplasm" was chosen for a few reasons. It plays off the precedent set up by the Matrix organization in naming projects after the parts of a neuron. It also speaks to the function of Cytoplasm.  The cytoplasm of a cell is the supporting material. It is what gives the cell its shape, and it facilitates the movement of materials to the other cell parts. Likewise, Cytoplasm aims to provide a support mechanism for C applications that have to perform complex tasks.
+The name "Cytoplasm" was chosen for a few reasons. It plays off the precedent set up by the Matrix organization in naming projects after the parts of a neuron. It also speaks to the function of Cytoplasm.  The cytoplasm of a cell is the supporting material. It is what gives the cell its shape, and it facilitates the movement of materials to the other cell parts. Likewise, Cytoplasm aims to provide a support mechanism for C applications that have to perform complex tasks beyond what the C standard library provides.
 
 Cytoplasm also starts with a C, which I think is a nice touch for C libraries. It's also fun to say and unique enough that searching for "libcytoplasm" should bring you to this project and not some other one.
 
+## Requirements
+
+Cytoplasm aims to have zero software dependencies beyond what is mandated by POSIX. You only need a standard C99 compiler, and the standard `math` and `pthread` libraries to build Cytoplasm. TLS support can optionally be enabled with the configuration script. The supported TLS implementations are as follows:
+
+- OpenSSL
+- LibreSSL
+
+If TLS support is not enabled, all APIs that use it should fall back to non-TLS behavior in a sensible manner. For example, if TLS support is not enabled, then the HTTP client API will simply return an error if a TLS connection is requested.
+
 ## Building
 
 If your operating system or software distribution provides a pre-built package of Cytoplasm, you should prefer to use that instead of building it from source.
 
-Cytoplasm aims to have zero dependencies beyond what is mandated by POSIX. You only need the standard math and pthread libraries to build it. TLS support can optionally be enabled by setting the TLS_IMPL environment variable. The supported TLS implementations are as follows:
+Cytoplasm uses the standard C library build procedure. Just run these commands:
 
-- OpenSSL
+```
-- LibreSSL
+./configure
-
+make
-If TLS support is not enabled, all APIs that use it should fall back to non-TLS behavior in a sensible manner. For example, if TLS support is not enabled, then the HTTP client API will simply return an error if a TLS connection is requested.  Cytoplasm uses a custom build script instead of Make, for the sake of portability. To build everything, just run the script:
+```
-
-    $ sh make.sh
 
 This will produce the following out/ directory:
 
@@ -33,21 +41,52 @@ This will produce the following out/ directory:
     out/
         lib/
             libcytoplasm.so - The Cytoplasm shared library.
-            libcytoplasm.a - The Cytoplasm static library.
+            libcytoplasm.a - The Cytoplasm static archive.
-            cytoplasm.o - The Cytoplasm runtime stub.
+        bin/ - A few useful tools build with Cytoplasm.
-        bin/
-            hdoc - The documentation generator tool.
         man/ - All Cytoplasm API documentation.
 ```
 
+You can also run `make install` as `root` to install Cytoplasm to the system. This will install the libraries, tools, and `man` pages.
+
+The `configure` script has a number of optional flags, which are as follows:
+
+- `--with-(openssl|libressl)`: Select the TLS implementation to use. OpenSSL is selected by default.
+- `--disable-tls`: Disable TLS altogether.
+- `--prefix=<path>`: Set the install prefix to set by default in the `Makefile`. This defaults to `/usr/local`, which should be appropriate for most Unix-like systems.
+- `--(enable|disable)-debug`: Control whether or not to enable debug mode. This sets the optimization level to 0 and builds with debug symbols. Useful for running with a debugger.
+
+Cytoplasm can be customized with the following options:
+
+- `--lib-name=<name>`: The output name of the library. This defaults to `Cytoplasm` and should in most cases not be changed.
+
+The following recipes are available in the generated `Makefile`:
+
+- `all`: This is the default target. It builds everything.
+- `Cytoplasm`: Build the `libCytoplasm.(so|a)` binaries. If you specified an alternative `--lib-name`, then this target will be named after that.
+- `docs`: Generate the header documentation as `man` pages.
+- `tools`: Build the supplemental tools which may be useful for development.
+- `clean`: Remove the build and output directories. Cytoplasm builds are out-of-tree, which greatly simplifies this recipe compared to in-tree builds.
+
+If you're developing Cytoplasm, these recipes may also be helpful:
+
+- `format`: Format the source code using `indent`. This may require a BSD `indent` because last time I tried GNU `indent`, it didn't like the flags in `indent.pro`. Your mileage may vary.
+- `license`: Update the license headers in all source code files with the contents of the `LICENSE.txt`.
+
+To install Telodendria to your system, the following recipes are available:
+
+- `install`: This installs Cytoplasm under the prefix set with `./configure --prefix=<dir>` or with `make PREFIX=<dir>`. By default, the `make` `PREFIX` is set to whatever was set with `configure --prefix`.
+- `uninstall`: Uninstall Cytoplasm from the same prefix as specified above.
+
+After a build, you can find the object files in `build/` and the output binaries in `out/lib/`.
+
 ## Usage
 
-Cytoplasm provides the typical .so and .a files, which can be used to link programs with it in the usual way. However, Cytoplasm also provides a minimal runtime environment that is intended to be used with the library. As such, it also provides a runtime stub, which is intended to be linked in with programs using Cytoplasm. This stub is responsible for setting up and tearing down some Cytoplasm APIs. While it isn't required by any means, it makes Cytoplasm a lot easier to use for programmers by abstracting out all of the common logic that most programs will want to use.
+Cytoplasm provides the typical .so and .a files, which can be used to link programs with it in the usual way. Somewhat *unusually* for C libraries, however, it provides its own `main()` function, so programs written with Cytoplasm provide `Main()` instead, which is called by Cytoplasm. Cytoplasm works this way because it needs to perform some setup logic before user code runs and some teardown logic after user code returns.
 
 Here is the canonical Hello World written with Cytoplasm:
 
 ```c
-    #include <Log.h>
+#include <Cytoplasm/Log.h>
 
 int Main(void)
 {
@@ -56,23 +95,22 @@ Here is the canonical Hello World written with Cytoplasm:
 }
 ```
 
-If this file is Hello.c, then you can compile it by doing something like this:
+If this file is `Hello.c`, then you can compile it by doing this:
 
-	$ cc -o hello Hello.c cytoplasm.o -lcytoplasm
+	$ cc -o hello Hello.c -lCytoplasm
 
-This command assumes that the runtime stub resides in the current working directory, and that libcytoplasm.so is in your library path.  If you're using the version of Cytoplasm installed by your operating system or software distribution, consult the documentation for the location of the runtime stub. It may be located in /usr/local/libexec or some other similar location. If you've built Cytoplasm from source and wish to link to it from there, you may wish to do something like this:
+The full form of `Main()` expected by the stub is as follows:
-
-    $ export CYTOPLASM=/path/to/Cytoplasm/out/lib
-    $ cc -o hello Hello.c "${CYTOPLASM}/cytoplasm.o" \
-        "-L${CYTOPLASM}" -lcytoplasm
-
-As you may have noticed, C programs using Cytoplasm's runtime stub don't write the main() function. Instead, they use Main(). The main() function is provided by the runtime stub. The full form of Main() expected by the stub is as follows:
 
 ```c
     int Main(Array *args, HashMap *env);
 ```
 
-The first argument is a Cytoplasm array of the command line arguments, and the second is a Cytoplasm hash map of environment variables. Most linkers will let programs omit the env argument, or both arguments if you don't need either. The return value of Main() is returned to the operating system.
+The first argument is a Cytoplasm array of the command line arguments, and the second is a Cytoplasm hash map of environment variables. Most linkers will let programs omit the `env` argument, or both arguments if you don't need either. The return value of `Main()` is returned to the operating system, as would be expected.
 
-Note that both arguments to Main may be treated like any other array or hash map. However, do not invoke ArrayFree() or HashMapFree() on the passed pointers, because memory is cleaned up after Main() returns.
+Note that both arguments to Main may be treated like any other Cytoplasm array or hash map. However, do not invoke `ArrayFree()` or `HashMapFree()` on the passed pointers, because memory is cleaned up after `Main()` returns.
 
+## License
+
+All of the code and documentation for Cytoplasm is licensed under the same license as Telodendria itself. Please refer to [Telodendria &rightarrow; License](/Telodendria/Telodendria#license) for details.
+
+The Cytoplasm logo was designed by [Tobskep](https://tobskep.com) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0](https://creativecommons.org/licenses/by-sa/4.0/) license.

configure

@@ -10,80 +10,90 @@ echo "-------------------"
 BUILD="build"
 OUT="out"
 SRC="src"
-INCLUDE="src/include"
+INCLUDE="include/Cytoplasm"
 TOOLS="tools"
 
-CFLAGS="-Wall -Wextra -pedantic -std=c89 -O3 -pipe -D_DEFAULT_SOURCE -I${INCLUDE}"
+# Default compiler flags. These must be supported by all POSIX C compilers.
-LIBS="-lm -pthread"
+# "Fancy" compilers that have additional options must be detected and set below.
+CFLAGS="-O1 -D_DEFAULT_SOURCE -I${INCLUDE}"
+LIBS="-lm -lpthread"
 
+# Default args for all platforms.
+SCRIPT_ARGS="--prefix=/usr/local --lib-name=Cytoplasm"
 
-# Set default args for all platforms
+# Set SSL flags depending on the platform.
-SCRIPT_ARGS="--lib-rtstub=RtStub --prefix=/usr/local --enable-ld-extra --lib-name=Cytoplasm --lib-version=0.4.0 --static $@"
-
-# Set platform specific args
 case "$(uname)" in
     OpenBSD)
-        SCRIPT_ARGS="--with-libressl $SCRIPT_ARGS"
+        SCRIPT_ARGS="${SCRIPT_ARGS} --with-libressl"
         ;;
     *)
-        SCRIPT_ARGS="--with-openssl $SCRIPT_ARGS"
+        SCRIPT_ARGS="${SCRIPT_ARGS} --with-openssl"
         ;;
 esac
 
+# Set compiler depending on the platform.
+case "$(uname)" in
+    Linux|NetBSD)
+        # These systems typically use GCC.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=gcc"
+        ;;
+    OpenBSD|FreeBSD)
+        # These systems typically use Clang.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=clang"
+        ;;
+    *)
+        # Use default compiler which is required to be present on
+        # all POSIX-compliant systems.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=c99"
+        ;;
+esac
+
+# Append any additional args specified by user
+SCRIPT_ARGS="${SCRIPT_ARGS} $@"
+
 echo "Processing options..."
 echo "Ran with arguments: $SCRIPT_ARGS"
 
 # Process all arguments
 for arg in $SCRIPT_ARGS; do
     case "$arg" in
+        --cc=*)
+            CC=$(echo "$arg" | cut -d '=' -f 2-)
+            case "${CC}" in
+                gcc*|clang*)
+                    # "Fancy" compilers that support a plethora of additional flags we
+                    # want to enable if present.
+                    CFLAGS="-Wall -Wextra -Werror -pedantic -std=c99 -O3 ${CFLAGS}"
+                    LDFLAGS="-flto -fdata-sections -ffunction-sections -s -Wl,-gc-sections"
+                    ;;
+            esac
+            ;;
         --with-openssl)
-            TLS_IMPL="OPENSSL"
+            TLS_IMPL="TLS_OPENSSL"
             TLS_LIBS="-lcrypto -lssl"
             ;;
         --with-libressl)
-            TLS_IMPL="LIBRESSL"
+            TLS_IMPL="TLS_LIBRESSL"
             TLS_LIBS="-ltls -lcrypto -lssl"
             ;;
         --disable-tls)
+            TLS_IMPL=""
             TLS_LIBS=""
             ;;
         --prefix=*)
             PREFIX=$(echo "$arg" | cut -d '=' -f 2-)
             ;;
-        --enable-ld-extra)
-            LD_EXTRA="-flto -fdata-sections -ffunction-sections -s -Wl,-gc-sections"
-            ;;
-        --disable-ld-extra)
-            LD_EXTRA=""
-            ;;
         --lib-name=*)
             LIB_NAME=$(echo "$arg" | cut -d '=' -f 2-)
             ;;
-        --lib-version=*)
-            LIB_VERSION=$(echo "$arg" | cut -d '=' -f 2-)
-            ;;
         --enable-debug)
             DEBUG="-O0 -g"
-            echo "Notice: --enable-debug implies --disable-ld-extra and --no-static."
-            echo "You must explicitly provide --enable-ld-extra and/or --static after"
-            echo "specifying --enable-debug if you wish to enable these features in debug mode."
-            LD_EXTRA=""
-            STATIC=""
             ;;
         --disable-debug)
             DEBUG=""
             ;;
-        --lib-rtstub=*)
-            STUB=$(echo "$arg" | cut -d '=' -f 2-)
-            ;;
-        --static)
-            STATIC="-static -Wl,-static"
-            ;;
-        --no-static)
-            STATIC=""
-            ;;
         *)
-            echo "Invalid argument: $1"
+            echo "Invalid argument: $arg"
             exit 1
             ;;
     esac
@@ -94,8 +104,8 @@ if [ -n "$TLS_IMPL" ]; then
     LIBS="${LIBS} ${TLS_LIBS}"
 fi
 
-CFLAGS="${CFLAGS} '-DLIB_NAME=\"${LIB_NAME}\"' '-DLIB_VERSION=\"${LIB_VERSION}\"' ${DEBUG}"
+CFLAGS="${CFLAGS} '-DLIB_NAME=\"${LIB_NAME}\"' ${DEBUG}"
-LDFLAGS="${LIBS} ${LD_EXTRA}"
+LDFLAGS="${LIBS} ${LDFLAGS}"
 
 #
 # Makefile generation
@@ -127,11 +137,27 @@ print_obj() {
 	printf '%s ' "$2"
 }
 
+get_deps() {
+    src="$1"
+
+    ${CC} -I${INCLUDE} -E "$src" \
+        | grep '^#'              \
+        | awk '{print $3}'       \
+        | cut -d '"' -f 2        \
+        | sort                   \
+        | uniq                   \
+        | grep -v '^[/<]'        \
+        | grep "^${SRC}/"        \
+        | while IFS= read -r dep; do
+        printf "%s " "$dep"
+    done
+}
+
 compile_obj() {
 	src="$1"
 	obj="$2"
 
-	cc -I${INCLUDE} -MM -MT "${obj}" "${src}"
+	echo "${obj}: $(get_deps ${src})"
 	echo "${TAB}@mkdir -p $(dirname ${obj})"
 	echo "${TAB}\$(CC) \$(CFLAGS) -fPIC -c -o \"${obj}\" \"${src}\""
 }
@@ -140,32 +166,46 @@ compile_bin() {
 	src="$1"
 	out="$2"
 
-    echo "${out}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so ${OUT}/lib/${LIB_NAME}.o ${src}"
+    echo "${out}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so ${src}"
     echo "${TAB}@mkdir -p ${OUT}/bin"
-    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" ${OUT}/lib/${LIB_NAME}.o -L${OUT}/lib \$(LDFLAGS) -l${LIB_NAME} ${STATIC}"
+    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" -L${OUT}/lib \$(LDFLAGS) -l${LIB_NAME}"
 }
 
 compile_doc() {
 	src="$1"
 	out="$2"
+    pref="LD_LIBRARY_PATH=${OUT}/lib "
 
 	echo "${out}: ${OUT}/bin/hdoc ${src}"
 	echo "${TAB}@mkdir -p ${OUT}/man/man3"
-	echo "${TAB}${OUT}/bin/hdoc -D \"Os=${LIB_NAME}\" -i \"${src}\" -o \"${out}\""
+	echo "${TAB}${pref}${OUT}/bin/hdoc -D \"Os=${LIB_NAME}\" -i \"${src}\" -o \"${out}\""
 }
 
 install_out() {
 	src="$1"
 	out="$2"
+	dir=$(dirname "$out")
 
-	echo "${TAB}install -D \"$src\" \"$out\""
+	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}cp \"$src\" \"$out\""
 }
 
 install_man() {
 	src="${OUT}/man/man3/${LIB_NAME}-$(basename $1 .h).3"
 	out="$2"
+    dir=$(dirname "$out")
 
-	echo "${TAB}install -D \"$src\" \"$out\""
+	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}cp \"$src\" \"$out\""
+}
+
+install_tool() {
+    src=${OUT}/bin/$(basename "$1" .c)
+    out="$2"
+    dir=$(dirname "$out")
+
+	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}cp \"$src\" \"$out\""
 }
 
 uninstall_out() {
@@ -186,6 +226,7 @@ cat << EOF > Makefile
 # Generated by '$0' on $(date).
 # This file should generally not be manually edited.
 
+CC = ${CC}
 PREFIX = ${PREFIX}
 CFLAGS = ${CFLAGS}
 LDFLAGS = ${LDFLAGS}
@@ -212,28 +253,24 @@ ${TAB}    diff -u -p - "LICENSE.txt" | \\
 ${TAB}    patch "\$\$src" | grep -v "^Hmm"; \\
 ${TAB}done
 
-${LIB_NAME}: ${OUT}/lib/${LIB_NAME}.o ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
+${LIB_NAME}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
 
 install: ${LIB_NAME}
-${TAB}install -D ${OUT}/lib/${LIB_NAME}.o \$(PREFIX)/lib/${LIB_NAME}.o
 ${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
 ${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
 $(collect ${INCLUDE}/ '' '' \$\(PREFIX\)/include/${LIB_NAME}/ install_out)
 $(collect ${INCLUDE}/ .h .3 \$\(PREFIX\)/man/man3/${LIB_NAME}- install_man)
+$(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ install_tool)
 
 uninstall:
-${TAB}rm -r \$(PREFIX)/lib/${LIB_NAME}.*
 ${TAB}rm -r \$(PREFIX)/lib/lib${LIB_NAME}.*
 ${TAB}rm -r \$(PREFIX)/include/${LIB_NAME}
 ${TAB}rm -r \$(PREFIX)/man/man3/${LIB_NAME}-*
+$(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ uninstall_out)
 
 clean:
 ${TAB}rm -r "${BUILD}" "${OUT}"
 
-${OUT}/lib/${LIB_NAME}.o: ${BUILD}/${STUB}.o
-${TAB}@mkdir -p ${OUT}/lib
-${TAB}cp ${BUILD}/${STUB}.o ${OUT}/lib/${LIB_NAME}.o
-
 ${OUT}/lib/lib${LIB_NAME}.a: ${OBJS}
 ${TAB}@mkdir -p ${OUT}/lib
 ${TAB}\$(AR) rcs ${OUT}/lib/lib${LIB_NAME}.a ${OBJS}

examples/PrintArgsAndEnv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

include/Cytoplasm/Args.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -38,7 +38,7 @@
  * provide the standard command line interface.
  */
 
-#include <Array.h>
+#include "Array.h"
 
 /**
  * All state is stored in this structure, instead of global

include/Cytoplasm/Array.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -52,6 +52,7 @@
 
 #include <stddef.h>
 #include <stdarg.h>
+#include <stdbool.h>
 
 /**
  * The functions in this API operate on an array structure which is
@@ -98,7 +99,7 @@ extern void *ArrayGet(Array *, size_t);
  * This function returns a boolean value indicating whether or not it
  * suceeded.
  */
-extern int ArrayInsert(Array *, size_t, void *);
+extern bool ArrayInsert(Array *, size_t, void *);
 
 /**
  * Set the value at the specified index in the specified array to the
@@ -115,7 +116,7 @@ extern void *ArraySet(Array *, size_t, void *);
  * return value as
  * .Fn ArrayInsert .
  */
-extern int ArrayAdd(Array *, void *);
+extern bool ArrayAdd(Array *, void *);
 
 /**
  * Remove the element at the specified index from the specified array.
@@ -146,7 +147,7 @@ extern void ArraySort(Array *, int (*) (void *, void *));
  * .P
  * This is a relatively expensive operation. The array must first be
  * duplicated. Then it is sorted, then it is iterated from beginning
- * to end to remove duplicate entires. Note that the comparison 
+ * to end to remove duplicate entries. Note that the comparison
  * function is executed on each element at least twice.
  */
 extern Array *ArrayUnique(Array *, int (*) (void *, void *));
@@ -167,7 +168,7 @@ extern Array *ArrayReverse(Array *);
  * array. This function is intended to be used by functions that return
  * relatively read-only arrays that will be long-lived.
  */
-extern int ArrayTrim(Array *);
+extern bool ArrayTrim(Array *);
 
 /**
  * Convert a variadic arguments list into an Array. In most cases, the

include/Cytoplasm/Base64.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -39,6 +39,7 @@
  */
 
 #include <stddef.h>
+#include <stdbool.h>
 
 /**
  * This function computes the amount of bytes needed to store a message
@@ -93,7 +94,7 @@ extern void
  * this means it will only fail if a bigger string is necessary, but it
  * could not be automatically allocated on the heap.
  */
-extern int
+extern bool
  Base64Pad(char **, size_t);
 
 #endif                             /* CYTOPLASM_BASE64_H */

include/Cytoplasm/Cron.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -24,6 +24,8 @@
 #ifndef CYTOPLASM_CRON_H
 #define CYTOPLASM_CRON_H
 
+#include <stdint.h>
+
 /***
  * @Nm Cron
  * @Nd Basic periodic job scheduler.
@@ -56,8 +58,6 @@
  * by any means.
  */
 
-#include <Int.h>
-
 /**
  * All functions defined here operate on a structure opaque to the
  * caller.
@@ -82,7 +82,7 @@ typedef void (JobFunc) (void *);
  * .Pp
  * This function takes the tick interval in milliseconds.
  */
-extern Cron * CronCreate(UInt32);
+extern Cron * CronCreate(uint64_t);
 
 /**
  * Schedule a one-off job to be executed only at the next tick, and
@@ -110,7 +110,7 @@ extern void
  * and a pointer to pass to that function when it is executed.
  */
 extern void
- CronEvery(Cron *, unsigned long, JobFunc *, void *);
+ CronEvery(Cron *, uint64_t, JobFunc *, void *);
 
 /**
  * Start ticking the clock and executing registered jobs.

include/Cytoplasm/Cytoplasm.h

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef CYTOPLASM_CYTOPLASM_H
+#define CYTOPLASM_CYTOPLASM_H
+
+#define CYTOPLASM_VERSION_MAJOR 0
+#define CYTOPLASM_VERSION_MINOR 4
+#define CYTOPLASM_VERSION_PATCH 1
+#define CYTOPLASM_VERSION ((CYTOPLASM_VERSION_MAJOR * 10000) + (CYTOPLASM_VERSION_MINOR * 100) + (CYTOPLASM_VERSION_PATCH))
+
+#define CYTOPLASM_VERSION_ALPHA 1
+#define CYTOPLASM_VERSION_BETA 0
+#define CYTOPLASM_VERSION_STABLE (!CYTOPLASM_VERSION_ALPHA && !CYTOPLASM_VERSION_BETA)
+
+#define STRINGIFY(x) #x
+
+/***
+ * @Nm Cytoplasm
+ * @Nd A simple API that provides metadata on the library itself.
+ * @Dd September 30 2022
+ * @Xr Sha2
+ *
+ * This API simply provides name and versioning information for the
+ * currently loaded library.
+ */
+
+/** */
+extern int CytoplasmGetVersion(void);
+
+/**
+ * Get the library version. This will be useful mostly for printing
+ * to log files, but it may also be used by a program to verify that
+ * the version is new enough.
+ * 
+ * This function returns a string, which should usually be able to be
+ * parsed using sscanf() if absolutely necessary.
+ */
+extern const char * CytoplasmGetVersionStr(void);
+
+#endif /* CYTOPLASM_CYTOPLASM_H */

include/Cytoplasm/Db.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -37,9 +37,10 @@
  */
 
 #include <stddef.h>
+#include <stdbool.h>
 
-#include <HashMap.h>
+#include "HashMap.h"
-#include <Array.h>
+#include "Array.h"
 
 /**
  * All functions in this API operate on a database structure that is
@@ -113,7 +114,7 @@ extern DbRef * DbLock(Db *, size_t,...);
  * This function assumes the object is not locked, otherwise undefined
  * behavior will result.
  */
-extern int DbDelete(Db *, size_t,...);
+extern bool DbDelete(Db *, size_t,...);
 
 /**
  * Unlock an object and return it back to the database. This function
@@ -121,7 +122,7 @@ extern int DbDelete(Db *, size_t,...);
  * read cache; writes are always immediate to ensure data integrity in
  * the event of a system failure.
  */
-extern int DbUnlock(Db *, DbRef *);
+extern bool DbUnlock(Db *, DbRef *);
 
 /**
  * Check the existence of the given database object in a more efficient
@@ -130,7 +131,7 @@ extern int DbUnlock(Db *, DbRef *);
  * This function does not lock the object, nor does it load it into
  * memory if it exists.
  */
-extern int DbExists(Db *, size_t,...);
+extern bool DbExists(Db *, size_t,...);
 
 /**
  * List all of the objects at a given path. Unlike the other varargs
@@ -164,6 +165,6 @@ extern HashMap * DbJson(DbRef *);
  * replace it with new JSON. This is more efficient than duplicating
  * a separate object into the database reference.
  */
-extern int DbJsonSet(DbRef *, HashMap *);
+extern bool DbJsonSet(DbRef *, HashMap *);
 
 #endif

include/Cytoplasm/Graph.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

include/Cytoplasm/HashMap.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -46,7 +46,7 @@
 
 #include <stddef.h>
 
-#include <Array.h>
+#include "Array.h"
 
 /**
  * These functions operate on an opaque structure, which the caller
@@ -150,7 +150,7 @@ extern void * HashMapDelete(HashMap *, const char *);
  * insertions or deletions occur during the iteration. This
  * functionality has not been tested, and will likely not work.
  */
-extern int HashMapIterate(HashMap *, char **, void **);
+extern bool HashMapIterate(HashMap *, char **, void **);
 
 /**
  * A reentrant version of
@@ -163,7 +163,7 @@ extern int HashMapIterate(HashMap *, char **, void **);
  * .Pp
  * The cursor should be initialized to 0 at the start of iteration.
  */
-extern int
+extern bool
 HashMapIterateReentrant(HashMap *, char **, void **, size_t *);
 
 /**

include/Cytoplasm/HeaderParser.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -41,8 +41,8 @@
  * for example usage of this parser.
  */
 
-#include <Stream.h>
+#include "Stream.h"
-#include <Array.h>
+#include "Array.h"
 
 #define HEADER_EXPR_MAX 4096
 

include/Cytoplasm/Http.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -42,8 +42,8 @@
 
 #include <stdio.h>
 
-#include <HashMap.h>
+#include "HashMap.h"
-#include <Stream.h>
+#include "Stream.h"
 
 #define HTTP_FLAG_NONE 0
 #define HTTP_FLAG_TLS (1 << 0)

include/Cytoplasm/HttpClient.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -39,8 +39,8 @@
 
 #include <stdio.h>
 
-#include <HashMap.h>
+#include "HashMap.h"
-#include <Http.h>
+#include "Http.h"
 
 /**
  * A server response is represented by a client context. It is

include/Cytoplasm/HttpRouter.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -38,7 +38,7 @@
  * handler functions.
  */
 
-#include <Array.h>
+#include "Array.h"
 
 /**
  * The router structure is opaque and thus managed entirely  by the
@@ -74,7 +74,7 @@ extern void HttpRouterFree(HttpRouter *);
  * .Pa /some/path/(.*)/parts
  * to work as one would expect.
  */
-extern int HttpRouterAdd(HttpRouter *, char *, HttpRouteFunc *);
+extern bool HttpRouterAdd(HttpRouter *, char *, HttpRouteFunc *);
 
 /**
  * Route the specified request path using the specified routing
@@ -86,6 +86,6 @@ extern int HttpRouterAdd(HttpRouter *, char *, HttpRouteFunc *);
  * how to handle, and the pointer to a void pointer is where the
  * route function's response will be placed.
  */
-extern int HttpRouterRoute(HttpRouter *, char *, void *, void **);
+extern bool HttpRouterRoute(HttpRouter *, char *, void *, void **);
 
 #endif                             /* CYTOPLASM_HTTPROUTER_H */

include/Cytoplasm/HttpServer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -46,12 +46,12 @@
  * closely resembles Java.
  */
 
-#include <Http.h>
-
 #include <stdio.h>
+#include <stdbool.h>
 
-#include <HashMap.h>
+#include "Http.h"
-#include <Stream.h>
+#include "HashMap.h"
+#include "Stream.h"
 
 /**
  * The functions on this API operate on an opaque structure.
@@ -134,7 +134,7 @@ extern void HttpServerFree(HttpServer *);
  * caller can continue working while the HTTP server is running in a
  * separate thread and managing a pool of threads to handle responses.
  */
-extern int HttpServerStart(HttpServer *);
+extern bool HttpServerStart(HttpServer *);
 
 /**
  * Typically, at some point after calling

include/Cytoplasm/Io.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

include/Cytoplasm/Json.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -68,13 +68,13 @@
  * behavior.
  */
 
-#include <HashMap.h>
+#include "HashMap.h"
-#include <Array.h>
+#include "Array.h"
-#include <Stream.h>
+#include "Stream.h"
-#include <Int64.h>
 
 #include <stdio.h>
 #include <stddef.h>
+#include <stdbool.h>
 
 #define JSON_DEFAULT -1
 #define JSON_PRETTY 0
@@ -152,7 +152,7 @@ extern char * JsonValueAsString(JsonValue *);
  * Encode a number as a JSON value that can be added to an object or
  * an array.
  */
-extern JsonValue * JsonValueInteger(Int64);
+extern JsonValue * JsonValueInteger(uint64_t);
 
 /**
  * Unwrap a JSON value that represents a number. This function will
@@ -160,7 +160,7 @@ extern JsonValue * JsonValueInteger(Int64);
  * misleading. Check the type of the value before making assumptions
  * about its value.
  */
-extern Int64 JsonValueAsInteger(JsonValue *);
+extern uint64_t JsonValueAsInteger(JsonValue *);
 
 /**
  * Encode a floating point number as a JSON value that can be added
@@ -181,7 +181,7 @@ extern double JsonValueAsFloat(JsonValue *);
  * expressions as a JSON value that can be added to an object or an
  * array.
  */
-extern JsonValue * JsonValueBoolean(int);
+extern JsonValue * JsonValueBoolean(bool);
 
 /**
  * Unwrap a JSON value that represents a boolean. This function will
@@ -189,7 +189,7 @@ extern JsonValue * JsonValueBoolean(int);
  * misleading. Check the type of the value before making assumptions
  * about its type.
  */
-extern int JsonValueAsBoolean(JsonValue *);
+extern bool JsonValueAsBoolean(JsonValue *);
 
 /**
  * This is a special case that represents a JSON null. Because the
@@ -253,7 +253,7 @@ extern void JsonFree(HashMap *);
  * or if the stream is NULL, the number of bytes that would have
  * been written.
  */
-extern int JsonEncodeString(const char *, Stream *);
+extern size_t JsonEncodeString(const char *, Stream *);
 
 /**
  * Serialize a JSON value as it would appear in JSON output. This is
@@ -277,7 +277,7 @@ extern int JsonEncodeString(const char *, Stream *);
  * or if the stream is NULL, the number of bytes that would have
  * been written.
  */
-extern int JsonEncodeValue(JsonValue *, Stream *, int);
+extern size_t JsonEncodeValue(JsonValue *, Stream *, int);
 
 /**
  * Encode a JSON object as it would appear in JSON output, writing it
@@ -289,7 +289,7 @@ extern int JsonEncodeValue(JsonValue *, Stream *, int);
  * or if the stream is NULL, the number of bytes that would have
  * been written.
  */
-extern int JsonEncode(HashMap *, Stream *, int);
+extern size_t JsonEncode(HashMap *, Stream *, int);
 
 /**
  * Decode a JSON object from the given input stream and parse it into
@@ -320,4 +320,13 @@ extern JsonValue * JsonGet(HashMap *, size_t,...);
  */
 extern JsonValue * JsonSet(HashMap *, JsonValue *, size_t,...);
 
+/**
+ * Recursively merge two JSON objects. The second object is merged
+ * on top of the first; any keys present in the first object that are
+ * also present in the second object are replaced with those in the
+ * second object, and any keys present in the second object that are
+ * not present in the first object are copied to the first object.
+ */
+extern void JsonMerge(HashMap *, HashMap *);
+
 #endif                             /* CYTOPLASM_JSON_H */

include/Cytoplasm/Log.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -42,7 +42,7 @@
 #include <stddef.h>
 #include <syslog.h>
 
-#include <Stream.h>
+#include "Stream.h"
 
 #define LOG_FLAG_COLOR  (1 << 0)
 #define LOG_FLAG_SYSLOG (1 << 1)

include/Cytoplasm/Memory.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -76,6 +76,7 @@
  * macros.
  */
 #include <stddef.h>
+#include <stdint.h>
 
 /**
  * These values are passed into the memory hook function to indicate

include/Cytoplasm/Queue.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -46,6 +46,7 @@
  */
 
 #include <stddef.h>
+#include <stdbool.h>
 
 /**
  * These functions operate on a queue structure that is opaque to the
@@ -73,7 +74,7 @@ extern void QueueFree(Queue *);
  * value indicating whether or not the push succeeded. Pushing items
  * into the queue will fail if the queue is full.
  */
-extern int QueuePush(Queue *, void *);
+extern bool QueuePush(Queue *, void *);
 
 /**
  * Pop an element out of the queue. This function returns NULL if the
@@ -95,11 +96,11 @@ extern void * QueuePeek(Queue *);
 /**
  * Determine whether or not the queue is full.
  */
-extern int QueueFull(Queue *);
+extern bool QueueFull(Queue *);
 
 /**
  * Determine whether or not the queue is empty.
  */
-extern int QueueEmpty(Queue *);
+extern bool QueueEmpty(Queue *);
 
 #endif

include/Cytoplasm/Rand.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -58,11 +58,13 @@
  */
 
 #include <stddef.h>
+#include <stdint.h>
 
 /**
- * Generate a single random integer between 0 and the passed value.
+ * Generate a single random 32-bit integer between 0 and the
+ * passed value.
  */
-extern int RandInt(unsigned int);
+extern uint32_t RandInt(uint32_t);
 
 /**
  * Generate the number of integers specified by the second argument
@@ -76,6 +78,6 @@ extern int RandInt(unsigned int);
  * has to lock and unlock a mutex. It is therefore better to obtain
  * multiple random numbers in one pass if multiple are needed.
  */
-extern void RandIntN(int *, size_t, unsigned int);
+extern void RandIntN(uint32_t *, size_t, uint32_t);
 
 #endif                             /* CYTOPLASM_RAND_H */

include/Cytoplasm/Runtime.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -37,8 +37,6 @@
  * the runtime stub needs to know their definitions.
  */
 
-#include <Array.h>
-
 /**
  * Write a memory report to a file in the current directory, using
  * the provided program arguments, including the program name that

include/Cytoplasm/Sha.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

include/Cytoplasm/Str.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -39,21 +39,21 @@
  * is a standard library header.
  */
 
-#include <Int.h>
-
 #include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 /**
  * Convert UTF-16 into a Unicode codepoint.
  */
-extern UInt32 StrUtf16Decode(UInt16, UInt16);
+extern uint32_t StrUtf16Decode(uint16_t, uint16_t);
 
 /**
  * Take a Unicode codepoint and encode it into a string buffer containing
  * between 1 and 4 bytes. The string buffer is allocated on the heap,
  * so it should be freed when it is no longer needed.
  */
-extern char * StrUtf8Encode(UInt32);
+extern char * StrUtf8Encode(uint32_t);
 
 /**
  * Duplicate a null-terminated string, returning a new string on the
@@ -87,7 +87,7 @@ extern char * StrConcat(size_t,...);
  * string consists only of blank characters, as determined by
  * .Xr isblank 3 .
  */
-extern int StrBlank(const char *str);
+extern bool StrBlank(const char *str);
 
 /**
  * Generate a string of the specified length, containing random
@@ -124,6 +124,6 @@ extern char * StrLower(char *);
  * function returns a boolean value indicating whether or not
  * strcmp() returned 0.
  */
-extern int StrEquals(const char *, const char *);
+extern bool StrEquals(const char *, const char *);
 
 #endif                             /* CYTOPLASM_STR_H */

include/Cytoplasm/Stream.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -36,9 +36,11 @@
  * C library and offering some more convenience features.
  */
 
-#include <Io.h>
+#include "Io.h"
 
 #include <stdarg.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 /**
  * An opaque structure analogous to C's FILE pointers.
@@ -172,7 +174,7 @@ extern off_t StreamSeek(Stream *, off_t, int);
  * .Xr feof 3
  * function.
  */
-extern int StreamEof(Stream *);
+extern bool StreamEof(Stream *);
 
 /**
  * Test the stream for an error condition, returning a boolean value
@@ -181,7 +183,7 @@ extern int StreamEof(Stream *);
  * .Xr ferror 3
  * function.
  */
-extern int StreamError(Stream *);
+extern bool StreamError(Stream *);
 
 /**
  * Clear the error condition associated with the given stream, allowing

include/Cytoplasm/Tls.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -46,7 +46,7 @@
  * .El
  */
 
-#include <Stream.h>
+#include "Stream.h"
 
 #define TLS_LIBRESSL 2
 #define TLS_OPENSSL 3

include/Cytoplasm/Uri.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

include/Cytoplasm/Util.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -42,8 +42,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-#include <Stream.h>
+#include "Stream.h"
-#include <UInt64.h>
 
 /**
  * Get the current timestamp in milliseconds since the Unix epoch. This
@@ -61,7 +60,7 @@
  * overflow before it even gets to this function, which will cause this
  * function to produce unexpected results.
  */
-extern UInt64 UtilServerTs(void);
+extern uint64_t UtilTsMillis(void);
 
 /**
  * Use
@@ -70,7 +69,7 @@ extern UInt64 UtilServerTs(void);
  * was an error getting the last modified time of a file. This is
  * primarily useful for caching file data.
  */
-extern UInt64 UtilLastModified(char *);
+extern uint64_t UtilLastModified(char *);
 
 /**
  * This function behaves just like the system call
@@ -86,7 +85,7 @@ extern int UtilMkdir(const char *, const mode_t);
  * .Xr nanosleep 2
  * to make its usage much, much simpler.
  */
-extern int UtilSleepMillis(UInt64);
+extern int UtilSleepMillis(uint64_t);
 
 /**
  * This function works identically to the POSIX
@@ -112,6 +111,6 @@ extern ssize_t UtilGetLine(char **, size_t *, Stream *);
  * .Fn pthread_self
  * to a number.
  */
-extern UInt32 UtilThreadNo(void);
+extern uint32_t UtilThreadNo(void);
 
 #endif                             /* CYTOPLASM_UTIL_H */

man/man1/http.1

@@ -0,0 +1,70 @@
+.Dd $Mdocdate: March 12 2023 $
+.Dt HTTP 1
+.Os Telodendria Project
+.Sh NAME
+.Nm http
+.Nd A simple command line utility for making HTTP requests.
+.Sh SYNOPSIS
+.Nm
+.Op Fl i
+.Op Fl X Ar method
+.Op Fl H Ar header
+.Op Fl d Ar data
+.Op URL
+.Sh DESCRIPTION
+.Nm
+Is a command line HTTP client. It is very heavily inspired by
+.Xr curl 1 ,
+and even uses the same flag names when possible. However,
+.Nm
+is designed to be much simpler than
+.Xr curl 1 ,
+and is built on Telodendria's own
+.Xr HttpClient 3
+API. It primarily exists to test
+.Xr HttpClient 3
+and
+.Xr HttpServer 3 ,
+and make development of Telodendria possible without having
+to install any external tools.
+.sp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl i
+Display the response headers before writing the body.
+.It Fl X Ar method
+Set the request method. This can be any of the options
+allowed by the
+.Xr Http 3
+API; unlike
+.Xr curl 1 ,
+it cannot be any arbitrary string.
+.It Fl H Ar header
+Set a request header, in the form of ``Header: value''. This option
+can be set multiple times to add multiple request headers.
+.It Fl d Ar data
+Send data to the server in the request body. If
+.Ar data
+starts with ``@'', then the file specified after is opened
+and read in. If it is ``@-'', then standard input is used.
+Otherwise, the string is passed to the server as-is.
+.El
+.Pp
+.Nm
+also requires a
+.Ar URL
+to make the request to. The URL is parsed by the
+.Xr Uri 3
+API, so consult that page for the syntax of URLs.
+.Sh EXIT STATUS
+.Nm
+exits with
+.Va EXIT_SUCCESS
+if all command line options were valid, the request was
+made successfully, and the server returns an HTTP code
+that indicates success. It exits with
+.Va EXIT_FAILURE
+in all other scenarios.
+.Sh SEE ALSO
+.Xr HttpClient 3 ,
+.Xr Uri 3

src/Args.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Array.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -38,12 +38,12 @@ struct Array
     size_t size;                   /* Elements actually filled */
 };
 
-int
+bool
 ArrayAdd(Array * array, void *value)
 {
     if (!array)
     {
-        return 0;
+        return false;
     }
 
     return ArrayInsert(array, array->size, value);
@@ -122,14 +122,14 @@ ArrayGet(Array * array, size_t index)
 }
 
 
-extern int
+bool
 ArrayInsert(Array * array, size_t index, void *value)
 {
     size_t i;
 
     if (!array || !value || index > array->size)
     {
-        return 0;
+        return false;
     }
 
     if (array->size >= array->allocated)
@@ -145,7 +145,7 @@ ArrayInsert(Array * array, size_t index, void *value)
         if (!array->entries)
         {
             array->entries = tmp;
-            return 0;
+            return false;
         }
 
         array->allocated = newSize;
@@ -160,7 +160,7 @@ ArrayInsert(Array * array, size_t index, void *value)
 
     array->entries[index] = value;
 
-    return 1;
+    return true;
 }
 
 extern void *
@@ -200,14 +200,14 @@ ArraySize(Array * array)
     return array->size;
 }
 
-int
+bool
 ArrayTrim(Array * array)
 {
     void **tmp;
 
     if (!array)
     {
-        return 0;
+        return false;
     }
 
     tmp = array->entries;
@@ -218,10 +218,10 @@ ArrayTrim(Array * array)
     if (!array->entries)
     {
         array->entries = tmp;
-        return 0;
+        return false;
     }
 
-    return 1;
+    return true;
 }
 
 static void
@@ -267,8 +267,9 @@ ArrayQuickSort(Array * array, size_t low, size_t high, int (*compare) (void *, v
 void
 ArraySort(Array * array, int (*compare) (void *, void *))
 {
-    if (!array)
+    if (!ArraySize(array))
     {
+        // If a NULL ptr was given, or the array has no elements, do nothing.
         return;
     }
     ArrayQuickSort(array, 0, array->size - 1, compare);

src/Base64.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -212,7 +212,7 @@ Base64Unpad(char *base64, size_t length)
     base64[length] = '\0';
 }
 
-extern int
+bool
 Base64Pad(char **base64Ptr, size_t length)
 {
     char *tmp;
@@ -221,7 +221,7 @@ Base64Pad(char **base64Ptr, size_t length)
 
     if (length % 4 == 0)
     {
-        return length;             /* Success: no padding needed */
+        return true;             /* Success: no padding needed */
     }
 
     newSize = length + (4 - (length % 4));
@@ -229,7 +229,7 @@ Base64Pad(char **base64Ptr, size_t length)
     tmp = Realloc(*base64Ptr, newSize + 100);;
     if (!tmp)
     {
-        return 0;                  /* Memory error */
+        return false;                  /* Memory error */
     }
     *base64Ptr = tmp;
 
@@ -240,5 +240,5 @@ Base64Pad(char **base64Ptr, size_t length)
 
     (*base64Ptr)[newSize] = '\0';
 
-    return newSize;
+    return true;
 }

src/Cron.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,32 +23,33 @@
  */
 #include <Cron.h>
 
-#include <UInt64.h>
 #include <Array.h>
 #include <Memory.h>
 #include <Util.h>
 
+#include <stdbool.h>
+
 #include <pthread.h>
 
 struct Cron
 {
-    UInt64 tick;
+    uint64_t tick;
     Array *jobs;
     pthread_mutex_t lock;
-    volatile unsigned int stop:1;
     pthread_t thread;
+    volatile bool stop;
 };
 
 typedef struct Job
 {
-    UInt64 interval;
+    uint64_t interval;
-    UInt64 lastExec;
+    uint64_t lastExec;
     JobFunc *func;
     void *args;
 } Job;
 
 static Job *
-JobCreate(UInt32 interval, JobFunc * func, void *args)
+JobCreate(uint64_t interval, JobFunc * func, void *args)
 {
     Job *job;
 
@@ -63,8 +64,8 @@ JobCreate(UInt32 interval, JobFunc * func, void *args)
         return NULL;
     }
 
-    job->interval = UInt64Create(0, interval);
+    job->interval = interval;
-    job->lastExec = UInt64Create(0, 0);
+    job->lastExec = 0;
     job->func = func;
     job->args = args;
 
@@ -79,51 +80,51 @@ CronThread(void *args)
     while (!cron->stop)
     {
         size_t i;
-        UInt64 ts;                 /* tick start */
+        uint64_t ts;                 /* tick start */
-        UInt64 te;                 /* tick end */
+        uint64_t te;                 /* tick end */
 
         pthread_mutex_lock(&cron->lock);
 
-        ts = UtilServerTs();
+        ts = UtilTsMillis();
 
         for (i = 0; i < ArraySize(cron->jobs); i++)
         {
             Job *job = ArrayGet(cron->jobs, i);
 
-            if (UInt64Gt(UInt64Sub(ts, job->lastExec), job->interval))
+            if ((ts - job->lastExec) > job->interval)
             {
                 job->func(job->args);
                 job->lastExec = ts;
             }
 
-            if (UInt64Eq(job->interval, UInt64Create(0, 0)))
+            if (!job->interval)
             {
                 ArrayDelete(cron->jobs, i);
                 Free(job);
             }
         }
-        te = UtilServerTs();
+        te = UtilTsMillis();
 
         pthread_mutex_unlock(&cron->lock);
 
-        /* Only sleep if the jobs didn't overrun the tick */
+        // Only sleep if the jobs didn't overrun the tick
-        if (UInt64Gt(cron->tick, UInt64Sub(te, ts)))
+        if (cron->tick > (te - ts))
         {
-            const UInt64 microTick = UInt64Create(0, 100);
+            const uint64_t microTick = 100;
 
-            UInt64 remainingTick = UInt64Sub(cron->tick, UInt64Sub(te, ts));
+            uint64_t remainingTick = cron->tick - (te - ts);
 
             /* Only sleep for microTick ms at a time because if the job
              * scheduler is supposed to stop before the tick is up, we
              * don't want to be stuck in a long sleep */
-            while (UInt64Geq(remainingTick, microTick) && !cron->stop)
+            while (remainingTick >= microTick && !cron->stop)
             {
                 UtilSleepMillis(microTick);
 
-                remainingTick = UInt64Sub(remainingTick, microTick);
+                remainingTick -= microTick;
             }
 
-            if (UInt64Neq(remainingTick, UInt64Create(0, 0)) && !cron->stop)
+            if (remainingTick && !cron->stop)
             {
                 UtilSleepMillis(remainingTick);
             }
@@ -134,7 +135,7 @@ CronThread(void *args)
 }
 
 Cron *
-CronCreate(UInt32 tick)
+CronCreate(uint64_t tick)
 {
     Cron *cron = Malloc(sizeof(Cron));
 
@@ -150,8 +151,8 @@ CronCreate(UInt32 tick)
         return NULL;
     }
 
-    cron->tick = UInt64Create(0, tick);
+    cron->tick = tick;
-    cron->stop = 1;
+    cron->stop = true;
 
     pthread_mutex_init(&cron->lock, NULL);
 
@@ -180,7 +181,7 @@ CronOnce(Cron * cron, JobFunc * func, void *args)
 }
 
 void
-CronEvery(Cron * cron, unsigned long interval, JobFunc * func, void *args)
+CronEvery(Cron * cron, uint64_t interval, JobFunc * func, void *args)
 {
     Job *job;
 
@@ -208,7 +209,7 @@ CronStart(Cron * cron)
         return;
     }
 
-    cron->stop = 0;
+    cron->stop = false;
 
     pthread_create(&cron->thread, NULL, CronThread, cron);
 }
@@ -221,7 +222,7 @@ CronStop(Cron * cron)
         return;
     }
 
-    cron->stop = 1;
+    cron->stop = true;
 
     pthread_join(cron->thread, NULL);
 }

src/Cytoplasm.c

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <Cytoplasm.h>
+
+int
+CytoplasmGetVersion(void)
+{
+    return CYTOPLASM_VERSION;
+}
+
+const char *
+CytoplasmGetVersionStr(void)
+{
+    return "v" STRINGIFY(CYTOPLASM_VERSION_MAJOR)
+           "." STRINGIFY(CYTOPLASM_VERSION_MINOR)
+           "." STRINGIFY(CYTOPLASM_VERSION_PATCH)
+#if CYTOPLASM_VERSION_ALPHA
+    "-alpha" STRINGIFY(CYTOPLASM_VERSION_ALPHA)
+#elif CYTOPLASM_VERSION_BETA
+    "-beta" STRINGIFY(CYTOPLASM_VERSION_BETA)
+#endif
+    ;
+}

src/Db.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,7 +23,6 @@
  */
 #include <Db.h>
 
-#include <UInt64.h>
 #include <Memory.h>
 #include <Json.h>
 #include <Util.h>
@@ -77,7 +76,7 @@ struct DbRef
 {
     HashMap *json;
 
-    UInt64 ts;
+    uint64_t ts;
     size_t size;
 
     Array *name;
@@ -219,19 +218,38 @@ DbHashKey(Array * args)
     return str;
 }
 
+static char
+DbSanitiseChar(char input)
+{
+    switch (input)
+    {
+        case '/':
+            return '_';
+        case '.':
+            return '-';
+    }
+    return input;
+}
+
 static char *
 DbDirName(Db * db, Array * args, size_t strip)
 {
-    size_t i;
+    size_t i, j;
     char *str = StrConcat(2, db->dir, "/");
 
     for (i = 0; i < ArraySize(args) - strip; i++)
     {
         char *tmp;
+        char *sanitise = StrDuplicate(ArrayGet(args, i));
+        for (j = 0; j < strlen(sanitise); j++)
+        {
+            sanitise[j] = DbSanitiseChar(sanitise[j]);
+        }
 
-        tmp = StrConcat(3, str, ArrayGet(args, i), "/");
+        tmp = StrConcat(3, str, sanitise, "/");
 
         Free(str);
+        Free(sanitise);
 
         str = tmp;
     }
@@ -254,17 +272,7 @@ DbFileName(Db * db, Array * args)
         /* Sanitize name to prevent directory traversal attacks */
         while (arg[j])
         {
-            switch (arg[j])
+            arg[j] = DbSanitiseChar(arg[j]);
-            {
-                case '/':
-                    arg[j] = '_';
-                    break;
-                case '.':
-                    arg[j] = '-';
-                    break;
-                default:
-                    break;
-            }
             j++;
         }
 
@@ -495,12 +503,12 @@ DbLockFromArr(Db * db, Array * args)
 
     if (ref)                       /* In cache */
     {
-        UInt64 diskTs = UtilLastModified(file);
+        uint64_t diskTs = UtilLastModified(file);
 
         ref->fd = fd;
         ref->stream = stream;
 
-        if (UInt64Gt(diskTs, ref->ts))
+        if (diskTs > ref->ts)
         {
             /* File was modified on disk since it was cached */
             HashMap *json = JsonDecode(ref->stream);
@@ -588,7 +596,7 @@ DbLockFromArr(Db * db, Array * args)
 
         if (db->cache)
         {
-            ref->ts = UtilServerTs();
+            ref->ts = UtilTsMillis();
             ref->size = DbComputeSize(ref->json);
             HashMapSet(db->cache, hash, ref);
             db->cacheSize += ref->size;
@@ -652,7 +660,7 @@ DbCreate(Db * db, size_t nArgs,...)
 
     file = DbFileName(db, args);
 
-    if (UInt64Neq(UtilLastModified(file), UInt64Create(0, 0)))
+    if (UtilLastModified(file))
     {
         Free(file);
         ArrayFree(args);
@@ -694,19 +702,19 @@ DbCreate(Db * db, size_t nArgs,...)
     return ret;
 }
 
-int
+bool
 DbDelete(Db * db, size_t nArgs,...)
 {
     va_list ap;
     Array *args;
     char *file;
     char *hash;
-    int ret = 1;
+    bool ret = true;
     DbRef *ref;
 
     if (!db)
     {
-        return 0;
+        return false;
     }
 
     va_start(ap, nArgs);
@@ -755,9 +763,9 @@ DbDelete(Db * db, size_t nArgs,...)
 
     Free(hash);
 
-    if (UInt64Neq(UtilLastModified(file), UInt64Create(0, 0)))
+    if (UtilLastModified(file))
     {
-        ret = remove(file) == 0;
+        ret = (remove(file) == 0);
     }
 
     pthread_mutex_unlock(&db->lock);
@@ -790,14 +798,14 @@ DbLock(Db * db, size_t nArgs,...)
     return ret;
 }
 
-int
+bool
 DbUnlock(Db * db, DbRef * ref)
 {
-    int destroy;
+    bool destroy;
 
     if (!db || !ref)
     {
-        return 0;
+        return false;
     }
 
     lseek(ref->fd, 0L, SEEK_SET);
@@ -806,7 +814,7 @@ DbUnlock(Db * db, DbRef * ref)
         pthread_mutex_unlock(&db->lock);
         Log(LOG_ERR, "Failed to truncate file on disk.");
         Log(LOG_ERR, "Error on fd %d: %s", ref->fd, strerror(errno));
-        return 0;
+        return false;
     }
 
     JsonEncode(ref->json, ref->stream, JSON_DEFAULT);
@@ -827,18 +835,18 @@ DbUnlock(Db * db, DbRef * ref)
              * require some items to be evicted. */
             DbCacheEvict(db);
 
-            destroy = 0;
+            destroy = false;
         }
         else
         {
-            destroy = 1;
+            destroy = true;
         }
 
         Free(key);
     }
     else
     {
-        destroy = 1;
+        destroy = true;
     }
 
     if (destroy)
@@ -850,16 +858,16 @@ DbUnlock(Db * db, DbRef * ref)
     }
 
     pthread_mutex_unlock(&db->lock);
-    return 1;
+    return true;
 }
 
-int
+bool
 DbExists(Db * db, size_t nArgs,...)
 {
     va_list ap;
     Array *args;
     char *file;
-    int ret;
+    bool ret;
 
     va_start(ap, nArgs);
     args = ArrayFromVarArgs(nArgs, ap);
@@ -867,13 +875,13 @@ DbExists(Db * db, size_t nArgs,...)
 
     if (!args)
     {
-        return 0;
+        return false;
     }
 
     pthread_mutex_lock(&db->lock);
 
     file = DbFileName(db, args);
-    ret = UInt64Neq(UtilLastModified(file), UInt64Create(0, 0));
+    ret = (UtilLastModified(file) != 0);
 
     pthread_mutex_unlock(&db->lock);
 
@@ -955,15 +963,15 @@ DbJson(DbRef * ref)
     return ref ? ref->json : NULL;
 }
 
-int
+bool
 DbJsonSet(DbRef * ref, HashMap * json)
 {
     if (!ref || !json)
     {
-        return 0;
+        return false;
     }
 
     JsonFree(ref->json);
     ref->json = JsonDuplicate(json);
-    return 1;
+    return true;
 }

src/Graph.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/HashMap.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -247,12 +247,12 @@ HashMapGet(HashMap * map, const char *key)
     return NULL;
 }
 
-int
+bool
 HashMapIterateReentrant(HashMap * map, char **key, void **value, size_t * i)
 {
     if (!map)
     {
-        return 0;
+        return false;
     }
 
     if (*i >= map->capacity)
@@ -260,7 +260,7 @@ HashMapIterateReentrant(HashMap * map, char **key, void **value, size_t * i)
         *i = 0;
         *key = NULL;
         *value = NULL;
-        return 0;
+        return false;
     }
 
     while (*i < map->capacity)
@@ -273,20 +273,20 @@ HashMapIterateReentrant(HashMap * map, char **key, void **value, size_t * i)
         {
             *key = bucket->key;
             *value = bucket->value;
-            return 1;
+            return true;
         }
     }
 
     *i = 0;
-    return 0;
+    return false;
 }
 
-int
+bool
 HashMapIterate(HashMap * map, char **key, void **value)
 {
     if (!map)
     {
-        return 0;
+        return false;
     }
     else
     {

src/HeaderParser.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Http.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/HttpClient.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -34,6 +34,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include <Cytoplasm.h>
 #include <Http.h>
 #include <Memory.h>
 #include <Util.h>
@@ -154,7 +155,7 @@ HttpRequest(HttpRequestMethod method, int flags, unsigned short port, char *host
                  HttpRequestMethodToString(method), path);
 
     HttpRequestHeader(context, "Connection", "close");
-    HttpRequestHeader(context, "User-Agent", LIB_NAME "/" LIB_VERSION);
+    HttpRequestHeader(context, "User-Agent", LIB_NAME "/" STRINGIFY(CYTOPLASM_VERSION));
     HttpRequestHeader(context, "Host", host);
 
     return context;

src/HttpRouter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,6 +23,7 @@
  */
 #include <HttpRouter.h>
 
+#include <Http.h>
 #include <Memory.h>
 #include <HashMap.h>
 #include <Str.h>
@@ -142,7 +143,7 @@ HttpRouterFree(HttpRouter * router)
     Free(router);
 }
 
-int
+bool
 HttpRouterAdd(HttpRouter * router, char *regPath, HttpRouteFunc * exec)
 {
     RouteNode *node;
@@ -151,19 +152,19 @@ HttpRouterAdd(HttpRouter * router, char *regPath, HttpRouteFunc * exec)
 
     if (!router || !regPath || !exec)
     {
-        return 0;
+        return false;
     }
 
     if (StrEquals(regPath, "/"))
     {
         router->root->exec = exec;
-        return 1;
+        return true;
     }
 
     regPath = StrDuplicate(regPath);
     if (!regPath)
     {
-        return 0;
+        return false;
     }
 
     tmp = regPath;
@@ -186,10 +187,10 @@ HttpRouterAdd(HttpRouter * router, char *regPath, HttpRouteFunc * exec)
 
     Free(regPath);
 
-    return 1;
+    return true;
 }
 
-int
+bool
 HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
 {
     RouteNode *node;
@@ -198,17 +199,17 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
     HttpRouteFunc *exec = NULL;
     Array *matches = NULL;
     size_t i;
-    int retval;
+    bool retval;
 
     if (!router || !path)
     {
-        return 0;
+        return false;
     }
 
     matches = ArrayCreate();
     if (!matches)
     {
-        return 0;
+        return false;
     }
 
     node = router->root;
@@ -228,6 +229,8 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
 
             regmatch_t pmatch[REG_MAX_SUB];
 
+            pathPart = HttpUrlDecode(pathPart);
+
             i = 0;
 
             while (HashMapIterateReentrant(node->children, &key, (void **) &val, &i))
@@ -243,6 +246,7 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
             if (!val)
             {
                 exec = NULL;
+                Free(pathPart);
                 break;
             }
 
@@ -269,13 +273,14 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
                     ArrayAdd(matches, substr);
                 }
             }
+            Free(pathPart);
         }
         Free(path);
     }
 
     if (!exec)
     {
-        retval = 0;
+        retval = false;
         goto finish;
     }
 
@@ -288,7 +293,7 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
         exec(matches, args);
     }
 
-    retval = 1;
+    retval = true;
 
 finish:
     for (i = 0; i < ArraySize(matches); i++)

src/HttpServer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -465,7 +465,7 @@ HttpServerWorkerThread(void *args)
         ssize_t i = 0;
         HttpRequestMethod requestMethod;
 
-        UInt64 firstRead;
+        uint64_t firstRead;
 
         fp = DequeueConnection(server);
 
@@ -473,7 +473,7 @@ HttpServerWorkerThread(void *args)
         {
             /* Block for 1 millisecond before continuing so we don't
              * murder the CPU if the queue is empty. */
-            UtilSleepMillis(UInt64Create(0, 1));
+            UtilSleepMillis(1);
             continue;
         }
 
@@ -483,21 +483,25 @@ HttpServerWorkerThread(void *args)
          * happens, UtilGetLine() sets errno to EAGAIN. If we get
          * EAGAIN, then clear the error on the stream and try again
          * after a few ms. This is typically more than enough time for
-         * the client to send data. */
+         * the client to send data.
-        firstRead = UtilServerTs();
+         *
+         * TODO: Instead of looping, abort immediately, and place the request
+         * at the end of the queue.
+         */
+        firstRead = UtilTsMillis();
         while ((lineLen = UtilGetLine(&line, &lineSize, fp)) == -1
                && errno == EAGAIN)
         {
             StreamClearError(fp);
 
-            /* If the server is stopped, or it's been a while, just
+            // If the server is stopped, or it's been a while, just
-             * give up so we aren't wasting a thread on this client. */
+            // give up so we aren't wasting a thread on this client.
-            if (server->stop || UInt64Gt(UInt64Sub(UtilServerTs(), firstRead), UInt64Create(0, 1000 * 30)))
+            if (server->stop || (UtilTsMillis() - firstRead) > (1000 * 30))
             {
                 goto finish;
             }
 
-            UtilSleepMillis(UInt64Create(0, 5));
+            UtilSleepMillis(5);
         }
 
         if (lineLen == -1)
@@ -711,25 +715,25 @@ HttpServerEventThread(void *args)
     return NULL;
 }
 
-int
+bool
 HttpServerStart(HttpServer * server)
 {
     if (!server)
     {
-        return 0;
+        return false;
     }
 
     if (server->isRunning)
     {
-        return 1;
+        return true;
     }
 
     if (pthread_create(&server->socketThread, NULL, HttpServerEventThread, server) != 0)
     {
-        return 0;
+        return false;
     }
 
-    return 1;
+    return true;
 }
 
 void

src/Int64.c

@@ -1,399 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include <Int64.h>
-
-#include <stddef.h>
-#include <signal.h>
-
-#include <Log.h>
-
-#ifdef INT64_NATIVE
-#define Int64Sign(x) ((int) (((UInt64) (x)) >> 63))
-#else
-#define Int64Sign(x) ((int) ((x).i[1] >> 31))
-#endif
-
-size_t
-Int64Str(Int64 x, int base, char *out, size_t len)
-{
-    static const char symbols[] = "0123456789ABCDEF";
-
-    size_t i = len - 1;
-    size_t j = 0;
-
-    int neg = Int64Sign(x);
-
-    Int64 base64 = Int64Create(0, base);
-
-    /* We only have symbols up to base 16 */
-    if (base < 2 || base > 16)
-    {
-        return 0;
-    }
-
-    /*
-     * This algorithm doesn't work on INT64_MIN.
-     *
-     * But it works on all other integers in the range, so we
-     * just scoot the range in by one for now. It's a hack and
-     * I'm not a huge fan of it, but this function is mostly
-     * used in Json, which shouldn't have a range this large
-     * anyway (Json is limited to -2^53 -> 2^53-1).
-     *
-     * Proper fixes are always welcome.
-     */
-    if (Int64Eq(x, Int64Create(0x80000000, 0x00000000)))
-    {
-        x = Int64Add(x, Int64Create(0, 1));
-    }
-#if 0
-    else if (Int64Eq(x, Int64Create(0x7FFFFFFF, 0xFFFFFFFF)))
-    {
-        x = Int64Sub(x, Int64Create(0, 1));
-    }
-#endif
-
-    if (base != 2 && base != 8 && base != 16 && neg)
-    {
-        x = Int64Neg(x);
-    }
-
-    do
-    {
-        Int64 mod = Int64Rem(x, base64);
-        Int32 low = Int64Low(mod);
-
-        out[i] = symbols[low];
-        i--;
-        x = Int64Div(x, base64);
-    } while (Int64Gt(x, Int64Create(0, 0)));
-
-    if (base != 2 && base != 8 && base != 16)
-    {
-        /*
-         * Binary, octal, and hexadecimal are known to
-         * be bit representations. Everything else (notably
-         * decimal) should include the negative sign.
-         */
-        if (neg)
-        {
-            out[i] = '-';
-            i--;
-        }
-    }
-
-    while (++i < len)
-    {
-        out[j++] = out[i];
-    }
-
-    out[j] = '\0';
-
-    return j;
-}
-
-#ifndef INT64_NATIVE
-
-/* No native 64-bit support, add our own */
-
-Int64
-Int64Create(UInt32 high, UInt32 low)
-{
-    Int64 x;
-
-    x.i[0] = low;
-    x.i[1] = high;
-
-    return x;
-}
-
-Int64
-Int64Add(Int64 x, Int64 y)
-{
-    Int64 z = Int64Create(0, 0);
-    int carry;
-
-    z.i[0] = x.i[0] + y.i[0];
-    carry = z.i[0] < x.i[0];
-    z.i[1] = x.i[1] + y.i[1] + carry;
-
-    return z;
-}
-
-Int64
-Int64Sub(Int64 x, Int64 y)
-{
-    return Int64Add(x, Int64Neg(y));
-}
-
-Int64
-Int64Mul(Int64 x, Int64 y)
-{
-    Int64 z = Int64Create(0, 0);
-
-    int xneg = Int64Sign(x);
-    int yneg = Int64Sign(y);
-
-    if (xneg)
-    {
-        x = Int64Neg(x);
-    }
-
-    if (yneg)
-    {
-        y = Int64Neg(y);
-    }
-
-    /* while (y > 0) */
-    while (Int64Gt(y, Int64Create(0, 0)))
-    {
-        /* if (y & 1 != 0) */
-        if (Int64Neq(Int64And(y, Int64Create(0, 1)), Int64Create(0, 0)))
-        {
-            z = Int64Add(z, x);
-        }
-
-        x = Int64Sll(x, 1);
-        y = Int64Sra(y, 1);
-    }
-
-    if (xneg != yneg)
-    {
-        z = Int64Neg(z);
-    }
-
-    return z;
-}
-
-typedef struct
-{
-    Int64 q;
-    Int64 r;
-} Int64Ldiv;
-
-static Int64Ldiv
-Int64LongDivision(Int64 n, Int64 d)
-{
-    Int64Ldiv o;
-
-    int i;
-
-    int nneg = Int64Sign(n);
-    int dneg = Int64Sign(d);
-
-    o.q = Int64Create(0, 0);
-    o.r = Int64Create(0, 0);
-
-    if (Int64Eq(d, Int64Create(0, 0)))
-    {
-        raise(SIGFPE);
-        return o;
-    }
-
-    if (nneg)
-    {
-        n = Int64Neg(n);
-    }
-
-    if (dneg)
-    {
-        d = Int64Neg(d);
-    }
-
-    for (i = 63; i >= 0; i--)
-    {
-        Int64 bit = Int64And(Int64Sra(n, i), Int64Create(0, 1));
-
-        o.r = Int64Sll(o.r, 1);
-        o.r = Int64Or(o.r, bit);
-
-        if (Int64Geq(o.r, d))
-        {
-            o.r = Int64Sub(o.r, d);
-            o.q = Int64Or(o.q, Int64Sll(Int64Create(0, 1), i));
-        }
-    }
-
-    if (nneg != dneg)
-    {
-        o.r = Int64Neg(o.r);
-        o.q = Int64Neg(o.q);
-    }
-
-    return o;
-}
-
-Int64
-Int64Div(Int64 x, Int64 y)
-{
-    return Int64LongDivision(x, y).q;
-}
-
-Int64
-Int64Rem(Int64 x, Int64 y)
-{
-    return Int64LongDivision(x, y).r;
-}
-
-Int64
-Int64Sll(Int64 x, int y)
-{
-    Int64 z;
-
-    if (!y)
-    {
-        return x;
-    }
-
-    z = Int64Create(0, 0);
-
-    if (y < 32)
-    {
-        z.i[1] = (x.i[0] >> (32 - y)) | (x.i[1] << y);
-        z.i[0] = x.i[0] << y;
-    }
-    else
-    {
-        z.i[1] = x.i[0] << (y - 32);
-    }
-
-    return z;
-}
-
-Int64
-Int64Sra(Int64 x, int y)
-{
-    Int64 z;
-
-    int neg = Int64Sign(x);
-
-    if (!y)
-    {
-        return x;
-    }
-
-    z = Int64Create(0, 0);
-
-    if (y < 32)
-    {
-        z.i[0] = (x.i[1] << (32 - y)) | (x.i[0] >> y);
-        z.i[1] = x.i[1] >> y;
-    }
-    else
-    {
-        z.i[0] = x.i[1] >> (y - 32);
-    }
-
-    if (neg)
-    {
-        Int64 mask = Int64Create(0xFFFFFFFF, 0xFFFFFFFF);
-
-        z = Int64Or(Int64Sll(mask, (64 - y)), z);
-    }
-
-    return z;
-}
-
-Int64
-Int64And(Int64 x, Int64 y)
-{
-    return Int64Create(x.i[1] & y.i[1], x.i[0] & y.i[0]);
-}
-
-Int64
-Int64Or(Int64 x, Int64 y)
-{
-    return Int64Create(x.i[1] | y.i[1], x.i[0] | y.i[0]);
-}
-
-Int64
-Int64Xor(Int64 x, Int64 y)
-{
-    return Int64Create(x.i[1] ^ y.i[1], x.i[0] ^ y.i[0]);
-}
-
-Int64
-Int64Not(Int64 x)
-{
-    return Int64Create(~(x.i[1]), ~(x.i[0]));
-}
-
-int
-Int64Eq(Int64 x, Int64 y)
-{
-    return x.i[0] == y.i[0] && x.i[1] == y.i[1];
-}
-
-int
-Int64Lt(Int64 x, Int64 y)
-{
-    int xneg = Int64Sign(x);
-    int yneg = Int64Sign(y);
-
-    if (xneg != yneg)
-    {
-        return xneg > yneg;
-    }
-    else
-    {
-        if (xneg)
-        {
-            /* Both negative */
-            return x.i[1] > y.i[1] || (x.i[1] == y.i[1] && x.i[0] > y.i[0]);
-        }
-        else
-        {
-            /* Both positive */
-            return x.i[1] < y.i[1] || (x.i[1] == y.i[1] && x.i[0] < y.i[0]);
-        }
-    }
-}
-
-int
-Int64Gt(Int64 x, Int64 y)
-{
-    int xneg = Int64Sign(x);
-    int yneg = Int64Sign(y);
-
-    if (xneg != yneg)
-    {
-        return xneg < yneg;
-    }
-    else
-    {
-        if (xneg)
-        {
-            /* Both negative */
-            return x.i[1] < y.i[1] || (x.i[1] == y.i[1] && x.i[0] < y.i[0]);
-        }
-        else
-        {
-            /* Both positive */
-            return x.i[1] > y.i[1] || (x.i[1] == y.i[1] && x.i[0] > y.i[0]);
-        }
-    }
-
-}
-
-#endif

src/Io.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Io/IoFd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Io/IoFile.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Json.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -26,14 +26,15 @@
 #include <Memory.h>
 #include <Str.h>
 #include <Util.h>
-#include <Int.h>
-#include <Int64.h>
 
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
 #include <errno.h>
 
 struct JsonValue
@@ -44,9 +45,9 @@ struct JsonValue
         HashMap *object;
         Array *array;
         char *string;
-        Int64 integer;
+        uint64_t integer;
         double floating;
-        int boolean:1;
+        bool boolean;
     } as;
 };
 
@@ -201,7 +202,7 @@ JsonValueAsString(JsonValue * value)
 }
 
 JsonValue *
-JsonValueInteger(Int64 integer)
+JsonValueInteger(uint64_t integer)
 {
     JsonValue *value;
 
@@ -217,12 +218,12 @@ JsonValueInteger(Int64 integer)
     return value;
 }
 
-Int64
+uint64_t
 JsonValueAsInteger(JsonValue * value)
 {
     if (!value || value->type != JSON_INTEGER)
     {
-        return Int64Create(0, 0);
+        return 0;
     }
 
     return value->as.integer;
@@ -258,7 +259,7 @@ JsonValueAsFloat(JsonValue * value)
 }
 
 JsonValue *
-JsonValueBoolean(int boolean)
+JsonValueBoolean(bool boolean)
 {
     JsonValue *value;
 
@@ -274,12 +275,12 @@ JsonValueBoolean(int boolean)
     return value;
 }
 
-int
+bool
 JsonValueAsBoolean(JsonValue * value)
 {
     if (!value || value->type != JSON_BOOLEAN)
     {
-        return 0;
+        return false;
     }
 
     return value->as.boolean;
@@ -335,12 +336,12 @@ JsonValueFree(JsonValue * value)
     Free(value);
 }
 
-int
+size_t
 JsonEncodeString(const char *str, Stream * out)
 {
     size_t i;
     char c;
-    int length = 0;
+    size_t length = 0;
 
     StreamPutc(out, '"');
     length++;
@@ -403,9 +404,9 @@ JsonDecodeString(Stream * in)
     int c;
     char a[5];
 
-    UInt32 codepoint;
+    uint32_t codepoint;
-    UInt16 high;
+    uint16_t high;
-    UInt16 low;
+    uint16_t low;
 
     char *utf8Ptr;
 
@@ -598,15 +599,13 @@ JsonDecodeString(Stream * in)
     return NULL;
 }
 
-int
+size_t
 JsonEncodeValue(JsonValue * value, Stream * out, int level)
 {
     size_t i;
     size_t len;
     Array *arr;
-    int length = 0;
+    size_t length = 0;
-
-    char ibuf[INT64_STRBUF];
 
     switch (value->type)
     {
@@ -644,8 +643,7 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level)
             length += JsonEncodeString(value->as.string, out);
             break;
         case JSON_INTEGER:
-            Int64Str(value->as.integer, 10, ibuf, INT64_STRBUF);
+            length += StreamPrintf(out, "%" PRId64, value->as.integer);
-            length += StreamPrintf(out, "%s", ibuf);
             break;
         case JSON_FLOAT:
             length += StreamPrintf(out, "%f", value->as.floating);
@@ -673,14 +671,14 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level)
     return length;
 }
 
-int
+size_t
 JsonEncode(HashMap * object, Stream * out, int level)
 {
     size_t index;
     size_t count;
     char *key;
     JsonValue *value;
-    int length;
+    size_t length;
 
     if (!object)
     {
@@ -863,6 +861,7 @@ JsonConsumeWhitespace(JsonParserState * state)
             break;
         }
 
+        // TODO: This logic should be moved into Stream as a sync function.
         if (StreamError(state->stream))
         {
             if (errno == EAGAIN)
@@ -876,7 +875,7 @@ JsonConsumeWhitespace(JsonParserState * state)
                 }
                 else
                 {
-                    UtilSleepMillis(UInt64Create(0, delay));
+                    UtilSleepMillis(delay);
                     continue;
                 }
             }
@@ -1123,7 +1122,7 @@ JsonDecodeValue(JsonParserState * state)
     JsonValue *value;
     char *strValue;
 
-    Int64 iValue;
+    int64_t iValue;
     size_t i;
     int neg;
 
@@ -1146,7 +1145,7 @@ JsonDecodeValue(JsonParserState * state)
             Free(strValue);
             break;
         case TOKEN_INTEGER:
-            iValue = Int64Create(0, 0);
+            iValue = 0;
             i = 0;
             neg = 0;
 
@@ -1162,14 +1161,14 @@ JsonDecodeValue(JsonParserState * state)
                 }
 
                 d = state->token[i] - '0';
-                iValue = Int64Mul(iValue, Int64Create(0, 10));
+                iValue *= 10;
-                iValue = Int64Add(iValue, Int64Create(0, d));
+                iValue += d;
                 i++;
             }
 
             if (neg)
             {
-                iValue = Int64Neg(iValue);
+                iValue *= -1;
             }
             value = JsonValueInteger(iValue);
             break;
@@ -1433,3 +1432,32 @@ finish:
     va_end(argp);
     return val;
 }
+
+void
+JsonMerge(HashMap *obj1, HashMap *obj2)
+{
+    char *key;
+    JsonValue *val2;
+
+    while (HashMapIterate(obj2, &key, (void **) &val2))
+    {
+        JsonValue *val1 = HashMapGet(obj1, key);
+
+        if (val1)
+        {
+            if (JsonValueType(val1) == JsonValueType(val2) &&
+                JsonValueType(val1) == JSON_OBJECT)
+            {
+                JsonMerge(JsonValueAsObject(val1), JsonValueAsObject(val2));
+            }
+            else
+            {
+                JsonValueFree(HashMapSet(obj1, key, JsonValueDuplicate(val2)));
+            }
+        }
+        else
+        {
+            HashMapSet(obj1, key, JsonValueDuplicate(val2));
+        }
+    }
+}

src/Log.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Memory.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -32,8 +32,6 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include <Int.h>
-
 #ifndef MEMORY_TABLE_CHUNK
 #define MEMORY_TABLE_CHUNK 256
 #endif
@@ -50,12 +48,12 @@ struct MemoryInfo
     void *pointer;
 };
 
-#define MEM_BOUND_TYPE UInt32
+#define MEM_BOUND_TYPE uint32_t
 #define MEM_BOUND 0xDEADBEEF
 
 #define MEM_BOUND_LOWER(p) *((MEM_BOUND_TYPE *) p)
-#define MEM_BOUND_UPPER(p, x) *(((MEM_BOUND_TYPE *) (((UInt8 *) p) + x)) + 1)
+#define MEM_BOUND_UPPER(p, x) *(((MEM_BOUND_TYPE *) (((uint8_t *) p) + x)) + 1)
-#define MEM_SIZE_ACTUAL(x) (((x) * sizeof(UInt8)) + (2 * sizeof(MEM_BOUND_TYPE)))
+#define MEM_SIZE_ACTUAL(x) (((x) * sizeof(uint8_t)) + (2 * sizeof(MEM_BOUND_TYPE)))
 
 static pthread_mutex_t lock;
 static void (*hook) (MemoryAction, MemoryInfo *, void *) = MemoryDefaultHook;

src/Queue.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -75,39 +75,39 @@ QueueFree(Queue * q)
     Free(q);
 }
 
-int
+bool
 QueueFull(Queue * q)
 {
     if (!q)
     {
-        return 0;
+        return false;
     }
 
     return ((q->front == q->rear + 1) || (q->front == 0 && q->rear == q->size - 1));
 }
 
-int
+bool
 QueueEmpty(Queue * q)
 {
     if (!q)
     {
-        return 0;
+        return false;
     }
 
-    return q->front == q->size + 1;
+    return (q->front == (q->size + 1));
 }
 
-int
+bool
 QueuePush(Queue * q, void *element)
 {
     if (!q || !element)
     {
-        return 0;
+        return false;
     }
 
     if (QueueFull(q))
     {
-        return 0;
+        return false;
     }
 
     if (q->front == q->size + 1)
@@ -126,7 +126,7 @@ QueuePush(Queue * q, void *element)
 
     q->items[q->rear] = element;
 
-    return 1;
+    return true;
 }
 
 void *

src/Rand.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,12 +23,12 @@
  */
 #include <Rand.h>
 
-#include <Int.h>
-#include <UInt64.h>
 #include <Util.h>
 #include <Memory.h>
 
 #include <stdlib.h>
+#include <stdbool.h>
+
 #include <pthread.h>
 #include <unistd.h>
 
@@ -42,12 +42,12 @@
 
 typedef struct RandState
 {
-    UInt32 mt[RAND_STATE_VECTOR_LENGTH];
+    uint32_t mt[RAND_STATE_VECTOR_LENGTH];
     int index;
 } RandState;
 
 static void
-RandSeed(RandState * state, UInt32 seed)
+RandSeed(RandState * state, uint32_t seed)
 {
     state->mt[0] = seed & 0xFFFFFFFF;
 
@@ -57,12 +57,12 @@ RandSeed(RandState * state, UInt32 seed)
     }
 }
 
-static UInt32
+static uint32_t
 RandGenerate(RandState * state)
 {
-    static const UInt32 mag[2] = {0x0, 0x9908B0DF};
+    static const uint32_t mag[2] = {0x0, 0x9908B0DF};
 
-    UInt32 result;
+    uint32_t result;
 
     if (state->index >= RAND_STATE_VECTOR_LENGTH || state->index < 0)
     {
@@ -118,22 +118,22 @@ RandDestructor(void *p)
 /* This algorithm therefore computes N random numbers generally in O(N)
  * time, while being less biased. */
 void
-RandIntN(int *buf, size_t size, unsigned int max)
+RandIntN(uint32_t *buf, size_t size, uint32_t max)
 {
     static pthread_key_t stateKey;
-    static int createdKey = 0;
+    static bool createdKey = false;
 
     /* Limit the range to banish all previously biased results */
-    const int allowed = RAND_MAX - RAND_MAX % max;
+    const uint32_t allowed = RAND_MAX - RAND_MAX % max;
 
     RandState *state;
-    int tmp;
+    uint32_t tmp;
     size_t i;
 
     if (!createdKey)
     {
         pthread_key_create(&stateKey, RandDestructor);
-        createdKey = 1;
+        createdKey = true;
     }
 
     state = pthread_getspecific(stateKey);
@@ -141,8 +141,8 @@ RandIntN(int *buf, size_t size, unsigned int max)
     if (!state)
     {
         /* Generate a seed from the system time, PID, and TID */
-        UInt64 ts = UtilServerTs();
+        uint64_t ts = UtilTsMillis();
-        UInt32 seed = UInt64Low(ts) ^ getpid() ^ (unsigned long) pthread_self();
+        uint32_t seed = ts ^ getpid() ^ (unsigned long) pthread_self();
 
         state = Malloc(sizeof(RandState));
         RandSeed(state, seed);
@@ -164,10 +164,10 @@ RandIntN(int *buf, size_t size, unsigned int max)
 }
 
 /* Generate just 1 random number */
-int
+uint32_t
-RandInt(unsigned int max)
+RandInt(uint32_t max)
 {
-    int val = 0;
+    uint32_t val = 0;
 
     RandIntN(&val, 1, max);
     return val;

src/RtStub.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Runtime.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -38,11 +38,11 @@ HexDump(size_t off, char *hexBuf, char *asciiBuf, void *args)
 
     if (hexBuf && asciiBuf)
     {
-        fprintf(report, "%04lx: %s | %s |\n", off, hexBuf, asciiBuf);
+        fprintf(report, "%04zx: %s | %s |\n", off, hexBuf, asciiBuf);
     }
     else
     {
-        fprintf(report, "%04lx\n", off);
+        fprintf(report, "%04zx\n", off);
     }
 }
 
@@ -52,7 +52,7 @@ MemoryIterator(MemoryInfo * i, void *args)
 {
     FILE *report = args;
 
-    fprintf(report, "%s:%d: %lu bytes at %p\n",
+    fprintf(report, "%s:%d: %zu bytes at %p\n",
             MemoryInfoGetFile(i), MemoryInfoGetLine(i),
             MemoryInfoGetSize(i), MemoryInfoGetPointer(i));
 
@@ -107,7 +107,7 @@ GenerateMemoryReport(int argc, char **argv)
         fprintf(report, " '%s'", argv[i]);
     }
     fprintf(report, "\nDate: %s\n", tsBuffer);
-    fprintf(report, "Total Bytes: %lu\n", MemoryAllocated());
+    fprintf(report, "Total Bytes: %zu\n", MemoryAllocated());
     fprintf(report, "\n");
 
     MemoryIterate(MemoryIterator, report);

src/Sha.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Sha/Sha1.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,7 +23,6 @@
  */
 #include <Sha.h>
 #include <Memory.h>
-#include <Int.h>
 
 #include <string.h>
 
@@ -31,10 +30,10 @@
 
 #define LOAD32H(x, y) \
 	{ \
-		x = ((UInt32)((y)[0] & 255) << 24) | \
+		x = ((uint32_t)((y)[0] & 255) << 24) | \
-			((UInt32)((y)[1] & 255) << 16) | \
+			((uint32_t)((y)[1] & 255) << 16) | \
-			((UInt32)((y)[2] & 255) <<  8) | \
+			((uint32_t)((y)[2] & 255) <<  8) | \
-			((UInt32)((y)[3] & 255));        \
+			((uint32_t)((y)[3] & 255));        \
 	}
 
 #define ROL(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
@@ -49,22 +48,22 @@
 
 typedef union
 {
-    UInt8 c[64];
+    uint8_t c[64];
-    UInt32 l[16];
+    uint32_t l[16];
 } Char64Long16;
 
 typedef struct
 {
-    UInt32 state[5];
+    uint32_t state[5];
-    UInt32 count[2];
+    uint32_t count[2];
-    UInt8 buffer[64];
+    uint8_t buffer[64];
 } Sha1Context;
 
 static void
-Sha1Transform(UInt32 state[5], const UInt8 buffer[64])
+Sha1Transform(uint32_t state[5], const uint8_t *buffer)
 {
-    UInt32 a, b, c, d, e, i;
+    uint32_t a, b, c, d, e, i;
-    UInt8 workspace[64];
+    uint8_t workspace[64];
     Char64Long16 *block = (Char64Long16 *) workspace;
 
     for (i = 0; i < 16; i++)
@@ -180,9 +179,9 @@ Sha1Init(Sha1Context * ctx)
 }
 
 static void
-Sha1Update(Sha1Context * ctx, const void *buf, UInt32 size)
+Sha1Update(Sha1Context * ctx, const void *buf, uint32_t size)
 {
-    UInt32 i, j;
+    uint32_t i, j;
 
     j = (ctx->count[0] >> 3) & 63;
 
@@ -202,7 +201,7 @@ Sha1Update(Sha1Context * ctx, const void *buf, UInt32 size)
 
         for (; i + 63 < size; i += 64)
         {
-            Sha1Transform(ctx->state, (UInt8 *) buf + i);
+            Sha1Transform(ctx->state, (uint8_t *) buf + i);
         }
 
         j = 0;
@@ -212,14 +211,14 @@ Sha1Update(Sha1Context * ctx, const void *buf, UInt32 size)
         i = 0;
     }
 
-    memcpy(&ctx->buffer[j], &((UInt8 *) buf)[i], size - i);
+    memcpy(&ctx->buffer[j], &((uint8_t *) buf)[i], size - i);
 }
 
 static void
 Sha1Calculate(Sha1Context * ctx, unsigned char *out)
 {
-    UInt32 i;
+    uint32_t i;
-    UInt8 count[8];
+    uint8_t count[8];
 
     for (i = 0; i < 8; i++)
     {
@@ -227,16 +226,16 @@ Sha1Calculate(Sha1Context * ctx, unsigned char *out)
                                      >> ((3 - (i & 3)) * 8)) & 255);
     }
 
-    Sha1Update(ctx, (UInt8 *) "\x80", 1);
+    Sha1Update(ctx, (uint8_t *) "\x80", 1);
     while ((ctx->count[0] & 504) != 448)
     {
-        Sha1Update(ctx, (UInt8 *) "\0", 1);
+        Sha1Update(ctx, (uint8_t *) "\0", 1);
     }
 
     Sha1Update(ctx, count, 8);
     for (i = 0; i < (160 / 8); i++)
     {
-        out[i] = (UInt8) ((ctx->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
+        out[i] = (uint8_t) ((ctx->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
     }
 }
 

src/Sha/Sha256.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -23,7 +23,6 @@
  */
 #include <Sha.h>
 #include <Memory.h>
-#include <Int.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -31,10 +30,10 @@
 #include <limits.h>
 
 #define GET_UINT32(x) \
-    (((UInt32)(x)[0] << 24) | \
+    (((uint32_t)(x)[0] << 24) | \
-     ((UInt32)(x)[1] << 16) | \
+     ((uint32_t)(x)[1] << 16) | \
-     ((UInt32)(x)[2] << 8) | \
+     ((uint32_t)(x)[2] << 8) | \
-     ((UInt32)(x)[3]))
+     ((uint32_t)(x)[3]))
 
 #define PUT_UINT32(dst, x) { \
     (dst)[0] = (x) >> 24; \
@@ -56,8 +55,8 @@
 #define WW(i) (w[i] = w[i - 16] + S0(w[i - 15]) + w[i - 7] + S1(w[i - 2]))
 
 #define ROUND(a, b, c, d, e, f, g, h, k, w) { \
-    UInt32 tmp0 = h + T0(e) + CH(e, f, g) + k + w; \
+    uint32_t tmp0 = h + T0(e) + CH(e, f, g) + k + w; \
-    UInt32 tmp1 = T1(a) + MAJ(a, b, c); \
+    uint32_t tmp1 = T1(a) + MAJ(a, b, c); \
     h = tmp0 + tmp1; \
     d += tmp0; \
 }
@@ -65,7 +64,7 @@
 typedef struct Sha256Context
 {
     size_t length;
-    UInt32 state[8];
+    uint32_t state[8];
     size_t bufLen;
     unsigned char buffer[64];
 } Sha256Context;
@@ -73,7 +72,7 @@ typedef struct Sha256Context
 static void
 Sha256Chunk(Sha256Context * context, unsigned char chunk[64])
 {
-    const UInt32 rk[64] = {
+    const uint32_t rk[64] = {
         0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
         0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
         0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
@@ -87,8 +86,8 @@ Sha256Chunk(Sha256Context * context, unsigned char chunk[64])
         0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
     };
 
-    UInt32 w[64];
+    uint32_t w[64];
-    UInt32 a, b, c, d, e, f, g, h;
+    uint32_t a, b, c, d, e, f, g, h;
 
     int i;
 
@@ -178,10 +177,10 @@ Sha256(char *str)
     unsigned char *out;
 
     unsigned char fill[64];
-    UInt32 fillLen;
+    uint32_t fillLen;
     unsigned char buf[8];
-    UInt32 hiLen;
+    uint32_t hiLen;
-    UInt32 loLen;
+    uint32_t loLen;
 
     if (!str)
     {
@@ -213,8 +212,8 @@ Sha256(char *str)
     fill[0] = 0x80;
 
     fillLen = (context.bufLen < 56) ? 56 - context.bufLen : 120 - context.bufLen;
-    hiLen = (UInt32) (context.length >> 29);
+    hiLen = (uint32_t) (context.length >> 29);
-    loLen = (UInt32) (context.length << 3);
+    loLen = (uint32_t) (context.length << 3);
 
     PUT_UINT32(&buf[0], hiLen);
     PUT_UINT32(&buf[4], loLen);

src/Str.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -26,7 +26,6 @@
 #include <Memory.h>
 #include <Util.h>
 #include <Rand.h>
-#include <Int.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -35,8 +34,8 @@
 #include <pthread.h>
 #include <unistd.h>
 
-UInt32
+uint32_t
-StrUtf16Decode(UInt16 high, UInt16 low)
+StrUtf16Decode(uint16_t high, uint16_t low)
 {
     if (high <= 0xD7FF)
     {
@@ -56,7 +55,7 @@ StrUtf16Decode(UInt16 high, UInt16 low)
 }
 
 char *
-StrUtf8Encode(UInt32 codepoint)
+StrUtf8Encode(uint32_t codepoint)
 {
     char *str;
 
@@ -220,10 +219,10 @@ StrConcat(size_t nStr,...)
     return str;
 }
 
-int
+bool
 StrBlank(const char *str)
 {
-    int blank = 1;
+    bool blank = true;
     size_t i = 0;
 
     while (str[i])
@@ -245,7 +244,7 @@ StrRandom(size_t len)
     static const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
     char *str;
-    int *nums;
+    uint32_t *nums;
     size_t i;
 
     if (!len)
@@ -260,7 +259,7 @@ StrRandom(size_t len)
         return NULL;
     }
 
-    nums = Malloc(len * sizeof(int));
+    nums = Malloc(len * sizeof(uint32_t));
     if (!nums)
     {
         Free(str);
@@ -323,21 +322,21 @@ StrLower(char *str)
     return ret;
 }
 
-int
+bool
 StrEquals(const char *str1, const char *str2)
 {
     /* Both strings are NULL, they're equal */
     if (!str1 && !str2)
     {
-        return 1;
+        return true;
     }
 
     /* One or the other is NULL, they're not equal */
     if (!str1 || !str2)
     {
-        return 0;
+        return false;
     }
 
     /* Neither are NULL, do a regular string comparison */
-    return strcmp(str1, str2) == 0;
+    return (strcmp(str1, str2) == 0);
 }

src/Stream.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -26,7 +26,6 @@
 #include <Io.h>
 #include <Memory.h>
 #include <Util.h>
-#include <Int.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,11 +49,11 @@ struct Stream
 {
     Io *io;
 
-    UInt8 *rBuf;
+    uint8_t *rBuf;
     size_t rLen;
     size_t rOff;
 
-    UInt8 *wBuf;
+    uint8_t *wBuf;
     size_t wLen;
 
     char *ugBuf;
@@ -550,13 +549,13 @@ StreamSeek(Stream * stream, off_t offset, int whence)
     return result;
 }
 
-int
+bool
 StreamEof(Stream * stream)
 {
     return stream && (stream->flags & STREAM_EOF);
 }
 
-int
+bool
 StreamError(Stream * stream)
 {
     return stream && (stream->flags & STREAM_ERR);
@@ -626,7 +625,7 @@ StreamCopy(Stream * in, Stream * out)
                 }
                 else
                 {
-                    UtilSleepMillis(UInt64Create(0, STREAM_DELAY));
+                    UtilSleepMillis(STREAM_DELAY);
                     continue;
                 }
             }

src/Tls.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Tls/TlsLibreSSL.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Tls/TlsOpenSSL.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -295,9 +295,7 @@ TlsClose(void *cookie)
     SSL_free(ssl->ssl);
     SSL_CTX_free(ssl->ctx);
 
-#if 0
     close(ssl->fd);
-#endif
 
     Free(ssl);
 

src/UInt64.c

@@ -1,265 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include <UInt64.h>
-
-#include <stddef.h>
-#include <signal.h>
-
-size_t
-UInt64Str(UInt64 x, int base, char *out, size_t len)
-{
-    static const char symbols[] = "0123456789ABCDEF";
-
-    size_t i = len - 1;
-    size_t j = 0;
-
-    UInt64 base64 = UInt64Create(0, base);
-
-    /* We only have symbols up to base 16 */
-    if (base < 2 || base > 16)
-    {
-        return 0;
-    }
-
-    do
-    {
-        UInt64 mod = UInt64Rem(x, base64);
-        UInt32 low = UInt64Low(mod);
-
-        out[i] = symbols[low];
-        i--;
-        x = UInt64Div(x, base64);
-    } while (UInt64Gt(x, UInt64Create(0, 0)));
-
-    while (++i < len)
-    {
-        out[j++] = out[i];
-    }
-
-    out[j] = '\0';
-
-    return j;
-}
-
-#ifndef UINT64_NATIVE
-
-/* No native 64-bit support, add our own */
-
-UInt64
-UInt64Create(UInt32 high, UInt32 low)
-{
-    UInt64 x;
-
-    x.i[0] = low;
-    x.i[1] = high;
-
-    return x;
-}
-
-UInt64
-UInt64Add(UInt64 x, UInt64 y)
-{
-    UInt64 z = UInt64Create(0, 0);
-    int carry;
-
-    z.i[0] = x.i[0] + y.i[0];
-    carry = z.i[0] < x.i[0];
-    z.i[1] = x.i[1] + y.i[1] + carry;
-
-    return z;
-}
-
-UInt64
-UInt64Sub(UInt64 x, UInt64 y)
-{
-    UInt64 twosCompl = UInt64Add(UInt64Not(y), UInt64Create(0, 1));
-
-    return UInt64Add(x, twosCompl);
-}
-
-UInt64
-UInt64Mul(UInt64 x, UInt64 y)
-{
-    UInt64 z = UInt64Create(0, 0);
-
-    /* while (y > 0) */
-    while (UInt64Gt(y, UInt64Create(0, 0)))
-    {
-        /* if (y & 1 != 0) */
-        if (UInt64Neq(UInt64And(y, UInt64Create(0, 1)), UInt64Create(0, 0)))
-        {
-            z = UInt64Add(z, x);
-        }
-
-        x = UInt64Sll(x, 1);
-        y = UInt64Srl(y, 1);
-    }
-
-    return z;
-}
-
-typedef struct
-{
-    UInt64 q;
-    UInt64 r;
-} UInt64Ldiv;
-
-static UInt64Ldiv
-UInt64LongDivision(UInt64 n, UInt64 d)
-{
-    UInt64Ldiv o;
-
-    int i;
-
-    o.q = UInt64Create(0, 0);
-    o.r = UInt64Create(0, 0);
-
-    if (UInt64Eq(d, UInt64Create(0, 0)))
-    {
-        raise(SIGFPE);
-        return o;
-    }
-
-    for (i = 63; i >= 0; i--)
-    {
-        UInt64 bit = UInt64And(UInt64Srl(n, i), UInt64Create(0, 1));
-
-        o.r = UInt64Sll(o.r, 1);
-        o.r = UInt64Or(o.r, bit);
-
-        if (UInt64Geq(o.r, d))
-        {
-            o.r = UInt64Sub(o.r, d);
-            o.q = UInt64Or(o.q, UInt64Sll(UInt64Create(0, 1), i));
-        }
-    }
-
-    return o;
-}
-
-UInt64
-UInt64Div(UInt64 x, UInt64 y)
-{
-    return UInt64LongDivision(x, y).q;
-}
-
-UInt64
-UInt64Rem(UInt64 x, UInt64 y)
-{
-    return UInt64LongDivision(x, y).r;
-}
-
-UInt64
-UInt64Sll(UInt64 x, int y)
-{
-    UInt64 z;
-
-    if (!y)
-    {
-        return x;
-    }
-
-    z = UInt64Create(0, 0);
-
-    if (y < 32)
-    {
-        z.i[1] = (x.i[0] >> (32 - y)) | (x.i[1] << y);
-        z.i[0] = x.i[0] << y;
-    }
-    else
-    {
-        z.i[1] = x.i[0] << (y - 32);
-    }
-
-    return z;
-}
-
-UInt64
-UInt64Srl(UInt64 x, int y)
-{
-    UInt64 z;
-
-    if (!y)
-    {
-        return x;
-    }
-
-    z = UInt64Create(0, 0);
-
-    if (y < 32)
-    {
-        z.i[0] = (x.i[1] << (32 - y)) | (x.i[0] >> y);
-        z.i[1] = x.i[1] >> y;
-    }
-    else
-    {
-        z.i[0] = x.i[1] >> (y - 32);
-    }
-
-    return z;
-}
-
-UInt64
-UInt64And(UInt64 x, UInt64 y)
-{
-    return UInt64Create(x.i[1] & y.i[1], x.i[0] & y.i[0]);
-}
-
-UInt64
-UInt64Or(UInt64 x, UInt64 y)
-{
-    return UInt64Create(x.i[1] | y.i[1], x.i[0] | y.i[0]);
-}
-
-UInt64
-UInt64Xor(UInt64 x, UInt64 y)
-{
-    return UInt64Create(x.i[1] ^ y.i[1], x.i[0] ^ y.i[0]);
-}
-
-UInt64
-UInt64Not(UInt64 x)
-{
-    return UInt64Create(~(x.i[1]), ~(x.i[0]));
-}
-
-int
-UInt64Eq(UInt64 x, UInt64 y)
-{
-    return x.i[0] == y.i[0] && x.i[1] == y.i[1];
-}
-
-int
-UInt64Lt(UInt64 x, UInt64 y)
-{
-    return x.i[1] < y.i[1] || (x.i[1] == y.i[1] && x.i[0] < y.i[0]);
-}
-
-int
-UInt64Gt(UInt64 x, UInt64 y)
-{
-    return x.i[1] > y.i[1] || (x.i[1] == y.i[1] && x.i[0] > y.i[0]);
-}
-
-#endif

src/Uri.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

src/Util.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -40,8 +40,6 @@
 #include <limits.h>
 #include <pthread.h>
 
-#include <UInt64.h>
-
 #ifndef PATH_MAX
 #define PATH_MAX 256
 #endif
@@ -50,14 +48,14 @@
 #define SSIZE_MAX LONG_MAX
 #endif
 
-UInt64
+uint64_t
-UtilServerTs(void)
+UtilTsMillis(void)
 {
     struct timeval tv;
 
-    UInt64 ts;
+    uint64_t ts;
-    UInt64 sec;
+    uint64_t sec;
-    UInt64 usec;
+    uint64_t usec;
 
     gettimeofday(&tv, NULL);
 
@@ -77,54 +75,31 @@ UtilServerTs(void)
      *
      * The same goes for suseconds_t.
      */
-    if (sizeof(time_t) == sizeof(UInt64))
-    {
-        /* 64 bit time_t: convert it to a 64 bit integer */
-        time_t ms = tv.tv_sec * 1000;
-        UInt32 high = (UInt32) (ms >> 32);
-        UInt32 low = (UInt32) ms;
 
-        sec = UInt64Create(high, low);
+    // Two separate steps because time_t might be 32-bit. In that
-    }
+    // case, we want the multiplication to happen after the promotion
-    else
+    // to uint64_t.
-    {
+    sec = tv.tv_sec;
-        /* Assume 32 bit time_t: promote to 64 bit, then multiply, in
+    sec *= 1000;
-         * case multiplication overflows 32 bits. */
-        sec = UInt64Create(0, tv.tv_sec);
-        sec = UInt64Mul(sec, UInt64Create(0, 1000));
-    }
 
-    usec = UInt64Create(0, tv.tv_usec / 1000);
+    usec = tv.tv_usec / 1000;
-    ts = UInt64Add(sec, usec);
+
+    ts = sec + usec;
 
     return ts;
 }
 
-UInt64
+uint64_t
 UtilLastModified(char *path)
 {
     struct stat st;
-    UInt64 ts = UInt64Create(0, 0);
+    uint64_t ts = 0;
 
     if (stat(path, &st) == 0)
     {
-        if (sizeof(time_t) == sizeof(UInt64))
+        ts = st.st_mtim.tv_sec;
-        {
+        ts *= 1000;
-            /* 64 bit time_t: convert it to a 64 bit integer */
+        ts += st.st_mtim.tv_nsec / 1000000;
-            time_t ms = st.st_mtim.tv_sec * 1000;
-            UInt32 high = (UInt32) (ms >> 32);
-            UInt32 low = (UInt32) ms;
-
-            ts = UInt64Create(high, low);
-        }
-        else
-        {
-            ts = UInt64Create(0, st.st_mtim.tv_sec);
-            ts = UInt64Mul(ts, UInt64Create(0, 1000));
-        }
-
-        /* nsec gauanteed to fit in 32 bits */
-        ts = UInt64Add(ts, UInt64Create(0, st.st_mtim.tv_nsec / 1000000));
     }
 
     return ts;
@@ -202,21 +177,13 @@ UtilMkdir(const char *dir, const mode_t mode)
 }
 
 int
-UtilSleepMillis(UInt64 ms)
+UtilSleepMillis(uint64_t ms)
 {
     struct timespec ts;
     int res;
 
-    if (sizeof(time_t) == sizeof(UInt64))
+    ts.tv_sec = ms / 1000;
-    {
+    ts.tv_nsec = (ms % 1000) * 1000000;
-        ts.tv_sec = ((time_t) UInt64High(ms) << 32 | UInt64Low(ms)) / 1000;
-    }
-    else
-    {
-        ts.tv_sec = UInt64Low(ms) / 1000;
-    }
-
-    ts.tv_nsec = UInt64Low(UInt64Rem(ms, UInt64Create(0, 1000))) * 1000000;
 
     res = nanosleep(&ts, &ts);
 
@@ -312,14 +279,14 @@ ThreadNoDestructor(void *p)
     free(p);
 }
 
-UInt32
+uint32_t
 UtilThreadNo(void)
 {
     static pthread_key_t key;
     static int createdKey = 0;
     static unsigned long count = 0;
 
-    UInt32 *no;
+    uint32_t *no;
 
     if (!createdKey)
     {
@@ -330,7 +297,7 @@ UtilThreadNo(void)
     no = pthread_getspecific(key);
     if (!no)
     {
-        no = malloc(sizeof(UInt32));
+        no = malloc(sizeof(uint32_t));
         *no = count++;
         pthread_setspecific(key, no);
     }

src/include/Int.h

@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef CYTOPLASM_INT_H
-#define CYTOPLASM_INT_H
-
-/***
- * @Nm Int
- * @Nd Fixed-width integer types.
- * @Dd April 27 2023
- *
- * This header provides cross-platform, fixed-width integer types.
- * Specifically, it uses preprocessor magic to define the following
- * types:
- * .Bl -bullet -offset indent
- * .It
- * Int8 and UInt8
- * .It
- * Int16 and UInt16
- * .It
- * Int32 and UInt32
- * .El
- * .Pp
- * Note that there is no 64-bit integer type, because the ANSI C
- * standard makes no guarantee that such a type will exist, even
- * though it does on most platforms.
- * .Pp
- * The reason Cytoplasm provides its own header for this is
- * because ANSI C does not define fixed-width types, and while it
- * should be safe to rely on C99 fixed-width types in most cases,
- * there may be cases where even that is not possible.
- *
- * @ignore-typedefs
- */
-
-#include <limits.h>
-
-#define BIT32_MAX 4294967295UL
-#define BIT16_MAX 65535UL
-#define BIT8_MAX 255UL
-
-#ifndef UCHAR_MAX
-#error Size of char data type is unknown. Define UCHAR_MAX.
-#endif
-
-#ifndef USHRT_MAX
-#error Size of short data type is unknown. Define USHRT_MAX.
-#endif
-
-#ifndef UINT_MAX
-#error Size of int data type is unknown. Define UINT_MAX.
-#endif
-
-#ifndef ULONG_MAX
-#error Size of long data type is unknown. Define ULONG_MAX.
-#endif
-
-#if UCHAR_MAX == BIT8_MAX
-typedef signed char Int8;
-typedef unsigned char UInt8;
-
-#else
-#error Unable to determine suitable data type for 8-bit integers.
-#endif
-
-#if UINT_MAX == BIT16_MAX
-typedef signed int Int16;
-typedef unsigned int UInt16;
-
-#elif USHRT_MAX == BIT16_MAX
-typedef signed short Int16;
-typedef unsigned short UInt16;
-
-#elif UCHAR_MAX == BIT16_MAX
-typedef signed char Int16;
-typedef unsigned char UInt16;
-
-#else
-#error Unable to determine suitable data type for 16-bit integers.
-#endif
-
-#if ULONG_MAX == BIT32_MAX
-typedef signed long Int32;
-typedef unsigned long UInt32;
-
-#elif UINT_MAX == BIT32_MAX
-typedef signed int Int32;
-typedef unsigned int UInt32;
-
-#elif USHRT_MAX == BIT32_MAX
-typedef signed short Int32;
-typedef unsigned short UInt32;
-
-#elif UCHAR_MAX == BIT32_MAX
-typedef signed char Int32;
-typedef unsigned char UInt32;
-
-#else
-#error Unable to determine suitable data type for 32-bit integers.
-#endif
-
-#endif /* CYTOPLASM_INT_H */

src/include/Int64.h

@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef CYTOPLASM_INT64_H
-#define CYTOPLASM_INT64_H
-
-/***
- * @Nm Int64
- * @Nd Fixed-width 64 bit integers.
- * @Dd August 11, 2023
- *
- * .Pp
- * ANSI C89 (or C99 for that matter) provides no required mechanism
- * for 64 bit integers. Nevertheless, many compilers provide them as
- * extensions. However, since it is not a gaurantee, and to be fully
- * standards-compliant and thus portable, a platform-agnostic interface
- * is required. This header provides such an interface. If the platform
- * has a 64 bit integer type, that is used, and native operations are
- * performed by C preprocessor macro expansion. Otherwise, a
- * compatibility layer is provided, which implements 64-bit
- * arithmetic on an array of 2 32-bit numbers which are provided by
- * .Xr Int 3 .
- * .Pp
- * Note that 64-bit emulation is certainly not as performant as using
- * native 64-bit operations, so whenever possible, the native
- * operations should be preferred. However, since C provides no required
- * 64 bit integer on 32-bit and less platforms, this API can be used as
- * a "good enough" fallback mechanism.
- * .Pp
- * Also note that this implementation, both in the native and
- * non-native forms, makes some assumptions:
- * .Bl -bullet -width Ds
- * .It
- * When a cast from a larger integer to a smaller integer is performed,
- * the upper bits are truncated, not the lower bits.
- * .It
- * Negative numbers are represented in memory and in registers in two's
- * compliment form.
- * .El
- * .Pp
- * This API may provide unexpected output if these assumptions are
- * false for a given platform.
- *
- * @ignore-typedefs
- */
-
-#include <Int.h>
-#include <UInt64.h>
-
-#include <stddef.h>
-
-#ifndef INT64_FORCE_EMULATED
-
-#define BIT64_MAX 18446744073709551615UL
-
-#if UINT_MAX == BIT64_MAX
-typedef signed int Int64;
-
-#define INT64_NATIVE
-
-#elif ULONG_MAX == BIT64_MAX
-typedef signed long Int64;
-
-#define INT64_NATIVE
-
-#endif
-
-#endif /* ifndef INT64_FORCE_EMULATED */
-
-#ifdef INT64_NATIVE
-
-#define Int64Create(high, low) ((Int64) (((UInt64) (high) << 32) | (low)))
-#define Int64Neg(x) (-(x))
-
-#define Int64Low(a) ((UInt32) (a))
-#define Int64High(a) ((UInt32) ((a) >> 32))
-
-#define Int64Add(a, b) ((a) + (b))
-#define Int64Sub(a, b) ((a) - (b))
-#define Int64Mul(a, b) ((a) * (b))
-#define Int64Div(a, b) ((a) / (b))
-#define Int64Rem(a, b) ((a) % (b))
-
-#define Int64Sll(a, b) ((a) << (b))
-#define Int64Sra(a, b) ((a) >> (b))
-
-#define Int64And(a, b) ((a) & (b))
-#define Int64Or(a, b) ((a) | (b))
-#define Int64Xor(a, b) ((a) ^ (b))
-#define Int64Not(a) (~(a))
-
-#define Int64Eq(a, b) ((a) == (b))
-#define Int64Lt(a, b) ((a) < (b))
-#define Int64Gt(a, b) ((a) > (b))
-
-#define Int64Neq(a, b) ((a) != (b))
-#define Int64Leq(a, b) ((a) <= (b))
-#define Int64Geq(a, b) ((a) >= (b))
-
-#else
-
-#define Int64Neg(x) (Int64Add(Int64Not(x), Int64Create(0, 1)))
-
-/**
- * The internal bit representation of a signed integer is identical
- * to an unsigned integer, the difference is in the algorithms and
- * the way the bits are interpreted.
- */
-typedef UInt64 Int64;
-
-/**
- * Create a new signed 64 bit integer using the given high and low
- * bits.
- */
-extern Int64 Int64Create(UInt32, UInt32);
-
-/**
- * Add two signed 64 bit integers together.
- */
-extern Int64 Int64Add(Int64, Int64);
-
-/**
- * Subtract the second 64 bit integer from the first.
- */
-extern Int64 Int64Sub(Int64, Int64);
-
-/**
- * Multiply two 64 bit integers together. The non-native version of
- * this function uses the Russian Peasant method of multiplication,
- * which should afford more performance than a naive multiplication by
- * addition, but it is still rather slow and depends on the size of
- * the integers being multiplied.
- */
-extern Int64 Int64Mul(Int64, Int64);
-
-/**
- * Divide the first 64 bit integer by the second and return the
- * quotient. The non-native version of this function uses naive binary
- * long division, which is slow, but gauranteed to finish in constant
- * time.
- */
-extern Int64 Int64Div(Int64, Int64);
-
-/**
- * Divide the first 64 bit integer by the second and return the
- * remainder. The non-native version of this function uses naive binary
- * long division, which is slow, but gauranteed to finish in constant
- * time.
- */
-extern Int64 Int64Rem(Int64, Int64);
-
-/**
- * Perform a left logical bit shift of a 64 bit integer. The second
- * parameter is how many places to shift, and is declared as a regular
- * integer because anything more than 64 does not make sense.
- */
-extern Int64 Int64Sll(Int64, int);
-
-/**
- * Perform a right arithmetic bit shift of a 64 bit integer. The second
- * parameter is how many places to shift, and is declared as a regular
- * integer because anything more than 64 does not make sense.
- * .Pp
- * Note that on platforms that use the native 64-bit implementation,
- * this is technically implementation-defined, and may in fact be a
- * logical shift instead of an arithmetic shift. Note that typically
- * this operation is not performed on signed integers.
- */
-extern Int64 Int64Sra(Int64, int);
-
-/**
- * Perform a bitwise AND (&) of the provided 64 bit integers.
- */
-extern Int64 Int64And(Int64, Int64);
-
-/**
- * Perform a bitwise OR (|) of the provided 64 bit integers.
- */
-extern Int64 Int64Or(Int64, Int64);
-
-/**
- * Perform a bitwise XOR (^) of the provided 64 bit integers.
- */
-extern Int64 Int64Xor(Int64, Int64);
-
-/**
- * Perform a bitwise NOT (~) of the provided 64 bit integer.
- */
-extern Int64 Int64Not(Int64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if they are equal.
- */
-extern int Int64Eq(Int64, Int64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if the second operand is strictly
- * less than the first.
- */
-extern int Int64Lt(Int64, Int64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if the second operand is strictly
- * greater than the first.
- */
-extern int Int64Gt(Int64, Int64);
-
-#define Int64Low(a) ((a).i[0])
-#define Int64High(a) ((a).i[1])
-
-#define Int64Neq(a, b) (!Int64Eq(a, b))
-#define Int64Leq(a, b) (Int64Eq(a, b) || Int64Lt(a, b))
-#define Int64Geq(a, b) (Int64Eq(a, b) || Int64Gt(a, b))
-
-#endif
-
-#define INT64_STRBUF 65 /* Base 2 representation with '\0' */
-
-/**
- * Convert a 64 bit integer to a string in an arbitrary base
- * representation specified by the second parameter, using the provided
- * buffer and length specified by the third and fourth parameters. To
- * guarantee that the string will fit in the buffer, allocate it of
- * size INT64_STRBUF or larger. Note that a buffer size smaller than
- * INT64_STRBUF will invoke undefined behavior.
- */
-extern size_t Int64Str(Int64, int, char *, size_t);
-
-#endif /* CYTOPLASM_INT64_H */

src/include/UInt64.h

@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef CYTOPLASM_UINT64_H
-#define CYTOPLASM_UINT64_H
-
-/***
- * @Nm UInt64
- * @Nd Fixed-width 64 bit integers.
- * @Dd August 11, 2023
- *
- * .Pp
- * ANSI C89 (or C99 for that matter) provides no required mechanism
- * for 64 bit integers. Nevertheless, many compilers provide them as
- * extensions. However, since it is not a gaurantee, and to be fully
- * standards-compliant and thus portable, a platform-agnostic interface
- * is required. This header provides such an interface. If the platform
- * has a 64 bit integer type, that is used, and native operations are
- * performed by C preprocessor macro expansion. Otherwise, a
- * compatibility layer is provided, which implements 64-bit
- * arithmetic on an array of 2 32-bit numbers which are provided by
- * .Xr Int 3 .
- * .Pp
- * Note that 64-bit emulation is certainly not as performant as using
- * native 64-bit operations, so whenever possible, the native
- * operations should be preferred. However, since C provides no required
- * 64 bit integer on 32-bit and less platforms, this API can be used as
- * a "good enough" fallback mechanism.
- * .Pp
- * Also note that this implementation, both in the native and
- * non-native forms, makes some assumptions:
- * .Bl -bullet -width Ds
- * .It
- * When a cast from a larger integer to a smaller integer is performed,
- * the upper bits are truncated, not the lower bits.
- * .It
- * Negative numbers are represented in memory and in registers in two's
- * compliment form.
- * .El
- * .Pp
- * This API may provide unexpected output if these assumptions are
- * false for a given platform.
- *
- * @ignore-typedefs
- */
-
-#include <Int.h>
-
-#include <stddef.h>
-
-#ifndef INT64_FORCE_EMULATED
-
-#define BIT64_MAX 18446744073709551615UL
-
-#if UINT_MAX == BIT64_MAX
-/* typedef signed int Int64; */
-typedef unsigned int UInt64;
-
-#define UINT64_NATIVE
-
-#elif ULONG_MAX == BIT64_MAX
-/* typedef signed int Int64; */
-typedef unsigned long UInt64;
-
-#define UINT64_NATIVE
-
-#endif
-
-#endif /* ifndef INT64_FORCE_EMULATED */
-
-#ifdef UINT64_NATIVE
-
-#define UInt64Create(high, low) (((UInt64) (high) << 32) | (low))
-#define UInt64Low(a) ((UInt32) ((a) & 0x00000000FFFFFFFF))
-#define UInt64High(a) ((UInt32) ((a) >> 32))
-
-#define UInt64Add(a, b) ((a) + (b))
-#define UInt64Sub(a, b) ((a) - (b))
-#define UInt64Mul(a, b) ((a) * (b))
-#define UInt64Div(a, b) ((a) / (b))
-#define UInt64Rem(a, b) ((a) % (b))
-
-#define UInt64Sll(a, b) ((a) << (b))
-#define UInt64Srl(a, b) ((a) >> (b))
-
-#define UInt64And(a, b) ((a) & (b))
-#define UInt64Or(a, b) ((a) | (b))
-#define UInt64Xor(a, b) ((a) ^ (b))
-#define UInt64Not(a) (~(a))
-
-#define UInt64Eq(a, b) ((a) == (b))
-#define UInt64Lt(a, b) ((a) < (b))
-#define UInt64Gt(a, b) ((a) > (b))
-
-#define UInt64Neq(a, b) ((a) != (b))
-#define UInt64Leq(a, b) ((a) <= (b))
-#define UInt64Geq(a, b) ((a) >= (b))
-
-#else
-
-/**
- * For platforms that do not have a native integer large enough to
- * store a 64 bit integer, this struct is used. i[0] contains the low
- * bits of integer, and i[1] contains the high bits of the integer.
- * .Pp
- * This struct should not be accessed directly, because UInt64 may not
- * actually be this struct, it might be an actual integer type. For
- * maximum portability, only use the functions defined here to
- * manipulate 64 bit integers.
- */
-typedef struct
-{
-    UInt32 i[2];
-} UInt64;
-
-/**
- * Create a new unsigned 64 bit integer using the given high and low
- * bits.
- */
-extern UInt64 UInt64Create(UInt32, UInt32);
-
-/**
- * Add two unsigned 64 bit integers together.
- */
-extern UInt64 UInt64Add(UInt64, UInt64);
-
-/**
- * Subtract the second 64 bit integer from the first.
- */
-extern UInt64 UInt64Sub(UInt64, UInt64);
-
-/**
- * Multiply two 64 bit integers together. The non-native version of
- * this function uses the Russian Peasant method of multiplication,
- * which should afford more performance than a naive multiplication by
- * addition, but it is still rather slow and depends on the size of
- * the integers being multiplied.
- */
-extern UInt64 UInt64Mul(UInt64, UInt64);
-
-/**
- * Divide the first 64 bit integer by the second and return the
- * quotient. The non-native version of this function uses naive binary
- * long division, which is slow, but gauranteed to finish in constant
- * time.
- */
-extern UInt64 UInt64Div(UInt64, UInt64);
-
-/**
- * Divide the first 64 bit integer by the second and return the
- * remainder. The non-native version of this function uses naive binary
- * long division, which is slow, but gauranteed to finish in constant
- * time.
- */
-extern UInt64 UInt64Rem(UInt64, UInt64);
-
-/**
- * Perform a left logical bit shift of a 64 bit integer. The second
- * parameter is how many places to shift, and is declared as a regular
- * integer because anything more than 64 does not make sense.
- */
-extern UInt64 UInt64Sll(UInt64, int);
-
-/**
- * Perform a right logical bit shift of a 64 bit integer. The second
- * parameter is how many places to shift, and is declared as a regular
- * integer because anything more than 64 does not make sense.
- */
-extern UInt64 UInt64Srl(UInt64, int);
-
-/**
- * Perform a bitwise AND (&) of the provided 64 bit integers.
- */
-extern UInt64 UInt64And(UInt64, UInt64);
-
-/**
- * Perform a bitwise OR (|) of the provided 64 bit integers.
- */
-extern UInt64 UInt64Or(UInt64, UInt64);
-
-/**
- * Perform a bitwise XOR (^) of the provided 64 bit integers.
- */
-extern UInt64 UInt64Xor(UInt64, UInt64);
-
-/**
- * Perform a bitwise NOT (~) of the provided 64 bit integer.
- */
-extern UInt64 UInt64Not(UInt64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if they are equal.
- */
-extern int UInt64Eq(UInt64, UInt64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if the second operand is strictly
- * less than the first.
- */
-extern int UInt64Lt(UInt64, UInt64);
-
-/**
- * Perform a comparison of the provided 64 bit integers and return a C
- * boolean that is true if and only if the second operand is strictly
- * greater than the first.
- */
-extern int UInt64Gt(UInt64, UInt64);
-
-#define UInt64Low(a) ((a).i[0])
-#define UInt64High(a) ((a).i[1])
-
-#define UInt64Neq(a, b) (!UInt64Eq(a, b))
-#define UInt64Leq(a, b) (UInt64Eq(a, b) || UInt64Lt(a, b))
-#define UInt64Geq(a, b) (UInt64Eq(a, b) || UInt64Gt(a, b))
-
-#endif
-
-#define UINT64_STRBUF 65 /* Base 2 representation with '\0' */
-
-/**
- * Convert a 64 bit integer to a string in an arbitrary base
- * representation specified by the second parameter, using the provided
- * buffer and length specified by the third and fourth parameters. To
- * guarantee that the string will fit in the buffer, allocate it of
- * size UINT64_STRBUF or larger. Note that a buffer size smaller than
- * UINT64_STRBUF will invoke undefined behavior.
- */
-extern size_t UInt64Str(UInt64, int, char *, size_t);
-
-#endif /* CYTOPLASM_UINT64_H */

tools/hdoc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

tools/http.c

@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <Args.h>
+#include <Memory.h>
+#include <Str.h>
+#include <HashMap.h>
+#include <HttpClient.h>
+#include <Uri.h>
+
+#define FLAG_HEADERS (1 << 0)
+
+static void
+usage(char *prog)
+{
+    StreamPrintf(StreamStderr(), "Usage: %s [-i -X method -H header -d data] url\n", prog);
+}
+
+int
+Main(Array * args)
+{
+    HttpClientContext *cx = NULL;
+    HttpStatus res;
+    HttpRequestMethod method = HTTP_GET;
+    Uri *uri = NULL;
+    char *data = NULL;
+
+    HashMap *requestHeaders = HashMapCreate();
+    char *key;
+    char *val;
+
+    ArgParseState arg;
+    int flags = 0;
+    int requestFlags = HTTP_FLAG_NONE;
+
+    int ch;
+    int ret = 1;
+
+    ArgParseStateInit(&arg);
+    while ((ch = ArgParse(&arg, args, "iH:X:d:")) != -1)
+    {
+        switch (ch)
+        {
+            case 'i':
+                flags |= FLAG_HEADERS;
+                break;
+            case 'X':
+                method = HttpRequestMethodFromString(arg.optArg);
+                if (!method)
+                {
+                    StreamPrintf(StreamStderr(), "Unknown request method: %s\n", arg.optArg);
+                    return 1;
+                }
+                break;
+            case 'H':
+                key = arg.optArg;
+                val = arg.optArg;
+
+                while (*val && *val != ':')
+                {
+                    val++;
+                }
+
+                *val = '\0';
+                val++;
+
+                while (*val && isspace((unsigned char) *val))
+                {
+                    val++;
+                }
+
+                HashMapSet(requestHeaders, key, StrDuplicate(val));
+                break;
+            case 'd':
+                data = arg.optArg;
+                break;
+            default:
+                usage(ArrayGet(args, 0));
+                goto finish;
+        }
+    }
+
+    if (ArraySize(args) - arg.optInd < 1)
+    {
+        usage(ArrayGet(args, 0));
+        goto finish;
+    }
+
+    uri = UriParse(ArrayGet(args, arg.optInd));
+    if (!uri)
+    {
+        StreamPrintf(StreamStderr(), "Failed to parse URI: %s\n", ArrayGet(args, arg.optInd));
+        goto finish;
+    }
+
+    if (!uri->port)
+    {
+        if (StrEquals(uri->proto, "https"))
+        {
+            uri->port = 443;
+        }
+        else if (StrEquals(uri->proto, "http"))
+        {
+            uri->port = 80;
+        }
+    }
+
+    if (!uri->port)
+    {
+        StreamPrintf(StreamStderr(), "Unknown protocol: %s\n", uri->proto);
+        goto finish;
+    }
+
+    if (StrEquals(uri->proto, "https"))
+    {
+        requestFlags |= HTTP_FLAG_TLS;
+    }
+
+    cx = HttpRequest(method, requestFlags, uri->port, uri->host, uri->path);
+
+    if (!cx)
+    {
+        StreamPuts(StreamStderr(), "Failed to connect.\n");
+        goto finish;
+    }
+
+    while (HashMapIterate(requestHeaders, &key, (void **) &val))
+    {
+        HttpRequestHeader(cx, key, val);
+        Free(val);
+    }
+
+    if (data)
+    {
+        if (*data == '@')
+        {
+            Stream *in;
+            int len;
+
+            data++;
+
+            if (StrEquals(data, "-"))
+            {
+                in = StreamStdin();
+            }
+            else
+            {
+                in = StreamOpen(data, "r");
+            }
+
+            if (!in)
+            {
+                StreamPrintf(StreamStderr(), "%s: %s\n", data, strerror(errno));
+                goto finish;
+            }
+
+            len = StreamSeek(in, 0, SEEK_END);
+            if (len > -1)
+            {
+                char *lenStr;
+                int nBytes;
+
+                StreamSeek(in, 0, SEEK_SET);
+                nBytes = snprintf(NULL, 0, "%d", len);
+
+                lenStr = Malloc(nBytes + 1);
+                snprintf(lenStr, nBytes + 1, "%d", len);
+
+                HttpRequestHeader(cx, "Content-Length", lenStr);
+                Free(lenStr);
+            }
+
+            HttpRequestSendHeaders(cx);
+            StreamCopy(in, HttpClientStream(cx));
+            if (in != StreamStdin())
+            {
+                StreamClose(in);
+            }
+        }
+        else
+        {
+            char *lenStr;
+            int len = strlen(data);
+            int nBytes = snprintf(NULL, 0, "%d", len);
+
+            lenStr = Malloc(nBytes + 1);
+            snprintf(lenStr, nBytes + 1, "%d", len);
+
+            HttpRequestHeader(cx, "Content-Length", lenStr);
+            Free(lenStr);
+            HttpRequestSendHeaders(cx);
+            StreamPuts(HttpClientStream(cx), data);
+        }
+    }
+    else
+    {
+        HttpRequestSendHeaders(cx);
+    }
+
+    res = HttpRequestSend(cx);
+
+    if (!res)
+    {
+        StreamPuts(StreamStderr(), "Failed to send request.\n");
+        goto finish;
+    }
+
+    if (flags & FLAG_HEADERS)
+    {
+        HashMap *responseHeaders = HttpResponseHeaders(cx);
+
+        StreamPrintf(StreamStdout(), "HTTP/1.0 %d %s\n", res, HttpStatusToString(res));
+
+        while (HashMapIterate(responseHeaders, &key, (void **) &val))
+        {
+            StreamPrintf(StreamStdout(), "%s: %s\n", key, val);
+        }
+
+        StreamPutc(StreamStdout(), '\n');
+    }
+
+    StreamCopy(HttpClientStream(cx), StreamStdout());
+
+    ret = !(res == HTTP_OK);
+
+finish:
+    HashMapFree(requestHeaders);
+
+    HttpClientContextFree(cx);
+    UriFree(uri);
+
+    return ret;
+}

tools/int64.c

@@ -1,145 +0,0 @@
-#include <Int64.h>
-
-#include <Log.h>
-
-/* AssertEquals(actual, expected) */
-int
-AssertEquals(char *msg, Int64 x, Int64 y)
-{
-    if (!Int64Eq(x, y))
-    {
-        Log(LOG_ERR, "%s: Expected 0x%X 0x%X, got 0x%X 0x%X", msg,
-            Int64High(y), Int64Low(y),
-            Int64High(x), Int64Low(x));
-
-        return 0;
-    }
-
-    return 1;
-}
-
-int
-Main(void)
-{
-    Int64 x, y;
-
-    Log(LOG_INFO, "sizeof(Int64) = %lu", sizeof(Int64));
-
-#ifdef INT64_NATIVE
-    Log(LOG_INFO, "Using native 64-bit integers.");
-#else
-    Log(LOG_INFO, "Using emulated 64-bit integers.");
-#endif
-
-    /* BSR Tests */
-
-    x = Int64Create(0x000000FF, 0x00000000);
-
-    y = Int64Sra(x, 4);
-    AssertEquals("x >> 4", y, Int64Create(0x0000000F, 0xF0000000));
-
-    y = Int64Sra(x, 8);
-    AssertEquals("x >> 8", y, Int64Create(0x00000000, 0xFF000000));
-
-    y = Int64Sra(x, 36);
-    AssertEquals("x >> 36", y, Int64Create(0x00000000, 0x0000000F));
-
-    x = Int64Create(0xFF000000, 0x00000000);
-
-    y = Int64Sra(x, 4);
-    AssertEquals("x >> 4", y, Int64Create(0xFFF00000, 0x00000000));
-
-    y = Int64Sra(x, 8);
-    AssertEquals("x >> 8", y, Int64Create(0xFFFF0000, 0x00000000));
-
-    y = Int64Sra(x, 63);
-    AssertEquals("x >> 63", y, Int64Create(0xFFFFFFFF, 0xFFFFFFFF));
-
-    /* BSL Tests */
-
-    x = Int64Create(0x00000000, 0xFF000000);
-
-    y = Int64Sll(x, 4);
-    AssertEquals("x << 4", y, Int64Create(0x0000000F, 0xF0000000));
-
-    y = Int64Sll(x, 8);
-    AssertEquals("x << 8", y, Int64Create(0x000000FF, 0x00000000));
-
-    y = Int64Sll(x, 36);
-    AssertEquals("x << 36", y, Int64Create(0xF0000000, 0x00000000));
-
-    /* ADD Tests */
-
-    x = Int64Create(0x00000000, 0xF0000001);
-    y = Int64Create(0x00000000, 0x00000002);
-    AssertEquals("0xF0000001 + 0x00000002", Int64Add(x, y), Int64Create(0x00000000, 0xF0000003));
-
-    x = Int64Create(0x00000000, 0xF0000000);
-    y = Int64Create(0x00000000, 0x10000000);
-    AssertEquals("0xF0000000 + 0x10000000", Int64Add(x, y), Int64Create(0x00000001, 0x00000000));
-
-    x = Int64Create(0, 5);
-    y = Int64Neg(Int64Create(0, 10));
-    AssertEquals("5 + (-10)", Int64Add(x, y), Int64Neg(Int64Create(0, 5)));
-
-    /* SUB Tests */
-    x = Int64Create(0x00000000, 0x00000005);
-    y = Int64Create(0x00000000, 0x00000002);
-    AssertEquals("0x00000005 - 0x00000002", Int64Sub(x, y), Int64Create(0x00000000, 0x00000003));
-
-    x = Int64Create(0x00000001, 0x00000000);
-    y = Int64Create(0x00000000, 0x00000001);
-    AssertEquals("0x00000001 0x00000000 - 0x00000001", Int64Sub(x, y), Int64Create(0x00000000, 0xFFFFFFFF));
-
-    x = Int64Create(0, 5);
-    y = Int64Create(0, 10);
-    AssertEquals("5 - 10", Int64Sub(x, y), Int64Neg(Int64Create(0, 5)));
-
-    x = Int64Create(0, 5);
-    y = Int64Neg(Int64Create(0, 10));
-    AssertEquals("5 - (-10)", Int64Sub(x, y), Int64Create(0, 15));
-
-    /* MUL Tests */
-    x = Int64Create(0, 18);
-    y = Int64Create(0, 1);
-    AssertEquals("18 * 1", Int64Mul(x, y), Int64Create(0, 18));
-
-    x = Int64Create(0, 20);
-    y = Int64Create(0, 12);
-    AssertEquals("20 * 12", Int64Mul(x, y), Int64Create(0, 240));
-
-    x = Int64Create(0x00000000, 0x00000005);
-    y = Int64Create(0x00000000, 0x00000005);
-    AssertEquals("0x00000005 * 0x00000005", Int64Mul(x, y), Int64Create(0x00000000, 0x00000019));
-
-    x = Int64Create(0x00000001, 0x00000000);
-    y = Int64Create(0x00000000, 0x00000005);
-    AssertEquals("0x00000001 0x00000000 * 0x00000005", Int64Mul(x, y), Int64Create(0x00000005, 0x00000000));
-
-    /* DIV Tests */
-    x = Int64Create(0, 12);
-    y = Int64Create(0, 4);
-    AssertEquals("12 / 4", Int64Div(x, y), Int64Create(0, 3));
-
-    /* MOD Tests */
-    x = Int64Create(0x000000FF, 0x00000000);
-    y = Int64Create(0x00000000, 0x00000010);
-    AssertEquals("0x000000FF 0x00000000 mod 0x00000010", Int64Rem(x, y), Int64Create(0, 0));
-
-    x = Int64Create(0x00000000, 0xFF000000);
-    y = Int64Create(0x00000000, 0x00000010);
-    AssertEquals("0x00000000 0xFF000000 mod 0x00000010", Int64Rem(x, y), Int64Create(0, 0));
-
-    x = Int64Create(0xFF000000, 0x00000000);
-    y = Int64Create(0x00000000, 0x00000010);
-    AssertEquals("0xFF000000 0x00000000 mod 0x00000010", Int64Rem(x, y), Int64Create(0, 0));
-
-    x = Int64Create(0x00000000, 0x000000F0);
-    y = Int64Create(0x00000000, 0x00000010);
-    AssertEquals("0x00000000 0x000000F0 mod 0x00000010", Int64Rem(x, y), Int64Create(0, 0));
-
-    /* TODO: Add more tests for negative multiplication, division, and
-     * mod */
-
-    return 0;
-}

tools/j2s.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <stdbool.h>
 
 #include <Log.h>
 #include <Array.h>
@@ -309,6 +310,8 @@ Main(Array * args)
             ArrayAdd(requiredTypes, StrDuplicate(type));
         }
 
+        if (StrEquals(typeType, "struct"))
+        {
             typeFieldsVal = HashMapGet(typeObj, "fields");
             if (JsonValueType(typeFieldsVal) != JSON_OBJECT)
             {
@@ -318,13 +321,12 @@ Main(Array * args)
 
             typeFields = JsonValueAsObject(typeFieldsVal);
 
-        if (StrEquals(typeType, "struct"))
-        {
             while (HashMapIterate(typeFields, &fieldName, (void **) &fieldVal))
             {
                 char *fieldType;
-                int isArrType = 0;
+                bool isArrType = false;
                 JsonValue *requiredVal;
+                JsonValue *ignoreVal;
 
                 if (JsonValueType(fieldVal) != JSON_OBJECT)
                 {
@@ -345,7 +347,7 @@ Main(Array * args)
                 {
                     fieldType++;
                     fieldType[strlen(fieldType) - 1] = '\0';
-                    isArrType = 1;
+                    isArrType = true;
                 }
 
                 if (!StrEquals(fieldType, "object") &&
@@ -379,10 +381,26 @@ Main(Array * args)
                     Log(LOG_ERR, "Validation error: 'types.%s.fields.%s.required' must be a boolean.", type, fieldName);
                     goto finish;
                 }
+
+                ignoreVal = HashMapGet(fieldObj, "ignore");
+                if (ignoreVal && JsonValueType(ignoreVal) != JSON_BOOLEAN)
+                {
+                    Log(LOG_ERR, "Validation error: 'types.%s.fields.%s.ignore' must be a boolean.", type, fieldName);
+                    goto finish;
+                }
             }
         }
         else if (StrEquals(typeType, "enum"))
         {
+            typeFieldsVal = HashMapGet(typeObj, "fields");
+            if (JsonValueType(typeFieldsVal) != JSON_OBJECT)
+            {
+                Log(LOG_ERR, "Validation error: 'types.%s.fields' must be an object.", type);
+                goto finish;
+            }
+
+            typeFields = JsonValueAsObject(typeFieldsVal);
+
             while (HashMapIterate(typeFields, &fieldName, (void **) &fieldVal))
             {
                 char *name;
@@ -403,16 +421,17 @@ Main(Array * args)
                 }
             }
         }
+        else if (StrEquals(typeType, "extern"))
+        {
+            /*
+             * No code will be generated for this type. We simply assume that it exists.
+             */
+        }
         else
         {
             Log(LOG_ERR, "Validation error: 'types.%s.type' must be 'struct' or 'enum'.", type);
             goto finish;
         }
-        /*
-         * TODO: Add "extern" type that doesn't actually generate any code,
-         * but trusts the user that it has been generated somewhere else. This
-         * is effectively "importing" types.
-         */
     }
 
     sortedNodes = GraphTopologicalSort(dependencyGraph, &sortedNodesLen);
@@ -441,9 +460,11 @@ Main(Array * args)
     StreamPrintf(headerFile, "#ifndef %s\n", guard);
     StreamPrintf(headerFile, "#define %s\n\n", guard);
 
-    StreamPrintf(headerFile, "#include <Array.h>\n");
+    StreamPrintf(headerFile, "#include <stdint.h>\n");
-    StreamPrintf(headerFile, "#include <HashMap.h>\n");
+    StreamPrintf(headerFile, "#include <stdbool.h>\n");
-    StreamPrintf(headerFile, "#include <Int64.h>\n");
+
+    StreamPrintf(headerFile, "#include <Cytoplasm/Array.h>\n");
+    StreamPrintf(headerFile, "#include <Cytoplasm/HashMap.h>\n");
 
     StreamPutc(headerFile, '\n');
 
@@ -471,6 +492,12 @@ Main(Array * args)
         }
 
         typeType = JsonValueAsString(JsonGet(types, 2, type, "type"));
+
+        if (StrEquals(typeType, "extern"))
+        {
+            continue;
+        }
+
         fields = JsonValueAsObject(JsonGet(types, 2, type, "fields"));
 
         StreamPrintf(headerFile, "typedef %s %s\n{\n", typeType, type);
@@ -492,11 +519,11 @@ Main(Array * args)
                 }
                 else if (StrEquals(fieldType, "integer"))
                 {
-                    cType = "Int64";
+                    cType = "int64_t";
                 }
                 else if (StrEquals(fieldType, "boolean"))
                 {
-                    cType = "int";
+                    cType = "bool";
                 }
                 else if (StrEquals(fieldType, "float"))
                 {
@@ -583,9 +610,9 @@ Main(Array * args)
     StreamPrintf(implFile, "/* Generated by j2s */\n\n");
     StreamPrintf(implFile, "#include <%s>\n\n", headerName);
 
-    StreamPrintf(implFile, "#include <Memory.h>\n");
+    StreamPrintf(implFile, "#include <Cytoplasm/Memory.h>\n");
-    StreamPrintf(implFile, "#include <Json.h>\n");
+    StreamPrintf(implFile, "#include <Cytoplasm/Json.h>\n");
-    StreamPrintf(implFile, "#include <Str.h>\n");
+    StreamPrintf(implFile, "#include <Cytoplasm/Str.h>\n");
 
     StreamPutc(implFile, '\n');
 
@@ -598,8 +625,8 @@ Main(Array * args)
 
         if (StrEquals(typeType, "struct"))
         {
-            StreamPrintf(headerFile, "extern int %sFromJson(HashMap *, %s *, char **);\n", type, type);
+            StreamPrintf(headerFile, "extern bool %sFromJson(HashMap *, %s *, char **);\n", type, type);
-            StreamPrintf(implFile, "int\n%sFromJson(HashMap *json, %s *out, char **errp)\n{\n", type, type);
+            StreamPrintf(implFile, "bool\n%sFromJson(HashMap *json, %s *out, char **errp)\n{\n", type, type);
             StreamPrintf(implFile, "    JsonValue *val;\n");
             StreamPrintf(implFile, "    int enumParseRes;\n");
             StreamPrintf(implFile, "\n");
@@ -608,32 +635,43 @@ Main(Array * args)
             StreamPrintf(implFile, "    if (!json | !out)\n"
                          "    {\n"
                          "        *errp = \"Invalid pointers passed to %sFromJson()\";\n"
-                         "        return 0;\n"
+                         "        return false;\n"
                          "    }\n\n"
                          ,type);
             for (i = 0; i < ArraySize(keys); i++)
             {
                 char *key = ArrayGet(keys, i);
-                int required = JsonValueAsBoolean(JsonGet(fields, 2, key, "required"));
+                bool required = JsonValueAsBoolean(JsonGet(fields, 2, key, "required"));
+                bool ignore = JsonValueAsBoolean(JsonGet(fields, 2, key, "ignore"));
                 char *fieldType = JsonValueAsString(JsonGet(fields, 2, key, "type"));
                 int isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
                 JsonType jsonType = isEnum ? JSON_STRING : TypeToJsonType(fieldType);
                 char *jsonTypeStr = JsonTypeToStr(jsonType);
 
+                if (ignore)
+                {
+                    StreamPrintf(implFile, "    /* Ignored field: %s */\n\n", key);
+                    continue;
+                }
+
                 StreamPrintf(implFile, "    val = HashMapGet(json, \"%s\");\n", Trim('_', key));
 
                 StreamPrintf(implFile, "    if (val)\n    {\n");
                 StreamPrintf(implFile, "        if (JsonValueType(val) != %s)\n        {\n", jsonTypeStr);
                 StreamPrintf(implFile, "            *errp = \"%s.%s must be of type %s.\";\n", type, Trim('_', key), fieldType);
-                StreamPrintf(implFile, "            return 0;\n");
+                StreamPrintf(implFile, "            return false;\n");
                 StreamPrintf(implFile, "        }\n\n");
                 if (StrEquals(fieldType, "array"))
                 {
-                    StreamPrintf(implFile, "        out->%s = JsonValueAsArray(JsonValueDuplicate(val));\n", key);
+                    StreamPrintf(implFile, "        val = JsonValueDuplicate(val);\n");
+                    StreamPrintf(implFile, "        out->%s = JsonValueAsArray(val);\n", key);
+                    StreamPrintf(implFile, "        Free(val); /* Not JsonValueFree() because we want the inner value. */\n");
                 }
                 else if (StrEquals(fieldType, "object"))
                 {
-                    StreamPrintf(implFile, "        out->%s = JsonValueAsObject(JsonValueDuplicate(val));\n", key);
+                    StreamPrintf(implFile, "        val = JsonValueDuplicate(val);\n");
+                    StreamPrintf(implFile, "        out->%s = JsonValueAsObject(val);\n", key);
+                    StreamPrintf(implFile, "        Free(val); /* Not JsonValueFree() because we want the inner value. */\n");
                 }
                 else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
                 {
@@ -646,7 +684,7 @@ Main(Array * args)
                     StreamPrintf(implFile, "        if (!out->%s)\n", key);
                     StreamPrintf(implFile, "        {\n");
                     StreamPrintf(implFile, "            *errp = \"Failed to allocate memory for %s.%s.\";\n", type, key);
-                    StreamPrintf(implFile, "            return 0;\n");
+                    StreamPrintf(implFile, "            return false;\n");
                     StreamPrintf(implFile, "        }\n");
                     StreamPrintf(implFile, "        else\n");
                     StreamPrintf(implFile, "        {\n");
@@ -665,7 +703,7 @@ Main(Array * args)
 
                         if (StrEquals(fieldType, "integer"))
                         {
-                            cType = "Int64";
+                            cType = "int64_t";
                         }
                         else if (StrEquals(fieldType, "float"))
                         {
@@ -673,7 +711,7 @@ Main(Array * args)
                         }
                         else if (StrEquals(fieldType, "boolean"))
                         {
-                            cType = "int";
+                            cType = "bool";
                         }
                         else
                         {
@@ -687,13 +725,13 @@ Main(Array * args)
                         StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                ref = Malloc(sizeof(%s));\n", cType);
                         StreamPrintf(implFile, "                if (!ref)\n");
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"Unable to allocate memory for array value.\";\n");
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                *ref = JsonValueAs%s(v);\n", fieldType);
                         StreamPrintf(implFile, "                ArrayAdd(out->%s, ref);\n", key);
@@ -705,7 +743,7 @@ Main(Array * args)
                         StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                ArrayAdd(out->%s, StrDuplicate(JsonValueAsString(v)));\n", key);
                     }
@@ -714,7 +752,7 @@ Main(Array * args)
                         StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                ArrayAdd(out->%s, JsonDuplicate(JsonValueAsObject(v)));\n", key);
                     }
@@ -728,13 +766,13 @@ Main(Array * args)
                         StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                parsed = Malloc(sizeof(%s));\n", fieldType);
                         StreamPrintf(implFile, "                if (!parsed)\n");
                         StreamPrintf(implFile, "                {\n");
                         StreamPrintf(implFile, "                    *errp = \"Unable to allocate memory for array value.\";\n");
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         if (isEnum)
                         {
@@ -752,7 +790,7 @@ Main(Array * args)
                             StreamPrintf(implFile, "                    %sFree(parsed);\n", fieldType);
                         }
                         StreamPrintf(implFile, "                    Free(parsed);\n");
-                        StreamPrintf(implFile, "                    return 0;\n");
+                        StreamPrintf(implFile, "                    return false;\n");
                         StreamPrintf(implFile, "                }\n");
                         StreamPrintf(implFile, "                ArrayAdd(out->%s, parsed);\n", key);
                     }
@@ -765,7 +803,7 @@ Main(Array * args)
                 else if (jsonType == JSON_OBJECT)
                 {
                     StreamPrintf(implFile, "        if (!%sFromJson(JsonValueAsObject(val), &out->%s, errp))\n        {\n", fieldType, key);
-                    StreamPrintf(implFile, "            return 0;\n");
+                    StreamPrintf(implFile, "            return false;\n");
                     StreamPrintf(implFile, "        }\n");
                 }
                 else
@@ -800,7 +838,7 @@ Main(Array * args)
                             StreamPrintf(implFile, "        if (enumParseRes == -1)\n", key);
                             StreamPrintf(implFile, "        {\n");
                             StreamPrintf(implFile, "            *errp = \"Invalid value for %s.%s.\";\n", type, key);
-                            StreamPrintf(implFile, "            return 0;\n");
+                            StreamPrintf(implFile, "            return false;\n");
                             StreamPrintf(implFile, "        }\n");
                             StreamPrintf(implFile, "        out->%s = enumParseRes;\n", key);
                         }
@@ -820,13 +858,13 @@ Main(Array * args)
                 {
                     StreamPrintf(implFile, "    else\n    {\n");
                     StreamPrintf(implFile, "        *errp = \"%s.%s is required.\";\n", type, key);
-                    StreamPrintf(implFile, "        return 0;\n");
+                    StreamPrintf(implFile, "        return false;\n");
                     StreamPrintf(implFile, "    }\n");
                 }
 
                 StreamPutc(implFile, '\n');
             }
-            StreamPrintf(implFile, "    return 1;\n");
+            StreamPrintf(implFile, "    return true;\n");
             StreamPrintf(implFile, "}\n\n");
 
             StreamPrintf(headerFile, "extern HashMap * %sToJson(%s *);\n", type, type);
@@ -846,7 +884,14 @@ Main(Array * args)
             {
                 char *key = ArrayGet(keys, i);
                 char *fieldType = JsonValueAsString(JsonGet(fields, 2, key, "type"));
-                int isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
+                bool isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
+                bool ignore = JsonValueAsBoolean(JsonGet(fields, 2, key, "ignore"));
+
+                if (ignore)
+                {
+                    StreamPrintf(implFile, "    /* Ignored field: %s */\n\n", key);
+                    continue;
+                }
 
                 if (StrEquals(fieldType, "array"))
                 {
@@ -908,7 +953,7 @@ Main(Array * args)
 
                         if (StrEquals(fieldType, "integer"))
                         {
-                            cType = "Int64";
+                            cType = "int64_t";
                         }
                         else if (StrEquals(fieldType, "float"))
                         {
@@ -916,7 +961,7 @@ Main(Array * args)
                         }
                         else if (StrEquals(fieldType, "boolean"))
                         {
-                            cType = "int";
+                            cType = "bool";
                         }
                         else
                         {
@@ -1022,8 +1067,9 @@ Main(Array * args)
                 else
                 {
                     /* Ignore primitives but call the appropriate free
-                     * method on declared types */
+                     * method on declared types that aren't "extern". */
-                    if (!isEnum && HashMapGet(types, fieldType))
+                    char *fieldTypeType = JsonValueAsString(JsonGet(types, 2, fieldType, "type"));
+                    if (!isEnum && HashMapGet(types, fieldType) && !StrEquals(fieldTypeType, "extern"))
                     {
                         StreamPrintf(implFile, "    %sFree(&val->%s);\n", fieldType, key);
                     }

tools/tp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files

tools/uint64.c

@@ -1,119 +0,0 @@
-#include <UInt64.h>
-
-#include <Log.h>
-
-/* AssertEquals(actual, expected) */
-int
-AssertEquals(char *msg, UInt64 x, UInt64 y)
-{
-    if (!UInt64Eq(x, y))
-    {
-        Log(LOG_ERR, "%s: Expected 0x%X 0x%X, got 0x%X 0x%X", msg,
-            UInt64High(y), UInt64Low(y),
-            UInt64High(x), UInt64Low(x));
-
-        return 0;
-    }
-
-    return 1;
-}
-
-int
-Main(void)
-{
-    UInt64 x, y;
-
-    Log(LOG_INFO, "sizeof(UInt64) = %lu", sizeof(UInt64));
-
-#ifdef UINT64_NATIVE
-    Log(LOG_INFO, "Using native 64-bit integers.");
-#else
-    Log(LOG_INFO, "Using emulated 64-bit integers.");
-#endif
-
-    /* BSR Tests */
-
-    x = UInt64Create(0x000000FF, 0x00000000);
-
-    y = UInt64Srl(x, 4);
-    AssertEquals("x >> 4", y, UInt64Create(0x0000000F, 0xF0000000));
-
-    y = UInt64Srl(x, 8);
-    AssertEquals("x >> 8", y, UInt64Create(0x00000000, 0xFF000000));
-
-    y = UInt64Srl(x, 36);
-    AssertEquals("x >> 36", y, UInt64Create(0x00000000, 0x0000000F));
-
-    /* BSL Tests */
-
-    x = UInt64Create(0x00000000, 0xFF000000);
-
-    y = UInt64Sll(x, 4);
-    AssertEquals("x << 4", y, UInt64Create(0x0000000F, 0xF0000000));
-
-    y = UInt64Sll(x, 8);
-    AssertEquals("x << 8", y, UInt64Create(0x000000FF, 0x00000000));
-
-    y = UInt64Sll(x, 36);
-    AssertEquals("x << 36", y, UInt64Create(0xF0000000, 0x00000000));
-
-    /* ADD Tests */
-
-    x = UInt64Create(0x00000000, 0xF0000001);
-    y = UInt64Create(0x00000000, 0x00000002);
-    AssertEquals("0xF0000001 + 0x00000002", UInt64Add(x, y), UInt64Create(0x00000000, 0xF0000003));
-
-    x = UInt64Create(0x00000000, 0xF0000000);
-    y = UInt64Create(0x00000000, 0x10000000);
-    AssertEquals("0xF0000000 + 0x10000000", UInt64Add(x, y), UInt64Create(0x00000001, 0x00000000));
-
-    /* SUB Tests */
-    x = UInt64Create(0x00000000, 0x00000005);
-    y = UInt64Create(0x00000000, 0x00000002);
-    AssertEquals("0x00000005 - 0x00000002", UInt64Sub(x, y), UInt64Create(0x00000000, 0x00000003));
-
-    x = UInt64Create(0x00000001, 0x00000000);
-    y = UInt64Create(0x00000000, 0x00000001);
-    AssertEquals("0x00000001 0x00000000 - 0x00000001", UInt64Sub(x, y), UInt64Create(0x00000000, 0xFFFFFFFF));
-
-    /* MUL Tests */
-    x = UInt64Create(0, 18);
-    y = UInt64Create(0, 1);
-    AssertEquals("18 * 1", UInt64Mul(x, y), UInt64Create(0, 18));
-
-    x = UInt64Create(0, 20);
-    y = UInt64Create(0, 12);
-    AssertEquals("20 * 12", UInt64Mul(x, y), UInt64Create(0, 240));
-
-    x = UInt64Create(0x00000000, 0x00000005);
-    y = UInt64Create(0x00000000, 0x00000005);
-    AssertEquals("0x00000005 * 0x00000005", UInt64Mul(x, y), UInt64Create(0x00000000, 0x00000019));
-
-    x = UInt64Create(0x00000001, 0x00000000);
-    y = UInt64Create(0x00000000, 0x00000005);
-    AssertEquals("0x00000001 0x00000000 * 0x00000005", UInt64Mul(x, y), UInt64Create(0x00000005, 0x00000000));
-
-    /* DIV Tests */
-    x = UInt64Create(0, 12);
-    y = UInt64Create(0, 4);
-    AssertEquals("12 / 4", UInt64Div(x, y), UInt64Create(0, 3));
-
-    /* MOD Tests */
-    x = UInt64Create(0x000000FF, 0x00000000);
-    y = UInt64Create(0x00000000, 0x00000010);
-    AssertEquals("0x000000FF 0x00000000 mod 0x00000010", UInt64Rem(x, y), UInt64Create(0, 0));
-
-    x = UInt64Create(0x00000000, 0xFF000000);
-    y = UInt64Create(0x00000000, 0x00000010);
-    AssertEquals("0x00000000 0xFF000000 mod 0x00000010", UInt64Rem(x, y), UInt64Create(0, 0));
-
-    x = UInt64Create(0xFF000000, 0x00000000);
-    y = UInt64Create(0x00000000, 0x00000010);
-    AssertEquals("0xFF000000 0x00000000 mod 0x00000010", UInt64Rem(x, y), UInt64Create(0, 0));
-
-    x = UInt64Create(0x00000000, 0x000000F0);
-    y = UInt64Create(0x00000000, 0x00000010);
-    AssertEquals("0x00000000 0x000000F0 mod 0x00000010", UInt64Rem(x, y), UInt64Create(0, 0));
-
-    return 0;
-}