fix: hopefully fix pathmatch crash

Resolves: #141

Author: mlugg

src/Features/Pathmatch.cpp

@@ -136,20 +136,6 @@ static double dc_get_time() {
 	return (tp.tv_sec * 1e3) + (tp.tv_nsec / 1e6);
 }
 
-template <size_t N>
-static void dc_fix_path(const char *path, char (&dest)[N]) {
-	strncpy(dest, path, N);
-	dest[N - 1] = 0;
-	char *c = dest;
-	while (*c) {
-		c++;
-	}
-	// Chop off any / at the end of the line
-	while (*c && *c == '/') {
-		*c = 0;
-	}
-}
-
 /**
  * Find or populate the dir in the db
  * Calls readdir outright if the dir doesn't exist in the db yet,
@@ -235,11 +221,10 @@ dirent *dircache_readdir(dircontext_t *dir) {
 	return &dir->ent->entries[dir->pos++];
 }
 
+#include "Modules/Console.hpp"
 // opendir(3)
 dircontext_t *dircache_opendir(const char *path) {
-	char fixed[PATH_MAX];  // Correct any bad slashes
-	dc_fix_path(path, fixed);
-	return dc_find_or_populate(fixed);
+	return dc_find_or_populate(path);
 }
 
 // rewinddir(3)

src/Playground.cpp

@@ -0,0 +1,98 @@
+// mlugg's playground :)
+
+#include "Event.hpp"
+#include "Entity.hpp"
+#include "Hook.hpp"
+#include "Scheduler.hpp"
+#include "Command.hpp"
+#include "Variable.hpp"
+#include "Modules/Console.hpp"
+#include "Modules/Client.hpp"
+#include "Modules/Engine.hpp"
+#include "Modules/Server.hpp"
+
+// hooking stuff
+#define _PAT_HOOK_INIT(module, pat, name) \
+	static void _init_fn_##name() { \
+		_orig_##name = (decltype (_orig_##name))Memory::Scan(module ".so", pat); \
+		_hook_##name.SetFunc(_orig_##name); \
+		if (!_orig_##name) Scheduler::InHostTicks(30, []() { console->Print("PATTERN HOOK FAILED: " #name); }); \
+	} \
+	static SarInitHandler _init_##name(_init_fn_##name);
+
+#define PAT_HOOK(module, pat, ret, name, ...) \
+	static ret _detour_##name(__VA_ARGS__); \
+	static ret (*_orig_##name)(__VA_ARGS__); \
+	static Hook _hook_##name(&_detour_##name); \
+	_PAT_HOOK_INIT(module, pat, name) \
+	static ret _detour_##name(__VA_ARGS__)
+
+#define HOOK_ORIG(out, name, ...) \
+	_hook_##name.Disable(); \
+	auto out = _orig_##name(__VA_ARGS__); \
+	_hook_##name.Enable();
+
+#define HOOK_ORIG_V(name, ...) \
+	_hook_##name.Disable(); \
+	_orig_##name(__VA_ARGS__); \
+	_hook_##name.Enable();
+
+#define GEN_HOOK(ret, name, ...) \
+	static ret _detour_##name(__VA_ARGS__); \
+	static ret (*_orig_##name)(__VA_ARGS__); \
+	static Hook _hook_##name(&_detour_##name); \
+	static ret _detour_##name(__VA_ARGS__)
+
+#define INIT_HOOK(name, ptr) \
+	_orig_##name = (ptr); \
+	_hook_##name.SetFunc(_orig_##name);
+
+// small wrappers for command and cvar creation
+#define TEST_CMD(name) CON_COMMAND(test_##name, "Playground test command\n")
+#define TEST_VAR(name) Variable name("test_" #name, "0", "Playground test variable\n", 0)
+
+// convenience macros for common ops
+#define CL_P client->GetPlayer(1)
+#define SV_P server->GetPlayer(1)
+#define CON(s, ...) console->Print(s "\n", __VA_ARGS__)
+#define BREAKPOINT raise(SIGTRAP)
+
+// example usage below
+
+/*
+PAT_HOOK("server", "01 23 45 67", void, MyFunction, void *arg1, bool arg2) {
+	if (use_hook.GetBool()) CON("hookification complete");
+	HOOK_ORIG(res, MyFunction, arg1, arg2);
+	return res;
+}
+
+TEST_CMD(pos) { CON("ur at %.2f %.2f %.2f", SV_ORG(SV_P).x, SV_ORG(SV_P).y, SV_ORG(SV_P).z); }
+TEST_VAR(use_hook)
+*/
+
+// real
+
+GEN_HOOK(void, ButtonTriggerEndTouch, void *thisptr, void *other) {
+	console->Print("ENDTOUCH!!!\n");
+	HOOK_ORIG_V(ButtonTriggerEndTouch, thisptr, other);
+}
+
+ON_EVENT(PRE_TICK) {
+	static bool inited = false;
+	if (inited) return;
+
+	for (int i = 0; i < Offsets::NUM_ENT_ENTRIES; ++i) {
+		void *ent = server->m_EntPtrArray[i].m_pEntity;
+		if (!ent) continue;
+
+		auto classname = server->GetEntityClassName(ent);
+		if (!classname || strcmp(classname, "trigger_portal_button")) continue;
+
+		INIT_HOOK(ButtonTriggerEndTouch, Memory::VMT<void (*)(void *, void *)>(ent, Offsets::StartTouch + 2));
+		inited = true;
+
+		console->Print("HOOKDED\n");
+
+		break;
+	}
+}