Merge 0.11->trunk

3 files changed, 93 insertions, 2 deletions

diff --git a/util-src/GNUmakefile b/util-src/GNUmakefile
index e9e06355..0b96bf41 100644
--- a/util-src/GNUmakefile
+++ b/util-src/GNUmakefile
@@ -7,7 +7,7 @@ INSTALL_DATA=install -m644
 TARGET?=../util/
 
 ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \
-    ringbuffer.so time.so poll.so compat.so
+    ringbuffer.so time.so poll.so compat.so strbitop.so
 
 ifdef RANDOM
 ALL+=crand.so
diff --git a/util-src/makefile b/util-src/makefile
index 2db415df..1560fca4 100644
--- a/util-src/makefile
+++ b/util-src/makefile
@@ -6,7 +6,7 @@ INSTALL_DATA=install -m644
 TARGET?=../util/
 
 ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \
-    ringbuffer.so time.so poll.so compat.so
+    ringbuffer.so time.so poll.so compat.so strbitop.so
 
 .ifdef $(RANDOM)
 ALL+=crand.so
diff --git a/util-src/strbitop.c b/util-src/strbitop.c
new file mode 100644
index 00000000..a26288e5
--- /dev/null
+++ b/util-src/strbitop.c
@@ -0,0 +1,91 @@
+/*
+ * This project is MIT licensed. Please see the
+ * COPYING file in the source package for more information.
+ *
+ * Copyright (C) 2016 Kim Alvefur
+ */
+
+#include <lua.h>
+#include <lauxlib.h>
+
+#if (LUA_VERSION_NUM == 501)
+#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
+#endif
+
+/* TODO Deduplicate code somehow */
+
+int strop_and(lua_State* L) {
+	luaL_Buffer buf;
+	size_t a, b, i;
+	const char* str_a = luaL_checklstring(L, 1, &a);
+	const char* str_b = luaL_checklstring(L, 2, &b);
+
+	luaL_buffinit(L, &buf);
+
+	if(a == 0 || b == 0) {
+		lua_settop(L, 1);
+		return 1;
+	}
+
+	for(i = 0; i < a; i++) {
+		luaL_addchar(&buf, str_a[i] & str_b[i % b]);
+	}
+
+	luaL_pushresult(&buf);
+	return 1;
+}
+
+int strop_or(lua_State* L) {
+	luaL_Buffer buf;
+	size_t a, b, i;
+	const char* str_a = luaL_checklstring(L, 1, &a);
+	const char* str_b = luaL_checklstring(L, 2, &b);
+
+	luaL_buffinit(L, &buf);
+
+	if(a == 0 || b == 0) {
+		lua_settop(L, 1);
+		return 1;
+	}
+
+	for(i = 0; i < a; i++) {
+		luaL_addchar(&buf, str_a[i] | str_b[i % b]);
+	}
+
+	luaL_pushresult(&buf);
+	return 1;
+}
+
+int strop_xor(lua_State* L) {
+	luaL_Buffer buf;
+	size_t a, b, i;
+	const char* str_a = luaL_checklstring(L, 1, &a);
+	const char* str_b = luaL_checklstring(L, 2, &b);
+
+	luaL_buffinit(L, &buf);
+
+	if(a == 0 || b == 0) {
+		lua_settop(L, 1);
+		return 1;
+	}
+
+	for(i = 0; i < a; i++) {
+		luaL_addchar(&buf, str_a[i] ^ str_b[i % b]);
+	}
+
+	luaL_pushresult(&buf);
+	return 1;
+}
+
+LUA_API int luaopen_util_strbitop(lua_State *L) {
+	luaL_Reg exports[] = {
+		{ "sand", strop_and },
+		{ "sor",  strop_or },
+		{ "sxor", strop_xor },
+		{ NULL, NULL }
+	};
+
+	lua_newtable(L);
+	luaL_setfuncs(L, exports, 0);
+	return 1;
+}