Compare commits

...

15 Commits

Author SHA1 Message Date
9e8f5958c7 write conf scripts 2025-12-15 18:52:47 +01:00
bc0743a72b add __assume__ macro definition in atrb.h 2025-12-15 12:32:34 +01:00
81b21ff7ce move windowing code into io/win 2025-12-15 10:02:54 +01:00
7df20e9aa1 remove mapcolour files, since we don't use them 2025-12-15 09:56:45 +01:00
5cf0292ebe delete configuration logic
The configuration logic was violating alignment rules, and will be
rewritten.
2025-12-15 09:54:57 +01:00
64b06d88c8 fix: error headers were needlessly backing out of util/ 2025-12-15 09:54:17 +01:00
8bb8671fb0 rephrase the header a little, to not be confusing when a file is copy-pasted. 2025-11-13 22:29:41 +01:00
8d0e825157 rewrite copyright file header to provide more information about where the file is from. 2025-11-13 22:24:09 +01:00
5f909d1d65 rework the flow of the Makefile. 2025-10-23 15:28:42 +02:00
87541d5789 modify Makefile to be more in-line with the GNU standard.
Mainly so the makefile is a bit less esoteric to use, debugging flags
must be specified manually.

changed:
- `$RM` for calling `rm`
- removed unused `$ISWIN`
- renamed `test` to `check`
- added `install` and `install-strip` recipes, which for now remain
empty
- added `-g` to `$CFLAGS`, since it helps debugging, and in case of
failures makes bug report less of a headache.

I decided to not modify it further so "specialised tools" don't need to
store files in the git repo, which seemed to complicate logic.
This is the same reason to why I chose to not adapt clean in a way to
introduce `mostlyclean`.
2025-10-20 15:19:24 +02:00
316726a610 tmp: revert enabling a column limit 2025-10-16 23:35:30 +02:00
1aa34f7d3f enable a column limit. 2025-10-09 21:12:53 +02:00
00719b1933 refactor code with new formatting rules
Functions now break before their brace, mirroring the Linux kernel.
The reason for this is that breaking the parameter list otherwise makes
code unreadable.
2025-10-09 19:02:16 +02:00
eb45650178 fix: use uintptr over usize in locations where applicable 2025-10-09 18:35:39 +02:00
8ca49aa4fa fix: ssize got removed in rework of intdef.h/types.h. 2025-10-09 12:28:24 +02:00
41 changed files with 339 additions and 586 deletions

View File

@@ -1,5 +1,6 @@
# Copyright (c) 2025 Quinn # Copyright (c) 2025 Quinn.
# Licensed under the MIT Licence. See LICENSE for details # This is a file from the project MCA-Selector-Lite and is
# licensed under the MIT Licence. See included LICENSE file for details.
# #
--- ---
# --------------------------- # ---------------------------
@@ -34,9 +35,9 @@ AlignConsecutiveShortCaseStatements:
# short constructs on a single line # short constructs on a single line
# --------------------------- # ---------------------------
AllowShortBlocksOnASingleLine: Always AllowShortBlocksOnASingleLine: Always
AllowShortFunctionsOnASingleLine: All AllowShortFunctionsOnASingleLine: None
AllowShortLambdasOnASingleLine: All AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: AllIfsAndElse AllowShortIfStatementsOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true
AllowShortEnumsOnASingleLine: true AllowShortEnumsOnASingleLine: true
AllowShortLoopsOnASingleLine: true AllowShortLoopsOnASingleLine: true
@@ -61,7 +62,7 @@ BraceWrapping:
AfterCaseLabel: false AfterCaseLabel: false
AfterClass: false AfterClass: false
AfterEnum: false AfterEnum: false
AfterFunction: false AfterFunction: true
AfterNamespace: false AfterNamespace: false
AfterObjCDeclaration: false AfterObjCDeclaration: false
AfterStruct: false AfterStruct: false

View File

@@ -1,5 +1,6 @@
# Copyright (c) 2025 Quinn # Copyright (c) 2025 Quinn.
# Licensed under the MIT Licence. See LICENSE for details # This is a file from the project MCA-Selector-Lite and is
# licensed under the MIT Licence. See included LICENSE file for details.
[*] [*]
charset = utf-8 charset = utf-8

View File

@@ -54,4 +54,4 @@ jobs:
if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os == 'Windows' if: steps.cache-deps.outputs.cache-hit != 'true' && runner.os == 'Windows'
- run: make -j all - run: make -j all
- run: make -j test - run: make -j check

5
.gitignore vendored
View File

@@ -1,5 +1,6 @@
# Copyright (c) 2025 Quinn # Copyright (c) 2025 Quinn.
# Licensed under the MIT Licence. See LICENSE for details # This is a file from the project MCA-Selector-Lite and is
# licensed under the MIT Licence. See included LICENSE file for details.
# ignore all dotfiles by default # ignore all dotfiles by default
.* .*

5
.gitmodules vendored
View File

@@ -1,6 +1,11 @@
# Copyright (c) 2025 Quinn.
# This is a file from the project MCA-Selector-Lite and is
# licensed under the MIT Licence. See included LICENSE file for details.
[submodule "lib/glfw"] [submodule "lib/glfw"]
path = lib/glfw path = lib/glfw
url = https://github.com/glfw/glfw url = https://github.com/glfw/glfw
[submodule "lib/libarchive"] [submodule "lib/libarchive"]
path = lib/libarchive path = lib/libarchive
url = https://github.com/libarchive/libarchive url = https://github.com/libarchive/libarchive

View File

@@ -1,69 +1,71 @@
# Copyright (c) 2025 Quinn # Copyright (c) 2025 Quinn.
# Licensed under the MIT Licence. See LICENSE for details # This is a file from the project MCA-Selector-Lite and is
# licensed under the MIT Licence. See included LICENSE file for details.
SHELL = /bin/sh
.SUFFIXES:
# build configuration, information about the current build process
NAME = mcaselector-lite NAME = mcaselector-lite
DEBUG ?= 0
CC ?= cc
CMAKE ?= cmake -G 'Unix Makefiles'
# setting default compilation flags CC ?= cc
# some of which are able to be overwritten, others are always appended RM ?= rm -vf
CPPFLAGS ?= CMAKE ?= cmake -G 'Unix Makefiles'
CFLAGS ?= -O2 -Wall -Wextra -Wpedantic -Wno-pointer-arith
CPPFLAGS ?= -DNDEBUG
CFLAGS ?= -O2
LDFLAGS ?= -flto LDFLAGS ?= -flto
CPPFLAGS += -DGLFW_INCLUDE_NONE
CFLAGS += -std=gnu99
# add a few extra flags depending on whether CPPFLAGS += -DGLFW_INCLUDE_NONE
# we're debugging or not
ifeq ($(DEBUG),0)
CPPFLAGS += -DNDEBUG
else
CFLAGS += -fsanitize=address -ftrapv -g
LDFLAGS += -fsanitize=address -ftrapv
endif
CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive
LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive
LDLIBS += -lglfw3 -larchive -lm LDLIBS += -lglfw3 -larchive -lm
CFLAGS += -std=gnu99 -g -MMD -MP
CFLAGS += -Wall -Wextra -Wpedantic -Wno-pointer-arith
# detect if we're compiling on Windows, meaning # detect if we're compiling on Windows, meaning
# a lot of things considered "standard" are unavailable. # a lot of things considered "standard" are unavailable.
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
ISWIN = 1 NAME := $(NAME).exe
NAME := $(NAME).exe
LDLIBS += -lopengl32 -lgdi32 LDLIBS += -lopengl32 -lgdi32
$(warning Detected Windows_NT, please refer to the documentation if you encounter issues.) $(warning Detected Windows_NT, please refer to the documentation if you encounter issues.)
# in the case of Mac OS X
else ifeq ($(shell uname -s),Darwin) else ifeq ($(shell uname -s),Darwin)
LDLIBS += -framework Cocoa -framework OpenGL -framework IOKit LDLIBS += -framework Coca -framework OpenGL -framework IOKit
$(info Mac OS X detected.)
endif endif
# TODO: find a better method to find all source files
# find all the source files using wildcards # find all the source files using wildcards
# TODO: find a better method to find all source files
# NOTE: MS-DOS and MS-Windows uses backslash `\`, this might break. # NOTE: MS-DOS and MS-Windows uses backslash `\`, this might break.
RES := $(wildcard res/*) RES := $(wildcard res/*)
SRC := $(wildcard src/*.c src/*/*.c src/*/*/*.c src/*/*/*/*.c src/*/*/*/*/*.c src/*/*/*/*/*/*.c src/*/*/*/*/*/*/*.c src/*/*/*/*/*/*/*/*.c) lib/glad/src/gl.c SRC := $(wildcard src/*.c src/*/*.c src/*/*/*.c src/*/*/*/*.c src/*/*/*/*/*.c src/*/*/*/*/*/*.c src/*/*/*/*/*/*/*.c src/*/*/*/*/*/*/*/*.c)
OBJ := $(SRC:%.c=obj/%.o) $(RES:%=obj/%.o) SRC += lib/glad/src/gl.c
TSRC := $(wildcard test/*.c test/*/*.c test/*/*/*.c test/*/*/*/*.c test/*/*/*/*/*.c test/*/*/*/*/*/*.c test/*/*/*/*/*/*/*.c test/*/*/*/*/*/*/*/*.c) TSRC := $(wildcard test/*.c test/*/*.c test/*/*/*.c test/*/*/*/*.c test/*/*/*/*/*.c test/*/*/*/*/*/*.c test/*/*/*/*/*/*/*.c test/*/*/*/*/*/*/*/*.c)
TOBJ := $(TSRC:%.c=obj/%.o)
OBJ := $(RES:%=obj/%.o) $(SRC:%.c=obj/%.o)
TOBJ := $(TSRC:%.c=obj/%.o)
# TODO: potentially automatically detect whether we should compile libs, or if we can just go ahead. # TODO: potentially automatically detect whether we should compile libs, or if we can just go ahead.
.PHONY: all libs test clean clean-libs
.PHONY: all libs check clean clean-libs
all: bin/$(NAME) all: bin/$(NAME)
libs: lib/obj/glfw/ lib/obj/libarchive/ libs: lib/obj/glfw/ lib/obj/libarchive/
test: bin/TEST_$(NAME); bin/TEST_$(NAME) check: bin/TEST_$(NAME); ./$<
clean: clean:; @-$(RM) -r bin/ obj/
ifneq ($(wildcard bin/),) clean-libs:; @-$(RM) -r lib/obj/
rm -vr bin/
endif .PHONY:
ifneq ($(wildcard obj/),) install: all
rm -vr obj/ ifneq ($(OS),Windows_NT)
endif # TODO: POSIX-compliant installation
clean-libs: else
ifneq ($(wildcard lib/obj/),) # TODO: WINDOWS_NT installation
rm -vr lib/obj/
endif endif
.PHONY:
install-strip: install
# TODO: strip the produced installation
# compiles the libraries using cmake # compiles the libraries using cmake
lib/obj/%/: lib/%/ lib/obj/%/: lib/%/
$(CMAKE) -S $< -B $@ $(CMAKE) -S $< -B $@
@@ -86,17 +88,18 @@ obj/res/%.c: res/%
@mkdir -p $(@D) @mkdir -p $(@D)
@cd res/ && xxd -i $(patsubst res/%,%,$<) $(abspath $@) @cd res/ && xxd -i $(patsubst res/%,%,$<) $(abspath $@)
obj/res/%.o: obj/res/%.c obj/%.o: %.c
$(info [CC] $@) $(info [CC] $@)
@mkdir -p $(@D) @mkdir -p $(@D)
@$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< @$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
obj/%.o: %.c obj/%.o: obj/%.c
$(info [CC] $@) $(info [CC] $@)
@mkdir -p $(@D) @mkdir -p $(@D)
@$(CC) -c $(CPPFLAGS) $(CFLAGS) -MMD -MP -o $@ $< @$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
# Include the generated dependency files. # Include the generated dependency files.
# Which creates rules for all dependencies, # Which creates rules for all dependencies,
# as a result updating an .o file when a .h is updated. # as a result updating an .o file when a .h is updated.
-include $(OBJ:%.o=%.d) -include $(OBJ:%.o=%.d)
-include $(TOBJ:%.o=%.d)

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "mcx.h" #include "mcx.h"
#include <archive.h> #include <archive.h>
@@ -26,7 +27,8 @@ enum mcx_compression {
}; };
/* first 4 bytes is an i32 indicating remaining bytes, the following byte defines the compression scheme */ /* first 4 bytes is an i32 indicating remaining bytes, the following byte defines the compression scheme */
static int mcx_loadchunk(const u8 *restrict buf, const i32 *restrict table, int idx) { static int mcx_loadchunk(const u8 *restrict buf, const i32 *restrict table, int idx)
{
const u8 *chunk = buf + (be32toh(table[idx]) >> 8) * SECTOR; const u8 *chunk = buf + (be32toh(table[idx]) >> 8) * SECTOR;
i32 len; i32 len;
@@ -64,7 +66,8 @@ static int mcx_loadchunk(const u8 *restrict buf, const i32 *restrict table, int
error("failed to decompress %i bytes of compression type %i", len, *chunk); error("failed to decompress %i bytes of compression type %i", len, *chunk);
return 1; return 1;
} }
if (size == 0) break; if (size == 0)
break;
// TODO: handle data // TODO: handle data
} }
@@ -72,9 +75,10 @@ static int mcx_loadchunk(const u8 *restrict buf, const i32 *restrict table, int
} }
/* Moves chunks `src_s` to `src_e` (inclusive) from `src`, back onto `dst`. */ /* Moves chunks `src_s` to `src_e` (inclusive) from `src`, back onto `dst`. */
static void mvchunks(u8 *dst, u8 *src, u32 *restrict table, int src_s, int src_e) { static void mvchunks(u8 *dst, u8 *src, u32 *restrict table, int src_s, int src_e)
{
assert(src > dst); assert(src > dst);
usize len = src - dst; // acquire the amount of bytes that we shall move uintptr len = src - dst; // acquire the amount of bytes that we shall move
assert(!(len % SECTOR)); assert(!(len % SECTOR));
// count how many bytes we need to move, whilst updating location data // count how many bytes we need to move, whilst updating location data
@@ -89,7 +93,8 @@ static void mvchunks(u8 *dst, u8 *src, u32 *restrict table, int src_s, int src_e
/* Deletes chunk `sidx` by moving chunks up to `eidx` back over `sidx` in `buf`. /* Deletes chunk `sidx` by moving chunks up to `eidx` back over `sidx` in `buf`.
* `rmb` is an optional additional offset that can be applied, and signifies bytes already removed. * `rmb` is an optional additional offset that can be applied, and signifies bytes already removed.
* Returns the bytes removed by this function. */ * Returns the bytes removed by this function. */
static usize delchunk(u8 *restrict buf, u32 *restrict table, usize rmb, int sidx, int eidx) { static usize delchunk(u8 *restrict buf, u32 *restrict table, usize rmb, int sidx, int eidx)
{
// load the table data // load the table data
usize slen, bidx, blen; usize slen, bidx, blen;
slen = be32toh(table[sidx]) & 0xFF; // acquire the sector length of the chunk slen = be32toh(table[sidx]) & 0xFF; // acquire the sector length of the chunk
@@ -110,7 +115,8 @@ static usize delchunk(u8 *restrict buf, u32 *restrict table, usize rmb, int sidx
/* Call `delchunk` with the parameters and some defaults. Ensuring the table is copied correctly as well. /* Call `delchunk` with the parameters and some defaults. Ensuring the table is copied correctly as well.
* This is done instead of `delchunk` being globally linked, because * This is done instead of `delchunk` being globally linked, because
* `delchunk` requests more specific parameters, which is confusing outside this module. */ * `delchunk` requests more specific parameters, which is confusing outside this module. */
usize mcx_delchunk(u8 *restrict buf, int chunk) { usize mcx_delchunk(u8 *restrict buf, int chunk)
{
u32 table[TABLE]; u32 table[TABLE];
memcpy(table, buf, sizeof(table)); memcpy(table, buf, sizeof(table));
usize res = delchunk(buf, table, 0, chunk, CHUNKS); usize res = delchunk(buf, table, 0, chunk, CHUNKS);
@@ -118,7 +124,8 @@ usize mcx_delchunk(u8 *restrict buf, int chunk) {
return res; return res;
} }
usize mcx_delchunk_range(u8 *restrict buf, int start, int end) { usize mcx_delchunk_range(u8 *restrict buf, int start, int end)
{
assert(start < end && end < CHUNKS); assert(start < end && end < CHUNKS);
u32 table[TABLE]; u32 table[TABLE];
memcpy(table, buf, sizeof(table)); memcpy(table, buf, sizeof(table));
@@ -141,7 +148,8 @@ usize mcx_delchunk_range(u8 *restrict buf, int start, int end) {
} }
/* comparer function for to be inputted into `qsort` to compare two */ /* comparer function for to be inputted into `qsort` to compare two */
static int cmp_chunkids(const void *restrict x, const void *restrict y) { static int cmp_chunkids(const void *restrict x, const void *restrict y)
{
u16 x2 = *(u16 *)x; u16 x2 = *(u16 *)x;
u16 y2 = *(u16 *)y; u16 y2 = *(u16 *)y;
return (x2 > y2) - (x2 < y2); return (x2 > y2) - (x2 < y2);
@@ -149,7 +157,8 @@ static int cmp_chunkids(const void *restrict x, const void *restrict y) {
/* Sorts the chunks marked for deletion from smallest to greatest index. /* Sorts the chunks marked for deletion from smallest to greatest index.
* Then performs the deletion in this order. Making sure to only update the chunks up to the next. */ * Then performs the deletion in this order. Making sure to only update the chunks up to the next. */
usize mcx_delchunk_bulk(u8 *restrict buf, const u16 *restrict chunks, int chunkc) { usize mcx_delchunk_bulk(u8 *restrict buf, const u16 *restrict chunks, int chunkc)
{
// ensure the chunks ids we're working on are sorted from least to greatest // ensure the chunks ids we're working on are sorted from least to greatest
u16 chunkids[chunkc + 1]; u16 chunkids[chunkc + 1];
memcpy(chunkids, chunks, chunkc); memcpy(chunkids, chunks, chunkc);
@@ -169,7 +178,8 @@ usize mcx_delchunk_bulk(u8 *restrict buf, const u16 *restrict chunks, int chunkc
/* Sum together the 4th byte in each location integer to compute the sector size of all chunks. /* Sum together the 4th byte in each location integer to compute the sector size of all chunks.
* Multiplying by `SECTOR`, and adding the size of the table itself. */ * Multiplying by `SECTOR`, and adding the size of the table itself. */
usize mcx_calcsize(const u8 *restrict buf) { usize mcx_calcsize(const u8 *restrict buf)
{
usize size = 0; usize size = 0;
for (uint i = 0; i < CHUNKS; i++) for (uint i = 0; i < CHUNKS; i++)
size += *(buf + (i * 4) + 3); size += *(buf + (i * 4) + 3);

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include <stdlib.h> #include <stdlib.h>

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "nbt.h" #include "nbt.h"
#include <assert.h> #include <assert.h>
@@ -13,21 +14,24 @@
#define MAX_DEPTH 512 #define MAX_DEPTH 512
/* Extracts a big endian 16 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 16 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u16 buftoh16(const void *restrict buf) { static inline u16 buftoh16(const void *restrict buf)
{
u16 i; u16 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return be16toh(i); return be16toh(i);
} }
/* Extracts a big endian 32 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 32 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u32 buftoh32(const void *restrict buf) { static inline u32 buftoh32(const void *restrict buf)
{
u32 i; u32 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return be32toh(i); return be32toh(i);
} }
/* Extracts a big endian 64 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 64 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u64 buftoh64(const void *restrict buf) { static inline u64 buftoh64(const void *restrict buf)
{
u64 i; u64 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return be64toh(i); return be64toh(i);
@@ -36,7 +40,8 @@ static inline u64 buftoh64(const void *restrict buf) {
/* Processes the incoming array data in `buf`. Which contains `nmem` items of `size`. /* Processes the incoming array data in `buf`. Which contains `nmem` items of `size`.
* The data shall be converted to little-endian on little-endian systems * The data shall be converted to little-endian on little-endian systems
* Outputs the allocated data to `out`, returns where the next pointer would be. */ * Outputs the allocated data to `out`, returns where the next pointer would be. */
static const u8 *procarr(const u8 *restrict buf, i32 nmemb, uint size, struct nbt_array *restrict out) { static const u8 *procarr(const u8 *restrict buf, i32 nmemb, uint size, struct nbt_array *restrict out)
{
usize len = nmemb * size; usize len = nmemb * size;
*out = (struct nbt_array){ *out = (struct nbt_array){
out->nmemb = nmemb, out->nmemb = nmemb,
@@ -51,7 +56,8 @@ static const u8 *procarr(const u8 *restrict buf, i32 nmemb, uint size, struct nb
/* Only include this code for little-endian systems. Since only they require this logic. /* Only include this code for little-endian systems. Since only they require this logic.
* Producing optimised code for other platforms. */ * Producing optimised code for other platforms. */
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
if (size == 1) return buf; if (size == 1)
return buf;
i32 i = 0; i32 i = 0;
while (i < nmemb) { while (i < nmemb) {
switch (size) { switch (size) {
@@ -67,7 +73,8 @@ static const u8 *procarr(const u8 *restrict buf, i32 nmemb, uint size, struct nb
} }
/* calls `procarr` for the simple types available. */ /* calls `procarr` for the simple types available. */
static const u8 *proclist(const u8 *restrict buf, struct nbt_array *restrict out) { static const u8 *proclist(const u8 *restrict buf, struct nbt_array *restrict out)
{
uint size; uint size;
switch (*(u8 *)buf) { switch (*(u8 *)buf) {
@@ -88,7 +95,8 @@ static const u8 *proclist(const u8 *restrict buf, struct nbt_array *restrict out
return procarr(buf, len, size, out); return procarr(buf, len, size, out);
} }
const u8 *nbt_proctag(const u8 *restrict buf, u16 slen, void *restrict out) { const u8 *nbt_proctag(const u8 *restrict buf, u16 slen, void *restrict out)
{
const u8 *ptr, *tmp; const u8 *ptr, *tmp;
ptr = buf + 3 + slen; ptr = buf + 3 + slen;
@@ -123,7 +131,8 @@ const u8 *nbt_proctag(const u8 *restrict buf, u16 slen, void *restrict out) {
* `ptr` is assumed to be the start of the `NBT_LIST` data, e.i. The list's ID, followed by the list's length. * `ptr` is assumed to be the start of the `NBT_LIST` data, e.i. The list's ID, followed by the list's length.
* If `ID` is `NBT_I8`, `NBT_I16`, `NBT_I32`, `NBT_I64`, `NBT_F32`, or `NBT_F64`, the entire list length is computed and returned. * If `ID` is `NBT_I8`, `NBT_I16`, `NBT_I32`, `NBT_I64`, `NBT_F32`, or `NBT_F64`, the entire list length is computed and returned.
* For other types this won't be possible, and thus will add `1` to `dpt`, and write the list data to `lens` and `tags` at this new `dpt`. */ * For other types this won't be possible, and thus will add `1` to `dpt`, and write the list data to `lens` and `tags` at this new `dpt`. */
static const u8 *nexttag_list(const u8 *restrict ptr, uint *restrict const dpt, i32 *restrict const lens, u8 *restrict const tags) { static const u8 *nexttag_list(const u8 *restrict ptr, uint *restrict const dpt, i32 *restrict const lens, u8 *restrict const tags)
{
const u8 *tag = ptr; const u8 *tag = ptr;
ptr++; ptr++;
switch (*tag) { switch (*tag) {
@@ -151,7 +160,8 @@ static const u8 *nexttag_list(const u8 *restrict ptr, uint *restrict const dpt,
* - `lens` shall contain `MAX_DEPTH` of items representing the list length, if the current item is non-zero we shall assume we're in a list. * - `lens` shall contain `MAX_DEPTH` of items representing the list length, if the current item is non-zero we shall assume we're in a list.
* Where the value is decremented until we reach `0`. * Where the value is decremented until we reach `0`.
* - `tags` shall contain `MAX_DEPTH` of items representing the list's stored type. */ * - `tags` shall contain `MAX_DEPTH` of items representing the list's stored type. */
static const u8 *nexttag(const u8 *restrict tag, uint *restrict const dpt, i32 *restrict const lens, u8 *restrict const tags) { static const u8 *nexttag(const u8 *restrict tag, uint *restrict const dpt, i32 *restrict const lens, u8 *restrict const tags)
{
u8 type; u8 type;
const u8 *ptr = tag; const u8 *ptr = tag;
if (lens[*dpt]) { if (lens[*dpt]) {
@@ -193,7 +203,8 @@ static const u8 *nexttag(const u8 *restrict tag, uint *restrict const dpt, i32 *
* - compound:list:int32 * - compound:list:int32
* - string * - string
*/ */
const u8 *nbt_nexttag(const u8 *restrict buf) { const u8 *nbt_nexttag(const u8 *restrict buf)
{
const u8 *tag; const u8 *tag;
u8 tags[MAX_DEPTH] = {0}; u8 tags[MAX_DEPTH] = {0};
i32 lens[MAX_DEPTH] = {0}; i32 lens[MAX_DEPTH] = {0};

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include <assert.h> #include <assert.h>

35
src/io/conf.c Normal file
View File

@@ -0,0 +1,35 @@
#include "conf.h"
#include <string.h>
#include "../types.h"
#include "../util/atrb.h"
/* Matches s1 with s2, returns a pointer to s1 where the match stopped. */
static const char *strmat(const char *s1, const char *s2) PURE NONNULL((1, 2));
static const char *strmat(const char *s1, const char *s2)
{
while ((*s1 == *s2) & !!*s1)
s1++, s2++;
return s1;
}
int conf_getkeyval(const char *restrict buf, const char *const restrict *restrict keys, int klen, const char *restrict *restrict out)
{
const char *tmp = NULL;
ASSUME((klen > 0));
int i = 0;
for (; i < klen && !tmp; i++) {
tmp = strmat(buf, keys[i]);
tmp = keys[i][buf - tmp] ? tmp : 0;
}
if (!tmp || *tmp != '=')
return -1;
*out = tmp + 1;
return i;
}
int conf_val(int);

12
src/io/conf.h Normal file
View File

@@ -0,0 +1,12 @@
#pragma once
#include "../types.h"
#include "../util/atrb.h"
/* Gets the key and value, if present. Writes the pointer for the value to `out`.
* Returns the key index, or <0 upon failure. */
int conf_getkeyval(const char *restrict buf, const char *const restrict *restrict keys, int klen,
const char *restrict *restrict out) NONNULL((1, 2, 4));
/* Processes the value of `type` in `val`. Outputs to `out`.
* Returns non-zero on failure. */
int conf_procval(u8 type, const char *restrict val, void *restrict out) NONNULL((2, 3));

View File

@@ -1,10 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#pragma once
#include <GLFW/glfw3.h>
#include <glad/gl.h>
int render_init(void);
void render_update(GLFWwindow *win);
void render_free(void);

View File

@@ -1,70 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#include "mapcolour.h"
#include "../../util/vec.h"
u8vec4 map_colours[MAP_COLOUR_COUNT] = {
{0, 0, 0, 0 },
{127, 178, 56, 255},
{247, 233, 163, 255},
{199, 199, 199, 255},
{255, 0, 0, 255},
{160, 160, 255, 255},
{167, 167, 167, 255},
{0, 124, 0, 255},
{255, 255, 255, 255},
{164, 168, 184, 255},
{151, 109, 77, 255},
{112, 112, 112, 255},
{64, 64, 255, 255},
{143, 119, 72, 255},
{255, 252, 245, 255},
{216, 127, 51, 255},
{178, 76, 216, 255},
{102, 153, 216, 255},
{229, 229, 51, 255},
{127, 204, 25, 255},
{242, 127, 165, 255},
{76, 76, 76, 255},
{153, 153, 153, 255},
{76, 127, 153, 255},
{127, 63, 178, 255},
{51, 76, 178, 255},
{102, 76, 51, 255},
{102, 127, 51, 255},
{153, 51, 51, 255},
{25, 25, 25, 255},
{250, 238, 77, 255},
{92, 219, 213, 255},
{74, 128, 255, 255},
{0, 217, 58, 255},
{129, 86, 49, 255},
{112, 2, 0, 255},
{209, 177, 161, 255},
{159, 82, 36, 255},
{149, 87, 108, 255},
{112, 108, 138, 255},
{186, 133, 36, 255},
{103, 117, 53, 255},
{160, 77, 78, 255},
{57, 41, 35, 255},
{135, 107, 98, 255},
{87, 92, 92, 255},
{122, 73, 88, 255},
{76, 62, 92, 255},
{76, 50, 35, 255},
{76, 82, 42, 255},
{142, 60, 46, 255},
{37, 22, 16, 255},
{189, 48, 49, 255},
{148, 63, 97, 255},
{92, 25, 29, 255},
{22, 126, 134, 255},
{58, 142, 140, 255},
{86, 44, 62, 255},
{20, 180, 133, 255},
{100, 100, 100, 255},
{216, 175, 147, 255},
{127, 167, 150, 255},
};

View File

@@ -1,76 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#pragma once
#include "../../util/vec.h"
enum map_colour_id {
MAP_COLOUR_NONE,
MAP_COLOUR_GRASS,
MAP_COLOUR_SAND,
MAP_COLOUR_WOOL,
MAP_COLOUR_FIRE,
MAP_COLOUR_ICE,
MAP_COLOUR_METAL,
MAP_COLOUR_PLANT,
MAP_COLOUR_SNOW,
MAP_COLOUR_CLAY,
MAP_COLOUR_DIRT,
MAP_COLOUR_STONE,
MAP_COLOUR_WATER,
MAP_COLOUR_WOOD,
MAP_COLOUR_QUARTZ,
MAP_COLOUR_ORANGE,
MAP_COLOUR_MAGENTA,
MAP_COLOUR_LIGHT_BLUE,
MAP_COLOUR_YELLOW,
MAP_COLOUR_LIGHT_GREEN,
MAP_COLOUR_PINK,
MAP_COLOUR_GREY,
MAP_COLOUR_LIGHT_GREY,
MAP_COLOUR_CYAN,
MAP_COLOUR_PURPLE,
MAP_COLOUR_BLUE,
MAP_COLOUR_BROWN,
MAP_COLOUR_GREEN,
MAP_COLOUR_RED,
MAP_COLOUR_BLACK,
MAP_COLOUR_GOLD,
MAP_COLOUR_DIAMOND,
MAP_COLOUR_LAPIS,
MAP_COLOUR_EMERALD,
MAP_COLOUR_PODZOL,
MAP_COLOUR_NETHER,
MAP_COLOUR_TERRACOTTA_WHITE,
MAP_COLOUR_TERRACOTTA_ORANGE,
MAP_COLOUR_TERRACOTTA_MAGENTA,
MAP_COLOUR_TERRACOTTA_LIGHT_BLUE,
MAP_COLOUR_TERRACOTTA_YELLOW,
MAP_COLOUR_TERRACOTTA_LIGHT_GREEN,
MAP_COLOUR_TERRACOTTA_PINK,
MAP_COLOUR_TERRACOTTA_GREY,
MAP_COLOUR_TERRACOTTA_LIGHT_GREY,
MAP_COLOUR_TERRACOTTA_CYAN,
MAP_COLOUR_TERRACOTTA_PURPLE,
MAP_COLOUR_TERRACOTTA_BLUE,
MAP_COLOUR_TERRACOTTA_BROWN,
MAP_COLOUR_TERRACOTTA_GREEN,
MAP_COLOUR_TERRACOTTA_RED,
MAP_COLOUR_TERRACOTTA_BLACK,
MAP_COLOUR_CRIMSON_NYLIUM,
MAP_COLOUR_CRIMSON_STEM,
MAP_COLOUR_CRIMSON_HYPHAE,
MAP_COLOUR_WARPED_NYLIUM,
MAP_COLOUR_WARPED_STEM,
MAP_COLOUR_WARPED_HYPHAE,
MAP_COLOUR_WARPED_WART_BLOCK,
MAP_COLOUR_DEEPSLATE,
MAP_COLOUR_RAW_IRON,
MAP_COLOUR_GLOW_LICHEN,
// contains count, leave last
MAP_COLOUR_COUNT,
};
/* contains the colours of the map on their' respective index - 1. (NONE should be handled separately) */
extern u8vec4 map_colours[MAP_COLOUR_COUNT];

View File

@@ -1,10 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#pragma once
#include <glad/gl.h>
#include <stddef.h>
#include <stdint.h>
/* Initialises the (embedded) shaders onto `pipe` */
int shader_init(GLuint pipe);

View File

@@ -1,10 +1,12 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "input.h" #include "input.h"
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
void input_callback(GLFWwindow *win, int key, int scancode, int action, int mods) { void input_callback(GLFWwindow *win, int key, int scancode, int action, int mods)
{
(void)win, (void)key, (void)scancode, (void)action, (void)mods; // make the compiler shut up as this is fine (void)win, (void)key, (void)scancode, (void)action, (void)mods; // make the compiler shut up as this is fine
#ifndef NDEBUG #ifndef NDEBUG
if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS) if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>

View File

@@ -1,13 +1,14 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "render.h" #include "render.h"
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <glad/gl.h> #include <glad/gl.h>
#include <stdint.h> #include <stdint.h>
#include "../types.h" #include "../../types.h"
#include "../util/error.h" #include "../../util/error.h"
#include "shader.h" #include "shader.h"
#define VERTC 3 #define VERTC 3
@@ -17,7 +18,8 @@ static GLuint vao; // vertex array object
static GLuint screen_loc; // location to where OpenGL sends to the shaders of the screen dimensions static GLuint screen_loc; // location to where OpenGL sends to the shaders of the screen dimensions
static int win_w, win_h; static int win_w, win_h;
static void screen_resize(int w, int h) { static void screen_resize(int w, int h)
{
i32 verts[VERTC][4] = { i32 verts[VERTC][4] = {
{0, 0, w, 20 }, {0, 0, w, 20 },
{0, 20, w, h - 40}, {0, 20, w, h - 40},
@@ -31,7 +33,8 @@ static void screen_resize(int w, int h) {
win_h = h; win_h = h;
} }
int render_init(void) { int render_init(void)
{
pipe = glCreateProgram(); pipe = glCreateProgram();
shader_init(pipe); // initialise and include the shaders shader_init(pipe); // initialise and include the shaders
glLinkProgram(pipe); // link the application glLinkProgram(pipe); // link the application
@@ -63,7 +66,8 @@ int render_init(void) {
return 0; return 0;
} }
void render_update(GLFWwindow *win) { void render_update(GLFWwindow *win)
{
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
@@ -80,7 +84,8 @@ void render_update(GLFWwindow *win) {
glDrawArrays(GL_POINTS, 0, VERTC); glDrawArrays(GL_POINTS, 0, VERTC);
} }
void render_free(void) { void render_free(void)
{
glDeleteVertexArrays(1, &vao); glDeleteVertexArrays(1, &vao);
glDeleteBuffers(1, &vbo); glDeleteBuffers(1, &vbo);
glDeleteProgram(pipe); glDeleteProgram(pipe);

11
src/io/win/render.h Normal file
View File

@@ -0,0 +1,11 @@
/* Copyright (c) 2025 Quinn.
* This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once
#include <GLFW/glfw3.h>
#include <glad/gl.h>
int render_init(void);
void render_update(GLFWwindow *win);
void render_free(void);

View File

@@ -1,12 +1,13 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "shader.h" #include "shader.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "../util/error.h" #include "../../util/error.h"
// NOTE: we are currently just sucking up the memory costs for ease. We can either include the source files themselves. Or use compression, where I'd prefer the latter for ease of installation. // NOTE: we are currently just sucking up the memory costs for ease. We can either include the source files themselves. Or use compression, where I'd prefer the latter for ease of installation.
@@ -19,7 +20,8 @@ extern const uint sh_geom_glsl_len;
/* Compiles a shader of `type` from `src` with `len` bytes. /* Compiles a shader of `type` from `src` with `len` bytes.
* Returns the integer for the shader. */ * Returns the integer for the shader. */
static GLuint shader_compile(GLenum type, const char *src, usize len) { static GLuint shader_compile(GLenum type, const char *src, usize len)
{
int ilen = len; int ilen = len;
GLuint shader = glCreateShader(type); GLuint shader = glCreateShader(type);
glShaderSource(shader, 1, &src, &ilen); glShaderSource(shader, 1, &src, &ilen);
@@ -37,7 +39,8 @@ static GLuint shader_compile(GLenum type, const char *src, usize len) {
return shader; return shader;
} }
int shader_init(GLuint pipe) { int shader_init(GLuint pipe)
{
GLuint vs = shader_compile(GL_VERTEX_SHADER, sh_vert_glsl, sh_vert_glsl_len); GLuint vs = shader_compile(GL_VERTEX_SHADER, sh_vert_glsl, sh_vert_glsl_len);
GLuint fs = shader_compile(GL_FRAGMENT_SHADER, sh_frag_glsl, sh_frag_glsl_len); GLuint fs = shader_compile(GL_FRAGMENT_SHADER, sh_frag_glsl, sh_frag_glsl_len);
GLuint gs = shader_compile(GL_GEOMETRY_SHADER, sh_geom_glsl, sh_geom_glsl_len); GLuint gs = shader_compile(GL_GEOMETRY_SHADER, sh_geom_glsl, sh_geom_glsl_len);

11
src/io/win/shader.h Normal file
View File

@@ -0,0 +1,11 @@
/* Copyright (c) 2025 Quinn.
* This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once
#include <glad/gl.h>
#include <stddef.h>
#include <stdint.h>
/* Initialises the (embedded) shaders onto `pipe` */
int shader_init(GLuint pipe);

View File

@@ -1,13 +1,14 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "window.h" #include "window.h"
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <assert.h> #include <assert.h>
#include <glad/gl.h> #include <glad/gl.h>
#include "../types.h" #include "../../types.h"
#include "../util/error.h" #include "../../util/error.h"
#include "input.h" #include "input.h"
#include "render.h" #include "render.h"
@@ -15,7 +16,8 @@ static struct GLFWwindow *win = NULL;
/* Initialises the GLFW window with some defaults, /* Initialises the GLFW window with some defaults,
* then proceed to activate OpenGL on it. */ * then proceed to activate OpenGL on it. */
int window_init(void) { int window_init(void)
{
// initialise the window // initialise the window
#ifndef NDEBUG #ifndef NDEBUG
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE); glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE);
@@ -32,10 +34,12 @@ int window_init(void) {
/* NOTE: on my system; x86_64, GTX 1650 580.82.09-2, X11, i3, this causes one direct, 2 indirect memory leaks. /* NOTE: on my system; x86_64, GTX 1650 580.82.09-2, X11, i3, this causes one direct, 2 indirect memory leaks.
* This is not my fault, and can safely be ignored. */ * This is not my fault, and can safely be ignored. */
win = glfwCreateWindow(640, 480, "MCA-Selector lite", NULL, NULL); win = glfwCreateWindow(640, 480, "MCA-Selector lite", NULL, NULL);
if (!win) return 1; if (!win)
return 1;
glfwMakeContextCurrent(win); glfwMakeContextCurrent(win);
if (!gladLoadGL(glfwGetProcAddress)) return 1; if (!gladLoadGL(glfwGetProcAddress))
return 1;
glfwSwapInterval(1); // wait 1 screen update for a redraw a.k.a. "vsync". (not really applicable in this case but eh) glfwSwapInterval(1); // wait 1 screen update for a redraw a.k.a. "vsync". (not really applicable in this case but eh)
glfwSetKeyCallback(win, input_callback); glfwSetKeyCallback(win, input_callback);
@@ -53,7 +57,8 @@ int window_init(void) {
return 0; return 0;
} }
void window_loop(void) { void window_loop(void)
{
assert(win); assert(win);
render_init(); render_init();
while (!glfwWindowShouldClose(win)) { while (!glfwWindowShouldClose(win)) {
@@ -65,12 +70,14 @@ void window_loop(void) {
} }
} }
void window_close(void) { void window_close(void)
{
assert(win); assert(win);
glfwSetWindowShouldClose(win, 1); glfwSetWindowShouldClose(win, 1);
} }
void window_free(void) { void window_free(void)
{
if (!win) { if (!win) {
debug("window has already been freed."); debug("window has already been freed.");
return; return;

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
/* Set up the window, enabling OpenGL, and /* Set up the window, enabling OpenGL, and

View File

@@ -1,19 +1,22 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <glad/gl.h> #include <glad/gl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "io/window.h" #include "io/win/window.h"
#include "util/error.h" #include "util/error.h"
/* reroutes GLFW errors to our logging system. */ /* reroutes GLFW errors to our logging system. */
static void error_callback(int err, const char *const msg) { static void error_callback(int err, const char *const msg)
{
error("glfw returned (%i); \"%s\"", err, msg); error("glfw returned (%i); \"%s\"", err, msg);
} }
static void quit(void) { static void quit(void)
{
window_free(); window_free();
/* terminates GLFW; destroying any /* terminates GLFW; destroying any
@@ -23,7 +26,8 @@ static void quit(void) {
/* Entry-point of the application. */ /* Entry-point of the application. */
int main(int argc, char **argv) { int main(int argc, char **argv)
{
(void)argc, (void)argv; (void)argc, (void)argv;
printf("debug: [DBG], info: [INF], warning: [WAR], error: [ERR], fatal: [FAT]\n"); printf("debug: [DBG], info: [INF], warning: [WAR], error: [ERR], fatal: [FAT]\n");
atexit(quit); atexit(quit);

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
typedef signed long long int llong; typedef signed long long int llong;
@@ -19,6 +20,14 @@ typedef __SIZE_TYPE__ usize;
typedef __INTPTR_TYPE__ intptr; typedef __INTPTR_TYPE__ intptr;
typedef __UINTPTR_TYPE__ uintptr; typedef __UINTPTR_TYPE__ uintptr;
#if __SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__
typedef llong ssize;
#elif __SIZEOF_SIZE_T__ == __SIZEOF_LONG__
typedef long ssize;
#elif __SIZEOF_SIZE_T__ == __SIZEOF_INT__
typedef int ssize;
#endif
#if __SIZEOF_FLOAT__ == 4 #if __SIZEOF_FLOAT__ == 4
typedef float f32; typedef float f32;
#endif #endif

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#if defined(__GNUC__) #if defined(__GNUC__)
@@ -56,4 +57,8 @@
#else #else
#define NONNULL(args) #define NONNULL(args)
#endif #endif
#if __has_attribute(__assume__)
#define ASSUME(args) __attribute__((__assume__ args))
#endif
#endif #endif

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#if defined __unix__ #if defined __unix__
@@ -33,14 +34,16 @@ static inline int faccess(const char *restrict fname, int perms);
#define PATH_SEP '/' // contains the path separator as a character. Yes it is extremely annoying that this has to exist. #define PATH_SEP '/' // contains the path separator as a character. Yes it is extremely annoying that this has to exist.
#define PATH_SEP_STR "/" // contains the path separator as a string, useful for concatenation. Yes it is extremely annoying that this has to exist. #define PATH_SEP_STR "/" // contains the path separator as a string, useful for concatenation. Yes it is extremely annoying that this has to exist.
int faccess(char const *restrict fname, int perms) { int faccess(char const *restrict fname, int perms)
{
return access(fname, perms); return access(fname, perms);
} }
#elif defined(_WIN32) #elif defined(_WIN32)
#define PATH_SEP '\\' // contains the path separator as a character. Yes it is extremely annoying that this has to exist. #define PATH_SEP '\\' // contains the path separator as a character. Yes it is extremely annoying that this has to exist.
#define PATH_SEP_STR "\\" // contains the path separator as a string, useful for concatenation. Yes it is extremely annoying that this has to exist. #define PATH_SEP_STR "\\" // contains the path separator as a string, useful for concatenation. Yes it is extremely annoying that this has to exist.
int faccess(char const *restrict fname, int perms) { int faccess(char const *restrict fname, int perms)
{
return _access(fname, perms); return _access(fname, perms);
} }
#else #else

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#if defined(__unix__) #if defined(__unix__)

View File

@@ -1,180 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#include "conf.h"
#include <assert.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../types.h"
#include "../util/error.h"
#include "atrb.h"
int conf_procbuf(const char *restrict buf, char *restrict kout, char *restrict vout, usize len) {
bool feq = false; // whether we've found the equal sign
// data traversal
char *pos = kout; // will point to the next point in the buffer, where we'll write data
// acquire data
for (usize i = 0; i < len; i++) {
// handling of termination tokens
bool brk = false; // whether we broke out of the loop, and are done reading
switch (buf[i]) {
case '\n':
case '\r':
case '\0':
case '#':
brk = true;
break;
}
if (brk) break;
// everything after `=` is interpreted as a value
if (!feq && buf[i] == '=') {
feq = true;
*pos = '\0'; // terminate string
pos = vout; // move pointer to start of value data
continue;
}
*pos = buf[i]; // copy over the buffer's data
pos++; // increment the position pointer
}
// null-terminate what we've got now (yes, there should be enough space for this since \0 isn't stored)
// this also ensures the value is valid, even if none is given
*pos = '\0';
// no data if we didn't move from the key position
// syntax error if we couldn't find the equal sign
return (pos == kout) ? CONF_ENODAT : (!feq ? CONF_ESYNTAX : 0);
}
struct conf_entry const *conf_matchopt(struct conf_entry const *opts, usize optc, const char *restrict key) {
// find a match for the current key
usize i = 0;
for (; i < optc; i++) {
if (strcmp(opts[i].key, key) == 0)
return opts + i;
}
return NULL;
}
int conf_procval(struct conf_entry const *opt, const char *restrict val) {
// parse the data
errno = 0;
char *end;
u8 dat[sizeof(u64)];
switch (opt->type) {
// signed integer data parsing
case CONF_I8:
case CONF_I16:
case CONF_I32:
case CONF_I64:
*(i64 *)dat = strtoll(val, &end, 10); // for signed integer types
break;
// unsigned integer data parsing
case CONF_U8:
case CONF_U16:
case CONF_U32:
case CONF_U64:
*(u64 *)dat = strtoull(val, &end, 10); // for unsigned integer types
break;
// floating-point data parsing
case CONF_F32: *(f32 *)dat = strtof(val, &end); break;
case CONF_F64: *(f64 *)dat = strtod(val, &end); break;
// string data parsing
case CONF_STR:
if (*(char **)opt->out) {
free(*(char **)opt->out); // if the same key is given multiple times, free the memory so we don't leak.
warn("encountered a dynamic string multiple times, this is sub-optimal.");
}
*(char **)opt->out = strdup(val);
return 0;
case CONF_FSTR: {
struct conf_fstr *s = opt->out;
strncpy(s->out, val, s->len);
s->out[s->len - 1] = '\0'; // ensure the string is null-terminated
return 0;
}
default: return CONF_EINVALIDTYPE; // return error code indicating function not implemented
}
if (errno || end == val || *end != '\0') {
error("failed to parse '%s' as a numeric value", val);
return CONF_EPARSE;
}
switch (opt->type) {
case CONF_U8: *(u8 *)opt->out = *(u64 *)dat >= UINT8_MAX ? UINT8_MAX : *(u64 *)dat; return 0;
case CONF_U16: *(u16 *)opt->out = *(u64 *)dat >= UINT16_MAX ? UINT16_MAX : *(u64 *)dat; return 0;
case CONF_U32: *(u32 *)opt->out = *(u64 *)dat >= UINT32_MAX ? UINT32_MAX : *(u64 *)dat; return 0;
case CONF_U64: *(u64 *)opt->out = *(u64 *)dat >= UINT64_MAX ? UINT64_MAX : *(u64 *)dat; return 0;
case CONF_I8: *(i8 *)opt->out = *(i64 *)dat >= INT8_MAX ? INT8_MAX : (*(i64 *)dat <= INT8_MIN ? INT8_MIN : *(i64 *)dat); return 0;
case CONF_I16: *(i16 *)opt->out = *(i64 *)dat >= INT16_MAX ? INT16_MAX : (*(i64 *)dat <= INT16_MIN ? INT16_MIN : *(i64 *)dat); return 0;
case CONF_I32: *(i32 *)opt->out = *(i64 *)dat >= INT32_MAX ? INT32_MAX : (*(i64 *)dat <= INT32_MIN ? INT32_MIN : *(i64 *)dat); return 0;
case CONF_I64: *(i64 *)opt->out = *(i64 *)dat >= INT64_MAX ? INT64_MAX : (*(i64 *)dat <= INT64_MIN ? INT64_MIN : *(i64 *)dat); return 0;
case CONF_F32: *(f32 *)opt->out = *(f32 *)dat; return 0;
case CONF_F64: *(f64 *)opt->out = *(f64 *)dat; return 0;
default: fatal("invalid switch state, all cases should be handled already"); // abort; this shouldn't be possible, so I blame the programmer
}
}
/* utility function for conf_getpat to concatenate 3 strings, where we already know the size */
NONNULL((1, 3))
static char *conf_getpat_concat(const char *restrict s1, const char *restrict s2, const char *restrict s3, usize s1len, usize s2len, usize s3len) {
assert(s2 || (!s2 && !s2len)); // ensuring the programmer passes both s2 and s2len as 0, if they intend to
char *buf, *ptr;
// allocate enough data for all three to the buffer
ptr = malloc(s1len + s2len + s3len + 1);
if (!ptr) return NULL;
buf = ptr; // store the head pointer into buf
// copy data to the buffer
ptr = memcpy(ptr, s1, s1len) + s1len; // copy s1 data to the buffer
if (s2len) ptr = memcpy(ptr, s2, s2len) + s2len; // copy s2 data to the buffer (excluding null-terminator)
(void)strcpy(ptr, s3); // copy s3 as a string, thus including null-terminator
// return the buffer
return buf;
}
/* appends str to the config directory string we acquire from environment variables. */
char *conf_getpat(const char *restrict str) {
char *buf = NULL;
usize len;
usize str_len = strlen(str);
#if defined(__linux__)
buf = getenv("XDG_CONFIG_HOME");
if (!buf) {
buf = getenv("HOME");
if (!buf) return NULL;
len = strlen(buf);
return conf_getpat_concat(buf, "/.config", str, len, 8, str_len);
}
return conf_getpat_concat(buf, NULL, str, strlen(buf), 0, str_len);
#elif defined(__APPLE__)
buf = getenv("HOME");
if (!buf) return NULL;
len = strlen(buf);
return conf_getpat_concat(buf, "/Library/Application Support", str, len, 28, str_len);
#elif defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
buf = getenv("APPDATA");
if (!buf) {
buf = getenv("USERPROFILE");
if (!buf) return NULL;
len = strlen(buf);
return conf_getpat_concat(buf, "\\AppData\\Roaming", str, len, 16, str_len);
}
return conf_getpat_concat(buf, NULL, str, strlen(buf), 0, str_len);
#else
#error platform unsupported!
#endif
}

View File

@@ -1,70 +0,0 @@
/* Copyright (c) 2025 Quinn
* Licensed under the MIT Licence. See LICENSE for details */
#pragma once
#include <stddef.h>
#include <stdlib.h>
#include "../types.h"
#include "atrb.h"
/* error codes */
enum conf_err {
CONF_ENODAT = -1, // no data was found
CONF_ESYNTAX = 1, // couldn't extract clear key/val data
CONF_ENOMATCH = 2, // couldn't find a match for the inputted key
CONF_EINVALIDTYPE = 3, // the type inputted in conf_entry was invalid
CONF_EPARSE = 4, // something went wrong whilst parsing
};
/* defines the primitive types available in the config file */
enum conf_primitive {
CONF_STR = 0, // expects: `char**`, will output malloc'd data !!must be freed!!
CONF_I8 = 1, // expects: `int8_t*`, will point to a location in memory where an i8 is stored.
CONF_I16 = 2, // expects: `int16_t*`, will point to a location in memory where an i16 is stored.
CONF_I32 = 4, // expects: `int32_t*`, will point to a location in memory where an i32 is stored.
CONF_I64 = 8, // expects: `int64_t*`, will point to a location in memory where an i64 is stored.
CONF_U8 = CONF_I8 | 0x80, // expects: `uint8_t*`, will point to a location in memory where an u8 is stored.
CONF_U16 = CONF_I16 | 0x80, // expects: `uint16_t*`, will point to a location in memory where an u16 is stored.
CONF_U32 = CONF_I32 | 0x80, // expects: `uint32_t*`, will point to a location in memory where an u32 is stored.
CONF_U64 = CONF_I64 | 0x80, // expects: `uint64_t*`, will point to a location in memory where an u64 is stored.
CONF_F32 = CONF_I32 | 0x40, // expects: `float*`, will point to a location in memory where an f32 is stored.
CONF_F64 = CONF_I64 | 0x40, // expects: `double*`, will point to a location in memory where an f64 is stored.
CONF_FSTR = 0x40, // expects: `struct conf_fstr*`, which contains the data for a fixed-width string
};
/* for outputting a fixed string as this config field */
struct conf_fstr {
usize len; // length in BYTES of the output data
char *out; // where we will output the data
};
/* defines the structure of a config file entry */
struct conf_entry {
const char *key; // the key of this entry
void *out; // the pointer to which the data is written value is read if the given option is incorrect or missing
u8 type; // the primitive type which we are querying for
};
/* processes an incoming buffer.
* `buf`, `kout` and `vout` mustn't overlap, and must be (at least) `len` bytes long!
* `kout` and `vout` will contain a null-terminated string if the function returned successfully.
* returns `0` on success, `<0` when no data was found. `>0` when data was invalid but something went wrong.
* see `CONF_E*` or `enum conf_err` */
int conf_procbuf(const char *restrict buf, char *restrict kout, char *restrict vout, usize len);
/* matches the key with one of the options and returns the pointer. Returns NULL if none could be found. */
struct conf_entry const *conf_matchopt(struct conf_entry const *opts, usize optc, const char *restrict key);
/* processes the value belonging to the key and outputs the result to opts.
* - `val` points to a null-terminated string which contains the key and value.
* returns `0` upon success, non-zero upon failure. For information about specific error codes, see `enum conf_err` */
int conf_procval(struct conf_entry const *opts, const char *restrict val);
/* acquires the config file path, appending str to the end (you need to handle path separators yourself)
* expecting str to be null-terminated
* - linux: reads $XDG_CONFIG_HOME, if empty $HOME/.config is used, if $HOME is empty NULL is returned.
* - windows: reads %APPDATA%, if empty %USERPROFILE%\AppData\Roaming is used, if both are empty NULL is returned.
* - osx: reads $HOME, uses $HOME/Library/Application Support, if $HOME is empty NULL is returned.
* !! A malloc'd null-terminated string is returned !! */
char *conf_getpat(const char *) MALLOC NONNULL((1));

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "error.h" #include "error.h"
#include <stdarg.h> #include <stdarg.h>
@@ -7,15 +8,15 @@
#include "../types.h" #include "../types.h"
static void error_log(FILE *restrict stream, const char *restrict pfx, uint ln, const char *restrict file, const char *restrict fmt, va_list ap) { static void error_log(FILE *restrict stream, const char *restrict pfx, uint ln, const char *restrict file, const char *restrict fmt, va_list ap)
{
fprintf(stream, "(%s:%u) [%s] '", file, ln, pfx); fprintf(stream, "(%s:%u) [%s] '", file, ln, pfx);
vfprintf(stream, fmt, ap); vfprintf(stream, fmt, ap);
fprintf(stream, "'\n"); fprintf(stream, "'\n");
} }
void error_debug(uint ln, const char *restrict file, const char *restrict fmt, ...) { void error_debug(uint ln, const char *restrict file, const char *restrict fmt, ...)
{
#ifndef NDEBUG #ifndef NDEBUG
#else #else
char *env = getenv("DEBUG"); char *env = getenv("DEBUG");
@@ -28,28 +29,32 @@ void error_debug(uint ln, const char *restrict file, const char *restrict fmt, .
va_end(ap); va_end(ap);
} }
void error_info(uint ln, const char *restrict file, const char *restrict fmt, ...) { void error_info(uint ln, const char *restrict file, const char *restrict fmt, ...)
{
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
error_log(stdout, "\033[94mINF\033[0m", ln, file, fmt, ap); error_log(stdout, "\033[94mINF\033[0m", ln, file, fmt, ap);
va_end(ap); va_end(ap);
} }
void error_warn(uint ln, const char *restrict file, const char *restrict fmt, ...) { void error_warn(uint ln, const char *restrict file, const char *restrict fmt, ...)
{
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
error_log(stdout, "\033[93mWAR\033[0m", ln, file, fmt, ap); error_log(stdout, "\033[93mWAR\033[0m", ln, file, fmt, ap);
va_end(ap); va_end(ap);
} }
void error_error(uint ln, const char *restrict file, const char *restrict fmt, ...) { void error_error(uint ln, const char *restrict file, const char *restrict fmt, ...)
{
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
error_log(stdout, "\033[91mERR\033[0m", ln, file, fmt, ap); error_log(stdout, "\033[91mERR\033[0m", ln, file, fmt, ap);
va_end(ap); va_end(ap);
} }
void error_fatal(uint ln, const char *restrict file, const char *restrict fmt, ...) { void error_fatal(uint ln, const char *restrict file, const char *restrict fmt, ...)
{
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
error_log(stdout, "\033[101mFAT\033[0m", ln, file, fmt, ap); error_log(stdout, "\033[101mFAT\033[0m", ln, file, fmt, ap);

View File

@@ -1,13 +1,13 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "../types.h" #include "../types.h"
#include "../util/atrb.h" #include "atrb.h"
#include "../util/macro.h"
void error_debug(uint ln, const char *restrict file, const char *restrict fmt, ...); void error_debug(uint ln, const char *restrict file, const char *restrict fmt, ...);
void error_info(uint ln, const char *restrict file, const char *restrict fmt, ...); void error_info(uint ln, const char *restrict file, const char *restrict fmt, ...);

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#define WIDTHOF(t) (sizeof(t) * 8) // gets the bit width of a type #define WIDTHOF(t) (sizeof(t) * 8) // gets the bit width of a type

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
/* Acquires the next power of two of value `x`. /* Acquires the next power of two of value `x`.

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include "../types.h" #include "../types.h"

View File

@@ -1,12 +1,14 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "test.h" #include "test.h"
#include "test_conf.h" #include "test_conf.h"
int main(void) { int main(void)
{
assert_true(-3 >> 5 == -1); // checking for arithmetic shift, rather than logical shift assert_true(-3 >> 5 == -1); // checking for arithmetic shift, rather than logical shift
assert_true(sizeof(u8) == 1); assert_true(sizeof(u8) == 1);
assert_true(sizeof(u16) == 2); assert_true(sizeof(u16) == 2);
@@ -14,7 +16,7 @@ int main(void) {
assert_true(sizeof(u64) == 8); assert_true(sizeof(u64) == 8);
assert_true(sizeof(f32) == 4); assert_true(sizeof(f32) == 4);
assert_true(sizeof(f64) == 8); assert_true(sizeof(f64) == 8);
assert_true(sizeof(size_t) == sizeof(intptr_t)); assert_true(sizeof(usize) == sizeof(size_t));
test_conf_procbuf("key=val", "key", "val", 0); test_conf_procbuf("key=val", "key", "val", 0);
test_conf_procbuf("sometxt", "sometxt", "", CONF_ESYNTAX); test_conf_procbuf("sometxt", "sometxt", "", CONF_ESYNTAX);
test_conf_procbuf("# comment", "", "", CONF_ENODAT); test_conf_procbuf("# comment", "", "", CONF_ENODAT);

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "test.h" #include "test.h"
#include "../src/types.h" #include "../src/types.h"
@@ -7,7 +8,8 @@
uint test_okay = 0; uint test_okay = 0;
uint test_fail = 0; uint test_fail = 0;
int test_process(int res, const char *restrict file, uint ln, const char *restrict function, const char *restrict expression) { int test_process(int res, const char *restrict file, uint ln, const char *restrict function, const char *restrict expression)
{
const char *status = res ? const char *status = res ?
"[\033[32;1m OK \033[0m]" : "[\033[32;1m OK \033[0m]" :
"[\033[31;1m FAIL \033[0m]"; "[\033[31;1m FAIL \033[0m]";

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include <stdio.h> #include <stdio.h>

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#include "test_conf.h" #include "test_conf.h"
#include <math.h> #include <math.h>
@@ -9,7 +10,8 @@
#include "../src/util/conf.h" #include "../src/util/conf.h"
#include "test.h" #include "test.h"
void test_conf_procbuf(const char *restrict buf, const char *restrict expect_key, const char *restrict expect_val, int expect_return) { void test_conf_procbuf(const char *restrict buf, const char *restrict expect_key, const char *restrict expect_val, int expect_return)
{
usize len = strlen(buf) + 1; usize len = strlen(buf) + 1;
char k[len], v[len]; char k[len], v[len];
*k = '\0', *v = '\0'; *k = '\0', *v = '\0';
@@ -18,20 +20,23 @@ void test_conf_procbuf(const char *restrict buf, const char *restrict expect_key
assert_true(!strcmp(v, expect_val))); assert_true(!strcmp(v, expect_val)));
} }
void test_conf_matchopt(struct conf_entry *opts, usize optc, const char *restrict key, int expect_index) { void test_conf_matchopt(struct conf_entry *opts, usize optc, const char *restrict key, int expect_index)
{
usize idx = opts - conf_matchopt(opts, optc, key); usize idx = opts - conf_matchopt(opts, optc, key);
idx = (ssize)idx < 0 ? -idx : idx; idx = (ssize)idx < 0 ? -idx : idx;
int i = idx < optc ? (int)idx : -1; int i = idx < optc ? (int)idx : -1;
assert_true(i == expect_index); assert_true(i == expect_index);
} }
void test_conf_procval_int(const char *val, u64 expect_value, int type) { void test_conf_procval_int(const char *val, u64 expect_value, int type)
{
u8 out[sizeof(u64)] = {0}; u8 out[sizeof(u64)] = {0};
assert_true(!conf_procval(&(struct conf_entry){NULL, out, type}, val)); assert_true(!conf_procval(&(struct conf_entry){NULL, out, type}, val));
assert_true(memcmp(out, &expect_value, sizeof(u64)) == 0); assert_true(memcmp(out, &expect_value, sizeof(u64)) == 0);
} }
void test_conf_procval_f32(const char *val, f32 expect_value) { void test_conf_procval_f32(const char *val, f32 expect_value)
{
u8 out[4]; u8 out[4];
f32 result; f32 result;
conf_procval(&(struct conf_entry){NULL, out, CONF_F32}, val); conf_procval(&(struct conf_entry){NULL, out, CONF_F32}, val);
@@ -39,40 +44,46 @@ void test_conf_procval_f32(const char *val, f32 expect_value) {
assert_true(fabsf(expect_value - result) < 1e-9f); assert_true(fabsf(expect_value - result) < 1e-9f);
} }
void test_procval_str(void) { void test_procval_str(void)
{
char *out = NULL; char *out = NULL;
(void)(assert_true(!conf_procval(&(struct conf_entry){NULL, (void *)&out, CONF_STR}, "here comes the sowon")) && (void)(assert_true(!conf_procval(&(struct conf_entry){NULL, (void *)&out, CONF_STR}, "here comes the sowon")) &&
assert_false(strcmp("here comes the sowon", out))); assert_false(strcmp("here comes the sowon", out)));
free(out); free(out);
} }
void test_procval_str_predef(void) { void test_procval_str_predef(void)
{
char *out = strdup("owo"); char *out = strdup("owo");
(void)(assert_true(!conf_procval(&(struct conf_entry){NULL, (void *)&out, CONF_STR}, "i leak if I don't free")) && (void)(assert_true(!conf_procval(&(struct conf_entry){NULL, (void *)&out, CONF_STR}, "i leak if I don't free")) &&
assert_true(!strcmp("i leak if I don't free", out))); assert_true(!strcmp("i leak if I don't free", out)));
free(out); free(out);
} }
void test_procval_fstr(void) { void test_procval_fstr(void)
{
char buf[16]; char buf[16];
struct conf_fstr str = {sizeof(buf), buf}; struct conf_fstr str = {sizeof(buf), buf};
(void)(assert_true(!conf_procval(&(struct conf_entry){NULL, &str, CONF_FSTR}, "hewwoo wowld")) && (void)(assert_true(!conf_procval(&(struct conf_entry){NULL, &str, CONF_FSTR}, "hewwoo wowld")) &&
assert_true(!strcmp(str.out, "hewwoo wowld"))); assert_true(!strcmp(str.out, "hewwoo wowld")));
} }
void test_procval_fstr_trunc(void) { void test_procval_fstr_trunc(void)
{
char buf[8]; char buf[8];
struct conf_fstr str = {sizeof(buf), buf}; struct conf_fstr str = {sizeof(buf), buf};
(void)(assert_true(!conf_procval(&(struct conf_entry){NULL, &str, CONF_FSTR}, "hewwooo wowld")) && (void)(assert_true(!conf_procval(&(struct conf_entry){NULL, &str, CONF_FSTR}, "hewwooo wowld")) &&
assert_true(!strcmp(str.out, "hewwooo"))); assert_true(!strcmp(str.out, "hewwooo")));
} }
void test_procval_eparse(void) { void test_procval_eparse(void)
{
i32 out; i32 out;
assert_true(conf_procval(&(struct conf_entry){NULL, &out, CONF_I32}, "owo") == CONF_EPARSE); assert_true(conf_procval(&(struct conf_entry){NULL, &out, CONF_I32}, "owo") == CONF_EPARSE);
} }
void test_conf_getpat(void) { void test_conf_getpat(void)
{
char *path; char *path;
#if defined(__linux__) #if defined(__linux__)
/* test without setting environment variables. */ /* test without setting environment variables. */

View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2025 Quinn /* Copyright (c) 2025 Quinn.
* Licensed under the MIT Licence. See LICENSE for details */ * This is a file from the project MCA-Selector-Lite and is
* licensed under the MIT Licence. See the project's LICENSE file for details. */
#pragma once #pragma once
#include "../src/types.h" #include "../src/types.h"