Merge commit 'b1e548b96a0a7fbe37ca269ca56fc97444acb2f1' as 'deps/ox'

deps/ox/src/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_subdirectory(ox)

deps/ox/src/ox/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.8)
+
+if(OX_USE_STDLIB STREQUAL "ON")
+	add_subdirectory(clargs)
+endif(OX_USE_STDLIB STREQUAL "ON")
+add_subdirectory(fs)
+add_subdirectory(mc)
+add_subdirectory(std)

deps/ox/src/ox/clargs/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(
+	OxClArgs
+		clargs.cpp
+)
+
+set_property(
+	TARGET
+		OxClArgs
+	PROPERTY
+		POSITION_INDEPENDENT_CODE ON
+)
+
+install(
+	FILES
+		clargs.hpp
+	DESTINATION
+		include/ox/clargs
+)
+
+install(
+	TARGETS
+		OxClArgs
+	LIBRARY DESTINATION lib/ox
+	ARCHIVE DESTINATION lib/ox
+)

deps/ox/src/ox/clargs/clargs.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/std/strops.hpp>
+#include "clargs.hpp"
+
+namespace ox {
+namespace clargs {
+
+using namespace ::std;
+
+ClArgs::ClArgs(int argc, const char **args) {
+	for (int i = 0; i < argc; i++) {
+		string arg = args[i];
+		if (arg[0] == '-') {
+			while (arg[0] == '-' && arg.size()) {
+				arg = arg.substr(1);
+			}
+			m_bools[arg] = true;
+
+			// parse additional arguments
+			if (i < argc && args[i + 1]) {
+				string val = args[i + 1];
+				if (val.size() && val[i] != '-') {
+					if (val == "false") {
+						m_bools[arg] = false;
+					}
+					m_strings[arg] = val;
+					m_ints[arg] = ox_atoi(val.c_str());
+					i++;
+				}
+			}
+		}
+	}
+}
+
+bool ClArgs::getBool(const char *arg) {
+	return m_bools[arg];
+}
+
+string ClArgs::getString(const char *arg) {
+	return m_strings[arg];
+}
+
+int ClArgs::getInt(const char *arg) {
+	return m_ints[arg];
+}
+
+}
+}

deps/ox/src/ox/clargs/clargs.hpp

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <map>
+#include <string>
+
+namespace ox {
+namespace clargs {
+
+class ClArgs {
+	private:
+		::std::map<::std::string, bool> m_bools;
+		::std::map<::std::string, ::std::string> m_strings;
+		::std::map<::std::string, int> m_ints;
+
+	public:
+		ClArgs(int argc, const char **args);
+
+		bool getBool(const char *arg);
+
+		::std::string getString(const char *arg);
+
+		int getInt(const char *arg);
+};
+
+}
+}

deps/ox/src/ox/fs/CMakeLists.txt

@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(
+	OxFS
+		filesystem.cpp
+		pathiterator.cpp
+)
+
+set_property(
+	TARGET
+		OxFS
+	PROPERTY
+		POSITION_INDEPENDENT_CODE ON
+)
+
+if(OX_BUILD_EXEC STREQUAL "ON")
+	add_executable(
+		oxfstool
+			oxfstool.cpp
+	)
+	set_target_properties(oxfstool PROPERTIES OUTPUT_NAME oxfs)
+	target_link_libraries(oxfstool OxFS OxStd)
+endif()
+
+install(
+	FILES
+		filestore.hpp
+		filesystem.hpp
+		pathiterator.hpp
+	DESTINATION
+		include/ox/fs
+)
+
+install(
+	TARGETS
+		OxFS
+	LIBRARY DESTINATION lib/ox
+	ARCHIVE DESTINATION lib/ox
+)
+
+if(OX_BUILD_EXEC STREQUAL "ON")
+	if(OX_RUN_TESTS STREQUAL "ON")
+		add_subdirectory(test)
+	endif()
+	install(TARGETS oxfstool
+			  RUNTIME DESTINATION bin
+	)
+endif()

deps/ox/src/ox/fs/filestore.hpp

@@ -0,0 +1,851 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/std.hpp>
+
+namespace ox {
+namespace fs {
+
+template<typename FsT, typename InodeId>
+struct __attribute__((packed)) FileStoreHeader {
+	public:
+		typedef InodeId InodeId_t;
+		typedef FsT FsSize_t;
+		const static auto VERSION = 5;
+
+	private:
+		uint16_t m_version;
+		uint16_t m_fsType;
+		FsSize_t m_size;
+		FsSize_t m_memUsed;
+		FsSize_t m_rootInode;
+
+	public:
+		void setVersion(uint16_t);
+		uint16_t getVersion();
+
+		void setFsType(uint16_t);
+		uint16_t getFsType();
+
+		void setSize(FsSize_t);
+		FsSize_t getSize();
+
+		void setMemUsed(FsSize_t);
+		FsSize_t getMemUsed();
+
+		void setRootInode(FsSize_t);
+		FsSize_t getRootInode();
+};
+
+template<typename FsSize_t, typename InodeId_t>
+void FileStoreHeader<FsSize_t, InodeId_t>::setVersion(uint16_t version) {
+	m_version = std::bigEndianAdapt(version);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+uint16_t FileStoreHeader<FsSize_t, InodeId_t>::getVersion() {
+	return std::bigEndianAdapt(m_version);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+void FileStoreHeader<FsSize_t, InodeId_t>::setFsType(uint16_t fsType) {
+	m_fsType = std::bigEndianAdapt(fsType);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+uint16_t FileStoreHeader<FsSize_t, InodeId_t>::getFsType() {
+	return std::bigEndianAdapt(m_fsType);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+void FileStoreHeader<FsSize_t, InodeId_t>::setSize(FsSize_t size) {
+	m_size = std::bigEndianAdapt(size);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+FsSize_t FileStoreHeader<FsSize_t, InodeId_t>::getSize() {
+	return std::bigEndianAdapt(m_size);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+void FileStoreHeader<FsSize_t, InodeId_t>::setMemUsed(FsSize_t memUsed) {
+	m_memUsed = std::bigEndianAdapt(memUsed);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+FsSize_t FileStoreHeader<FsSize_t, InodeId_t>::getMemUsed() {
+	return std::bigEndianAdapt(m_memUsed);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+void FileStoreHeader<FsSize_t, InodeId_t>::setRootInode(FsSize_t rootInode) {
+	m_rootInode = std::bigEndianAdapt(rootInode);
+}
+
+template<typename FsSize_t, typename InodeId_t>
+FsSize_t FileStoreHeader<FsSize_t, InodeId_t>::getRootInode() {
+	return std::bigEndianAdapt(m_rootInode);
+}
+
+template<typename Header>
+class FileStore {
+
+	public:
+		typedef typename Header::InodeId_t InodeId_t;
+		typedef typename Header::FsSize_t FsSize_t;
+		const static auto VERSION = Header::VERSION;
+
+		struct StatInfo {
+			InodeId_t inodeId;
+			typename Header::FsSize_t size;
+			uint8_t fileType;
+		};
+
+	private:
+		struct __attribute__((packed)) Inode {
+			private:
+				// the next Inode in memory
+				typename Header::FsSize_t m_prev;
+				typename Header::FsSize_t m_next;
+				typename Header::FsSize_t m_dataLen;
+
+				InodeId_t m_id;
+				uint8_t m_fileType;
+				typename Header::FsSize_t m_left;
+				typename Header::FsSize_t m_right;
+
+			public:
+				typename Header::FsSize_t size();
+
+				void setDataLen(typename Header::FsSize_t);
+				typename Header::FsSize_t getDataLen();
+
+				void setPrev(typename Header::FsSize_t);
+				typename Header::FsSize_t getPrev();
+
+				void setNext(typename Header::FsSize_t);
+				typename Header::FsSize_t getNext();
+
+				void setId(InodeId_t);
+				InodeId_t getId();
+
+				void setFileType(uint8_t);
+				uint8_t getFileType();
+
+				void setLeft(typename Header::FsSize_t);
+				typename Header::FsSize_t getLeft();
+
+				void setRight(typename Header::FsSize_t);
+				typename Header::FsSize_t getRight();
+
+				void setData(void *data, typename Header::FsSize_t size);
+				uint8_t *getData();
+		};
+
+		Header m_header;
+
+	public:
+		/**
+		 * Dumps this file store's inodes to the given file store.
+		 */
+		int dumpTo(FileStore<Header> *dest);
+
+		/**
+		 * Compacts and resizes the file store to the minimum possible size for
+		 * the contents.
+		 *
+		 * NOTE: This does NOT resize the buffer that this file store refers to!
+		 */
+		void resize(typename Header::FsSize_t size = 0);
+
+		/**
+		 * Writes the given data to a "file" with the given id.
+		 * @param id the id of the file
+		 * @param data the contents of the file
+		 * @param dataLen the number of bytes data points to
+		 */
+		int write(InodeId_t id, void *data, typename Header::FsSize_t dataLen, uint8_t fileType = 0);
+
+		/**
+		 * Removes the inode of the given ID.
+		 * @param id the id of the file
+		 */
+		int remove(InodeId_t id);
+
+		/**
+		 * Removes all inodes of the type.
+		 * @param fileType the type of file to remove
+		 */
+		int removeAllType(uint8_t fileType);
+
+		/**
+		 * Reads the "file" at the given id. You are responsible for freeing
+		 * the data when done with it.
+		 * @param id id of the "file"
+		 * @param data pointer to the pointer where the data is stored
+		 * @param size pointer to a value that will be assigned the size of data
+		 * @return 0 if read is a success
+		 */
+		int read(InodeId_t id, void *data, typename Header::FsSize_t *size);
+
+		/**
+		 * Reads the "file" at the given id. You are responsible for freeing
+		 * the data when done with it.
+		 * @param id id of the "file"
+		 * @param readStart where in the data to start reading
+		 * @param readSize how much data to read
+		 * @param data pointer to the pointer where the data is stored
+		 * @param size pointer to a value that will be assigned the size of data
+		 * @return 0 if read is a success
+		 */
+		int read(InodeId_t id, typename Header::FsSize_t readStart,
+		         typename Header::FsSize_t readSize, void *data,
+		         typename Header::FsSize_t *size);
+
+		/**
+		 * Reads the "file" at the given id. You are responsible for freeing
+		 * the data when done with it.
+		 * @param id id of the "file"
+		 * @param readStart where in the data to start reading
+		 * @param readSize how much data to read
+		 * @param data pointer to the pointer where the data is stored
+		 * @param size pointer to a value that will be assigned the size of data
+		 * @return 0 if read is a success
+		 */
+		template<typename T>
+		int read(InodeId_t id, typename Header::FsSize_t readStart,
+		         typename Header::FsSize_t readSize, T *data,
+		         typename Header::FsSize_t *size);
+
+		/**
+		 * Reads the stat information of the inode of the given inode id.
+		 * If the returned inode id is 0, then the requested inode was not found.
+		 * @param id id of the inode to stat
+		 * @return the stat information of the inode of the given inode id
+		 */
+		StatInfo stat(InodeId_t id);
+
+		/**
+		 * Returns the space needed for this data at the given inode address.
+		 * @param id the target inode id
+		 * @param size the size of the data to insert
+		 * @return the space currently available in this file store.
+		 */
+		typename Header::FsSize_t spaceNeeded(typename Header::FsSize_t size);
+
+		/**
+		 * Returns the size of the file store.
+		 * @return the size of the file store.
+		 */
+		typename Header::FsSize_t size();
+
+		/**
+		 * Returns the space currently available in this file store.
+		 * @return the space currently available in this file store.
+		 */
+		typename Header::FsSize_t available();
+
+		uint16_t fsType();
+
+		uint16_t version();
+		
+		static uint8_t *format(uint8_t *buffer, typename Header::FsSize_t size, uint16_t fsType = 0);
+
+	private:
+		/**
+		 * Gets the inode at the given id.
+		 * @param root the root node to start comparing on
+		 * @param id id of the "file"
+		 * @param pathLen number of characters in pathLen
+		 * @return the requested Inode, if available
+		 */
+		Inode *getInode(Inode *root, InodeId_t id);
+
+		/**
+		 * Gets the inode at the given id.
+		 * @param root the root node to start comparing on
+		 * @param id id of the "file"
+		 * @param pathLen number of characters in pathLen
+		 * @param targetAddr the address of the target inode
+		 * @return the requested Inode, if available
+		 */
+		Inode *getInodeParent(Inode *root, InodeId_t id, typename Header::FsSize_t targetAddr);
+
+		/**
+		 * Reads the "file" at the given id. You are responsible for freeing
+		 * the data when done with it.
+		 * @param inode inode of the "file"
+		 * @param readStart where in the data to start reading
+		 * @param readSize how much data to read
+		 * @param data pointer to the pointer where the data is stored
+		 * @param size pointer to a value that will be assigned the size of data
+		 * @return 0 if read is a success
+		 */
+		template<typename T>
+		int read(Inode *inode, typename Header::FsSize_t readStart,
+		         typename Header::FsSize_t readSize, T *data,
+		         typename Header::FsSize_t *size);
+
+		/**
+		 * Removes the inode of the given ID.
+		 * @param id the id of the file
+		 */
+		int remove(Inode *root, InodeId_t id);
+
+		/**
+		 * Removes the given node from the linked list.
+		 * @param node node to remove
+		 */
+		void dealloc(Inode *node);
+
+		/**
+		 * Gets the address of the next available inode, assuming there is a next
+		 * available inode.
+		 */
+		typename Header::FsSize_t nextInodeAddr();
+
+		/**
+		 * Gets an address for a new Inode.
+		 * @param size the size of the Inode
+		 */
+		void *alloc(typename Header::FsSize_t size);
+
+		/**
+		 * Compacts all of the inodes into a contiguous space, starting at the first inode.
+		 */
+		void compact();
+
+		/**
+		 * Inserts the given insertValue into the tree of the given root.
+		 * If the inode already exists, it replaces the old on deletes it.
+		 * @return true if the inode was inserted
+		 */
+		bool insert(Inode *root, Inode *insertValue);
+
+		typename Header::FsSize_t firstInode();
+
+		typename Header::FsSize_t lastInode();
+
+		/**
+		 * Updates the address of the inode in the tree.
+		 */
+		void updateInodeAddress(InodeId_t id, typename Header::FsSize_t oldAddr, typename Header::FsSize_t newAddr);
+
+		uint8_t *begin() {
+			return (uint8_t*) this;
+		}
+
+		uint8_t *end() {
+			return begin() + this->m_header.getSize();
+		}
+
+		/**
+		 * Converts an actual pointer to a FsSize_t.
+		 */
+		typename Header::FsSize_t ptr(void *ptr);
+
+		/**
+		 * Converts a FsSize_t to an actual pointer.
+		 */
+		template<typename T>
+		T ptr(typename Header::FsSize_t ptr) {
+			return (T) (begin() + ptr);
+		};
+
+};
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::size() {
+	return sizeof(Inode) + getDataLen();
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setDataLen(typename Header::FsSize_t dataLen) {
+	this->m_dataLen = std::bigEndianAdapt(dataLen);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::getDataLen() {
+	return std::bigEndianAdapt(m_dataLen);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setPrev(typename Header::FsSize_t prev) {
+	this->m_prev = std::bigEndianAdapt(prev);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::getPrev() {
+	return std::bigEndianAdapt(m_prev);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setNext(typename Header::FsSize_t next) {
+	this->m_next = std::bigEndianAdapt(next);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::getNext() {
+	return std::bigEndianAdapt(m_next);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setId(InodeId_t id) {
+	this->m_id = std::bigEndianAdapt(id);
+}
+
+template<typename Header>
+typename Header::InodeId_t FileStore<Header>::Inode::getId() {
+	return std::bigEndianAdapt(m_id);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setFileType(uint8_t fileType) {
+	this->m_fileType = std::bigEndianAdapt(fileType);
+}
+
+template<typename Header>
+uint8_t FileStore<Header>::Inode::getFileType() {
+	return std::bigEndianAdapt(m_fileType);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setLeft(typename Header::FsSize_t left) {
+	this->m_left = std::bigEndianAdapt(left);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::getLeft() {
+	return std::bigEndianAdapt(m_left);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setRight(typename Header::FsSize_t right) {
+	this->m_right = std::bigEndianAdapt(right);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::Inode::getRight() {
+	return std::bigEndianAdapt(m_right);
+}
+
+template<typename Header>
+void FileStore<Header>::Inode::setData(void *data, typename Header::FsSize_t size) {
+	ox_memcpy(getData(), data, size);
+	setDataLen(size);
+}
+
+
+template<typename Header>
+uint8_t *FileStore<Header>::Inode::getData() {
+	return (uint8_t*) (this + 1);
+}
+
+
+// FileStore
+
+template<typename Header>
+int FileStore<Header>::dumpTo(FileStore<Header> *dest) {
+	if (dest->size() >= size()) {
+		auto i = ptr<Inode*>(firstInode());
+		do {
+			dest->write(i->getId(), i->getData(), i->getDataLen(), i->getFileType());
+			i = ptr<Inode*>(i->getNext());
+		} while (ptr(i) != firstInode());
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+template<typename Header>
+void FileStore<Header>::resize(typename Header::FsSize_t size) {
+	if (size < m_header.getSize()) {
+		// shrink file store
+		if (m_header.getMemUsed() > size) {
+			size = m_header.getMemUsed();
+		}
+		compact();
+		m_header.setSize(size);
+	} else if (size > m_header.getSize()) {
+		// grow file store
+		m_header.setSize(size);
+	}
+}
+
+template<typename Header>
+int FileStore<Header>::write(InodeId_t id, void *data, typename Header::FsSize_t dataLen, uint8_t fileType) {
+	auto retval = 1;
+	const typename Header::FsSize_t size = sizeof(Inode) + dataLen;
+	if (size <= (m_header.getSize() - m_header.getMemUsed())) {
+		auto inode = (Inode*) alloc(size);
+		if (inode) {
+			remove(id);
+			inode->setId(id);
+			inode->setFileType(fileType);
+			inode->setData(data, dataLen);
+			auto root = ptr<Inode*>(m_header.getRootInode());
+			if (insert(root, inode) || root == inode) {
+				retval = 0;
+			} else {
+				dealloc(inode);
+				retval = 2;
+			}
+		} else {
+			retval = 3;
+		}
+	} else {
+		retval = 4;
+	}
+	return retval;
+}
+
+template<typename Header>
+int FileStore<Header>::remove(InodeId_t id) {
+	return remove(ptr<Inode*>(m_header.getRootInode()), id);
+}
+
+template<typename Header>
+int FileStore<Header>::remove(Inode *root, InodeId_t id) {
+	auto err = 1;
+
+	if (root->getId() > id) {
+		if (root->getLeft()) {
+			auto left = ptr<Inode*>(root->getLeft());
+			if (left->getId() != id) {
+				err = remove(left, id);
+			} else {
+				root->setLeft(0);
+				// pass children to parent
+				if (left->getRight()) {
+					insert(root, ptr<Inode*>(left->getRight()));
+				}
+				if (left->getLeft()) {
+					insert(root, ptr<Inode*>(left->getLeft()));
+				}
+				dealloc(left);
+				err = 0;
+			}
+		}
+	} else if (root->getId() < id) {
+		if (root->getRight()) {
+			auto right = ptr<Inode*>(root->getRight());
+			if (right->getId() != id) {
+				err = remove(right, id);
+			} else {
+				root->setRight(0);
+				// pass children to parent
+				if (right->getRight()) {
+					insert(root, ptr<Inode*>(right->getRight()));
+				}
+				if (right->getLeft()) {
+					insert(root, ptr<Inode*>(right->getLeft()));
+				}
+				dealloc(right);
+				err = 0;
+			}
+		}
+	} else if (ptr<Inode*>(m_header.getRootInode())->getId() == id) {
+		m_header.setRootInode(root->getRight());
+		if (root->getLeft()) {
+			insert(ptr<Inode*>(m_header.getRootInode()), ptr<Inode*>(root->getLeft()));
+		}
+		dealloc(root);
+		err = 0;
+	}
+
+	return err;
+}
+
+template<typename Header>
+int FileStore<Header>::removeAllType(uint8_t fileType) {
+	int err = 0;
+	auto first = ptr<Inode*>(firstInode());
+	// skip the first inode for now, because removing the first inode will cause compact to run
+	auto current = first;
+	auto next = ptr<Inode*>(current->getNext());
+
+	while (next != first) {
+		current = next;
+		// get next before current is possibly cleared
+		next = ptr<Inode*>(current->getNext());
+
+		if (current->getFileType() == fileType) {
+			err |= remove(current->getId());
+		}
+	}
+
+	if (first->getFileType() == fileType) {
+		err |= remove(first->getId());
+	}
+
+	return err;
+}
+
+template<typename Header>
+void FileStore<Header>::dealloc(Inode *inode) {
+	auto next = ptr<Inode*>(inode->getNext());
+	auto prev = ptr<Inode*>(inode->getPrev());
+	prev->setNext(ptr(next));
+	next->setPrev(ptr(prev));
+
+	m_header.setMemUsed(m_header.getMemUsed() - inode->size());
+
+	ox_memset(inode, 0, inode->size());
+}
+
+template<typename Header>
+void FileStore<Header>::updateInodeAddress(InodeId_t id, typename Header::FsSize_t oldAddr, typename Header::FsSize_t newAddr) {
+	auto parent = getInodeParent(ptr<Inode*>(m_header.getRootInode()), id, oldAddr);
+	if (parent) {
+		if (parent->getLeft() == oldAddr) {
+			parent->setLeft(newAddr);
+		} else if (parent->getRight() == oldAddr) {
+			parent->setRight(newAddr);
+		}
+	}
+}
+
+template<typename Header>
+int FileStore<Header>::read(InodeId_t id, void *data, typename Header::FsSize_t *size) {
+	auto inode = getInode(ptr<Inode*>(m_header.getRootInode()), id);
+	return inode ? read(inode, 0, inode->getDataLen(), (uint8_t*) data, size) : 1;
+}
+
+template<typename Header>
+int FileStore<Header>::read(InodeId_t id, typename Header::FsSize_t readStart,
+		typename Header::FsSize_t readSize, void *data, typename Header::FsSize_t *size) {
+	auto inode = getInode(ptr<Inode*>(m_header.getRootInode()), id);
+	return inode ? read<uint8_t>(inode, readStart, readSize, (uint8_t*) data, size) : 1;
+}
+
+template<typename Header>
+template<typename T>
+int FileStore<Header>::read(InodeId_t id, typename Header::FsSize_t readStart,
+		typename Header::FsSize_t readSize, T *data, typename Header::FsSize_t *size) {
+	auto inode = getInode(ptr<Inode*>(m_header.getRootInode()), id);
+	return inode ? read(inode, readStart, readSize, data, size) : 1;
+}
+
+template<typename Header>
+template<typename T>
+int FileStore<Header>::read(Inode *inode, typename Header::FsSize_t readStart,
+		typename Header::FsSize_t readSize, T *data, typename Header::FsSize_t *size) {
+	// be sure read size is not greater than what is available to read
+	if (inode->getDataLen() - readStart < readSize) {
+		readSize = inode->getDataLen() - readStart;
+	}
+	if (size) {
+		*size = readSize;
+	}
+
+	readSize /= sizeof(T);
+	T *it = (T*) &(inode->getData()[readStart]);
+	for (typename Header::FsSize_t i = 0; i < readSize; i++) {
+		*(data++) = *(it++);
+	}
+	return 0;
+}
+
+template<typename Header>
+typename FileStore<Header>::StatInfo FileStore<Header>::stat(InodeId_t id) {
+	auto inode = getInode(ptr<Inode*>(m_header.getRootInode()), id);
+	StatInfo stat;
+	if (inode) {
+		stat.size = inode->getDataLen();
+		stat.fileType = inode->getFileType();
+		stat.inodeId = id;
+	} else {
+		stat.inodeId = 0;
+	}
+	return stat;
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::spaceNeeded(typename Header::FsSize_t size) {
+	return sizeof(Inode) + size;
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::size() {
+	return m_header.getSize();
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::available() {
+	return m_header.getSize() - m_header.getMemUsed();
+}
+
+template<typename Header>
+typename FileStore<Header>::Inode *FileStore<Header>::getInode(Inode *root, InodeId_t id) {
+	Inode *retval = nullptr;
+
+	if (root->getId() > id) {
+		if (root->getLeft()) {
+			retval = getInode(ptr<Inode*>(root->getLeft()), id);
+		}
+	} else if (root->getId() < id) {
+		if (root->getRight()) {
+			retval = getInode(ptr<Inode*>(root->getRight()), id);
+		}
+	} else if (root->getId() == id) {
+		retval = root;
+	}
+
+	return retval;
+}
+
+template<typename Header>
+typename FileStore<Header>::Inode *FileStore<Header>::getInodeParent(Inode *root, InodeId_t id, typename Header::FsSize_t targetAddr) {
+	Inode *retval = nullptr;
+
+	if (root->getId() > id) {
+		if (root->getLeft()) {
+			if (root->getLeft() == targetAddr) {
+				retval = root;
+			} else {
+				retval = getInodeParent(ptr<Inode*>(root->getLeft()), id, targetAddr);
+			}
+		}
+	} else if (root->getId() < id) {
+		if (root->getRight()) {
+			if (root->getRight() == targetAddr) {
+				retval = root;
+			} else {
+				retval = getInodeParent(ptr<Inode*>(root->getRight()), id, targetAddr);
+			}
+		}
+	}
+
+	return retval;
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::nextInodeAddr() {
+	return lastInode() + ptr<Inode*>(lastInode())->size();
+}
+
+template<typename Header>
+void *FileStore<Header>::alloc(typename Header::FsSize_t size) {
+	auto next = nextInodeAddr();
+	if ((next + size) > ptr(end())) {
+		compact();
+		next = nextInodeAddr();
+		if ((next + size) > ptr(end())) {
+			return nullptr;
+		}
+	}
+
+	const auto retval = next;
+	const auto inode = ptr<Inode*>(retval);
+	ox_memset(inode, 0, size);
+	inode->setPrev(ptr<Inode*>(firstInode())->getPrev());
+	inode->setNext(firstInode());
+	m_header.setMemUsed(m_header.getMemUsed() + size);
+	ptr<Inode*>(lastInode())->setNext(retval);
+	ptr<Inode*>(firstInode())->setPrev(retval);
+	return inode;
+}
+
+template<typename Header>
+void FileStore<Header>::compact() {
+	auto dest = ptr<Inode*>(firstInode());
+	auto current = ptr<Inode*>(firstInode());
+	while (current->getNext() > firstInode() && current->getNext() < ptr(end())) {
+		ox_memcpy(dest, current, current->size());
+		if (dest->getNext() != firstInode()) {
+			dest->setNext(ptr(dest) + dest->size());
+		}
+		ptr<Inode*>(dest->getNext())->setPrev(ptr(dest));
+		updateInodeAddress(dest->getId(), ptr(current), ptr(dest));
+		current = ptr<Inode*>(dest->getNext());
+		dest = ptr<Inode*>(ptr(dest) + dest->size());
+	}
+}
+
+template<typename Header>
+bool FileStore<Header>::insert(Inode *root, Inode *insertValue) {
+	auto retval = false;
+
+	if (root->getId() > insertValue->getId()) {
+		if (root->getLeft()) {
+			retval = insert(ptr<Inode*>(root->getLeft()), insertValue);
+		} else {
+			root->setLeft(ptr(insertValue));
+			retval = true;
+		}
+	} else if (root->getId() < insertValue->getId()) {
+		if (root->getRight()) {
+			retval = insert(ptr<Inode*>(root->getRight()), insertValue);
+		} else {
+			root->setRight(ptr(insertValue));
+			retval = true;
+		}
+	} else if (m_header.getRootInode() == 0) {
+		m_header.setRootInode(ptr(insertValue));
+		retval = true;
+	}
+
+	return retval;
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::ptr(void *ptr) {
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+	return ((uint8_t*) ptr) - begin();
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::firstInode() {
+	return sizeof(FileStore<Header>);
+}
+
+template<typename Header>
+typename Header::FsSize_t FileStore<Header>::lastInode() {
+	return ptr<Inode*>(firstInode())->getPrev();
+}
+
+template<typename Header>
+uint16_t FileStore<Header>::fsType() {
+	return m_header.getFsType();
+};
+
+template<typename Header>
+uint16_t FileStore<Header>::version() {
+	return m_header.getVersion();
+};
+
+template<typename Header>
+uint8_t *FileStore<Header>::format(uint8_t *buffer, typename Header::FsSize_t size, uint16_t fsType) {
+	ox_memset(buffer, 0, size);
+
+	auto *fs = (FileStore*) buffer;
+	fs->m_header.setFsType(fsType);
+	fs->m_header.setVersion(Header::VERSION);
+	fs->m_header.setSize(size);
+	fs->m_header.setMemUsed(sizeof(FileStore<Header>) + sizeof(Inode));
+	fs->m_header.setRootInode(sizeof(FileStore<Header>));
+	((Inode*) (fs + 1))->setPrev(sizeof(FileStore<Header>));
+	((Inode*) (fs + 1))->setNext(sizeof(FileStore<Header>));
+
+	return (uint8_t*) buffer;
+}
+
+typedef FileStore<FileStoreHeader<uint16_t, uint16_t>> FileStore16;
+typedef FileStore<FileStoreHeader<uint32_t, uint64_t>> FileStore32;
+typedef FileStore<FileStoreHeader<uint64_t, uint64_t>> FileStore64;
+
+}
+}

deps/ox/src/ox/fs/filesystem.cpp

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "filesystem.hpp"
+
+namespace ox {
+namespace fs {
+
+FileSystem *createFileSystem(void *buff, size_t buffSize) {
+	auto version = ((FileStore16*) buff)->version();
+	auto type = ((FileStore16*) buff)->fsType();
+	FileSystem *fs = nullptr;
+
+	switch (version) {
+		case 5:
+			switch (type) {
+				case ox::fs::OxFS_16:
+					fs = new FileSystem16(buff);
+					break;
+				case ox::fs::OxFS_32:
+					fs = new FileSystem32(buff);
+					break;
+				case ox::fs::OxFS_64:
+					fs = new FileSystem64(buff);
+					break;
+			}
+			break;
+		default:
+			break;
+	}
+
+	if (fs && fs->size() > buffSize) {
+		delete fs;
+		fs = nullptr;
+	}
+
+	return fs;
+}
+
+FileSystem *expandCopy(FileSystem *fs, size_t size) {
+	auto fsBuff = fs->buff();
+	FileSystem *retval = nullptr;
+
+	if (fs->size() <= size) {
+		auto cloneBuff = new uint8_t[size];
+		ox_memcpy(cloneBuff, fsBuff, fs->size());
+
+		fsBuff = cloneBuff;
+		retval = createFileSystem(fsBuff, size);
+		retval->resize(size);
+	}
+
+	return retval;
+}
+
+FileSystem *expandCopyCleanup(FileSystem *fs, size_t size) {
+	auto out = expandCopy(fs, size);
+
+	if (out) {
+		delete[] fs->buff();
+		delete fs;
+	} else {
+		out = fs;
+	}
+
+	return out;
+}
+
+}
+}

deps/ox/src/ox/fs/filesystem.hpp

@@ -0,0 +1,696 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+#include <ox/std/std.hpp>
+#include "pathiterator.hpp"
+#include "filestore.hpp"
+
+namespace ox {
+namespace fs {
+
+enum FsType {
+	OxFS_16 = 1,
+	OxFS_32 = 2,
+	OxFS_64 = 3
+};
+
+enum FileType {
+	NormalFile = 1,
+	Directory  = 2
+};
+
+struct FileStat {
+	uint64_t inode;
+	uint64_t size;
+	uint8_t  fileType;
+};
+
+class FileSystem {
+	public:
+		virtual ~FileSystem() {};
+
+		virtual int stripDirectories() = 0;
+
+		virtual int mkdir(const char *path) = 0;
+
+		virtual int read(const char *path, void *buffer, size_t buffSize) = 0;
+
+		virtual int read(uint64_t inode, void *buffer, size_t size) = 0;
+
+		virtual int read(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) = 0;
+
+		virtual uint8_t *read(uint64_t inode, size_t *size) = 0;
+
+		virtual int remove(uint64_t inode, bool recursive = false) = 0;
+
+		virtual int remove(const char *path, bool recursive = false) = 0;
+
+		virtual void resize(uint64_t size = 0) = 0;
+
+		virtual int write(const char *path, void *buffer, uint64_t size, uint8_t fileType = NormalFile) = 0;
+
+		virtual int write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = NormalFile) = 0;
+
+		virtual FileStat stat(uint64_t inode) = 0;
+
+		virtual uint64_t spaceNeeded(uint64_t size) = 0;
+
+		virtual uint64_t available() = 0;
+
+		virtual uint64_t size() = 0;
+
+		virtual uint8_t *buff() = 0;
+};
+
+FileSystem *createFileSystem(void *buff, size_t buffSize);
+
+/**
+ * Creates a larger version of the given FileSystem.
+ */
+FileSystem *expandCopy(FileSystem *src);
+
+/**
+ * Calls expandCopy and deletes the original FileSystem and buff a resize was
+ * performed.
+ */
+FileSystem *expandCopyCleanup(FileSystem *fs, size_t size);
+
+template<typename FileStore, FsType FS_TYPE>
+class FileSystemTemplate: public FileSystem {
+
+	private:
+		struct __attribute__((packed)) DirectoryEntry {
+			typename FileStore::InodeId_t inode;
+
+			char *getName() {
+				return (char*) (this + 1);
+			}
+
+			void setName(const char *name) {
+				auto data = getName();
+				auto nameLen = ox_strlen(name);
+				ox_memcpy(data, name, nameLen);
+				data[nameLen] = 0;
+			}
+
+			static uint64_t spaceNeeded(const char *fileName) {
+				return sizeof(DirectoryEntry) + ox_strlen(fileName) + 1;
+			}
+
+			/**
+			 * The size in bytes.
+			 */
+			uint64_t size() {
+				return spaceNeeded(getName());
+			}
+		};
+
+		struct __attribute__((packed)) Directory {
+			/**
+			 * Number of bytes after this Directory struct.
+			 */
+			typename FileStore::FsSize_t size = 0;
+			typename FileStore::FsSize_t children = 0;
+
+			DirectoryEntry *files() {
+				return size ? (DirectoryEntry*) (this + 1) : nullptr;
+			}
+
+			uint64_t getFileInode(const char *name, uint64_t buffSize);
+
+			int getChildrenInodes(typename FileStore::InodeId_t *inodes, size_t inodesLen);
+
+			int rmFile(const char *name);
+		};
+
+		FileStore *m_store = nullptr;
+
+	public:
+		// static members
+		static typename FileStore::InodeId_t INODE_RANDOM;
+		static typename FileStore::InodeId_t INODE_ROOT_DIR;
+		static typename FileStore::InodeId_t INODE_RESERVED_END;
+
+		explicit FileSystemTemplate(void *buff);
+
+		int stripDirectories() override;
+
+		int mkdir(const char *path) override;
+
+		int read(const char *path, void *buffer, size_t buffSize) override;
+
+		int read(uint64_t inode, void *buffer, size_t buffSize) override;
+
+		int read(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) override;
+
+		uint8_t *read(uint64_t inode, size_t *size) override;
+
+		void resize(uint64_t size = 0) override;
+
+		int remove(uint64_t inode, bool recursive = false) override;
+
+		int remove(const char *path, bool recursive = false) override;
+
+		int write(const char *path, void *buffer, uint64_t size, uint8_t fileType = NormalFile) override;
+
+		int write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = NormalFile) override;
+
+		FileStat stat(const char *path);
+
+		FileStat stat(uint64_t inode) override;
+
+		uint64_t findInodeOf(const char *name);
+
+		uint64_t spaceNeeded(uint64_t size) override;
+
+		uint64_t available() override;
+
+		uint64_t size() override;
+
+		uint8_t *buff() override;
+
+		/**
+		 * Moves an entry from one directory to another.
+		 * @param src the path to the file
+		 * @param dest the path of the destination directory
+		 */
+		int move(const char *src, const char *dest);
+
+		/**
+		 * Removes an entry from a directory. This does not delete the referred to file.
+		 */
+		int rmDirectoryEntry(const char *path);
+
+		static uint8_t *format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories);
+
+	private:
+		uint64_t generateInodeId();
+
+		int insertDirectoryEntry(const char *dirPath, const char *fileName, uint64_t inode);
+};
+
+template<typename FileStore, FsType FS_TYPE>
+FileSystemTemplate<FileStore, FS_TYPE>::FileSystemTemplate(void *buff) {
+	m_store = (FileStore*) buff;
+}
+
+template<typename FileStore, FsType FS_TYPE>
+typename FileStore::InodeId_t FileSystemTemplate<FileStore, FS_TYPE>::INODE_RANDOM = 1;
+
+template<typename FileStore, FsType FS_TYPE>
+typename FileStore::InodeId_t FileSystemTemplate<FileStore, FS_TYPE>::INODE_ROOT_DIR = 2;
+
+template<typename FileStore, FsType FS_TYPE>
+typename FileStore::InodeId_t FileSystemTemplate<FileStore, FS_TYPE>::INODE_RESERVED_END = 100;
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::stripDirectories() {
+	return m_store->removeAllType(FileType::Directory);
+}
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) {
+	Directory dir;
+	return write(path, &dir, sizeof(dir), FileType::Directory);
+}
+
+template<typename FileStore, FsType FS_TYPE>
+FileStat FileSystemTemplate<FileStore, FS_TYPE>::stat(const char *path) {
+	auto inode = findInodeOf(path);
+	FileStat stat;
+	auto s = m_store->stat(inode);
+	stat.size = s.size;
+	stat.inode = s.inodeId;
+	stat.fileType = s.fileType;
+	return stat;
+}
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+FileStat FileSystemTemplate<FileStore, FS_TYPE>::stat(uint64_t inode) {
+	FileStat stat;
+	auto s = m_store->stat(inode);
+	stat.size = s.size;
+	stat.inode = s.inodeId;
+	stat.fileType = s.fileType;
+	return stat;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::read(const char *path, void *buffer, size_t buffSize) {
+	int retval = -1;
+
+	// find the inode for the given path
+	auto inode = findInodeOf(path);
+
+	// if inode exists, read the data into buffer
+	if (inode) {
+		retval = read(inode, buffer, buffSize);
+	}
+
+	return retval;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, void *buffer, size_t buffSize) {
+	auto stat = m_store->stat(inode);
+	if (stat.size <= buffSize) {
+		return m_store->read(inode, buffer, nullptr);
+	}
+	return -1;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, size_t readStart,
+                                                 size_t readSize, void *buffer,
+                                                 size_t *size) {
+	if (size) {
+		auto stat = m_store->stat(inode);
+		*size = stat.size;
+	}
+	return m_store->read(inode, readStart, readSize, buffer, nullptr);
+}
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, size_t *size) {
+	auto s = m_store->stat(inode);
+	auto buff = new uint8_t[s.size];
+	if (size) {
+		*size = s.size;
+	}
+	if (m_store->read(inode, buff, nullptr)) {
+		delete []buff;
+		buff = nullptr;
+	}
+	return buff;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::remove(const char *path, bool recursive) {
+	auto inode = findInodeOf(path);
+	if (inode) {
+		return remove(inode, recursive) | rmDirectoryEntry(path);
+	} else {
+		return 1;
+	}
+}
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::remove(uint64_t inode, bool recursive) {
+	auto fileType = stat(inode).fileType;
+	if (fileType != FileType::Directory) {
+		return m_store->remove(inode);
+	} else if (fileType == FileType::Directory && recursive) {
+		int err = 0;
+		auto dirStat = stat(inode);
+		auto dirBuffLen = dirStat.size;
+		uint8_t dirBuff[dirBuffLen];
+		auto dir = (Directory*) dirBuff;
+
+		err = read(dirStat.inode, dirBuff, dirBuffLen);
+		if (err) {
+			return 1;
+		}
+
+		typename FileStore::InodeId_t inodes[dir->children];
+		dir->getChildrenInodes(inodes, dir->children);
+
+		for (auto i : inodes) {
+			err |= remove(i, true);
+		}
+
+		if (!err) {
+			err |= m_store->remove(inode);
+		}
+
+		return err;
+	} else {
+		return 1;
+	}
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::write(const char *path, void *buffer, uint64_t size, uint8_t fileType) {
+	int err = 0;
+	size_t pathLen = ox_strlen(path);
+	char dirPath[pathLen];
+	char fileName[pathLen];
+	PathIterator pathReader(path, pathLen);
+	err |= pathReader.fileName(fileName, pathLen);
+	err |= pathReader.dirPath(dirPath, pathLen);
+	if (err) {
+		return err;
+	}
+
+	uint64_t inode = findInodeOf(path);
+	// find an inode value for the given path
+	if (!inode) {
+		inode = generateInodeId();
+		err = insertDirectoryEntry(dirPath, fileName, inode);
+	}
+
+	if (!err) {
+		err = write(inode, buffer, size, fileType);
+	}
+
+	return err;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType) {
+	return m_store->write(inode, buffer, size, fileType);
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::findInodeOf(const char *path) {
+	const auto pathLen = ox_strlen(path);
+	PathIterator it(path, pathLen);
+	char fileName[pathLen];
+	uint64_t inode = INODE_ROOT_DIR;
+	while (it.hasNext()) {
+		auto dirStat = stat(inode);
+		if (dirStat.inode && dirStat.size >= sizeof(Directory)) {
+			uint8_t dirBuffer[dirStat.size];
+			auto dir = (Directory*) dirBuffer;
+			if (read(inode, dirBuffer, dirStat.size) == 0) {
+				if (dirStat.fileType == FileType::Directory && it.next(fileName, pathLen) == 0) {
+					inode = dir->getFileInode(fileName, dirStat.size);
+				} else {
+					inode = 0; // null out inode and break
+					break;
+				}
+			} else {
+				inode = 0; // null out inode and break
+				break;
+			}
+		} else {
+			inode = 0; // null out inode and break
+			break;
+		}
+	}
+	return inode;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+template<typename FileStore, FsType FS_TYPE>
+void FileSystemTemplate<FileStore, FS_TYPE>::resize(uint64_t size) {
+	return m_store->resize(size);
+}
+
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::spaceNeeded(uint64_t size) {
+	return m_store->spaceNeeded(size);
+}
+
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::available() {
+	return m_store->available();
+}
+
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::size() {
+	return m_store->size();
+}
+
+template<typename FileStore, FsType FS_TYPE>
+uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::buff() {
+	return (uint8_t*) m_store;
+}
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) {
+	buffer = FileStore::format((uint8_t*) buffer, size, (uint16_t) FS_TYPE);
+
+	if (buffer && useDirectories) {
+		Directory dir;
+		FileSystemTemplate<FileStore, FS_TYPE> fs(buffer);
+		fs.write(INODE_ROOT_DIR, &dir, sizeof(dir), FileType::Directory);
+	}
+
+	return (uint8_t*) buffer;
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::generateInodeId() {
+	Random rand;
+	read(INODE_RANDOM, &rand, sizeof(rand));
+
+	uint64_t inode = 0;
+	// find an inode value for the given path
+	while (!inode) {
+		inode = rand.gen();
+		inode >>= 64 -  8 * sizeof(typename FileStore::InodeId_t);
+
+		// make sure this does not already exist
+		if (inode < INODE_RESERVED_END || stat(inode).inode) {
+			// that result was unusable, try again
+			inode = 0;
+		}
+	}
+
+	write(INODE_RANDOM, &rand, sizeof(rand));
+
+	return inode;
+}
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)
+#endif
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::insertDirectoryEntry(const char *dirPath, const char *fileName, uint64_t inode) {
+	auto s = stat(dirPath);
+	if (s.inode) {
+		auto spaceNeeded = DirectoryEntry::spaceNeeded(fileName);
+		size_t dirBuffSize = s.size + spaceNeeded;
+		uint8_t dirBuff[dirBuffSize];
+		int err = read(s.inode, dirBuff, dirBuffSize);
+
+		if (!err) {
+			auto dir = (Directory*) dirBuff;
+			dir->size += spaceNeeded;
+			dir->children++;
+			auto entry = (DirectoryEntry*) &dirBuff[s.size];
+			entry->inode = inode;
+			entry->setName(fileName);
+			return write(s.inode, dirBuff, dirBuffSize, FileType::Directory);
+		} else {
+			return 1;
+		}
+	} else {
+		return 2;
+	}
+}
+#ifdef _MSC_VER
+#pragma warning(default:4244)
+#endif
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::move(const char *src, const char *dest) {
+	auto inode = stat(src).inode;
+	if (inode && !stat(dest).inode) {
+		int err = 0;
+
+		size_t srcLen = ox_strlen(src);
+		char srcDirPath[srcLen];
+		char srcFileName[srcLen];
+		PathIterator srcPathReader(src, srcLen);
+		err |= srcPathReader.fileName(srcFileName, srcLen);
+		err |= srcPathReader.dirPath(srcDirPath, srcLen);
+		if (err) {
+			return err;
+		}
+
+		size_t destLen = ox_strlen(dest);
+		char destDirPath[destLen];
+		char destFileName[destLen];
+		PathIterator destPathReader(dest, destLen);
+		err |= destPathReader.fileName(destFileName, destLen);
+		err |= destPathReader.dirPath(destDirPath, destLen);
+		if (err) {
+			return err;
+		}
+
+		err = rmDirectoryEntry(src);
+		if (err) {
+			return err;
+		}
+
+		err = insertDirectoryEntry(destDirPath, destFileName, inode);
+		if (!err) {
+			return err;
+		}
+
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::rmDirectoryEntry(const char *path) {
+	int err = 0;
+	size_t pathLen = ox_strlen(path);
+	char dirPath[pathLen];
+	char fileName[pathLen];
+	PathIterator pathReader(path, pathLen);
+	err |= pathReader.fileName(fileName, pathLen);
+	err |= pathReader.dirPath(dirPath, pathLen);
+	if (err) {
+		return err;
+	}
+
+	auto dirStat = stat(dirPath);
+	auto dirBuffLen = dirStat.size;
+	uint8_t dirBuff[dirBuffLen];
+
+	err = read(dirStat.inode, dirBuff, dirBuffLen);
+	if (err) {
+		return err;
+	}
+
+	auto dir = (Directory*) dirBuff;
+	err = dir->rmFile(fileName);
+
+	if (err) {
+		return err;
+	}
+
+	err = write(dirStat.inode, dirBuff, dirBuffLen - DirectoryEntry::spaceNeeded(fileName));
+
+	return err;
+}
+
+
+// Directory
+
+template<typename FileStore, FsType FS_TYPE>
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::Directory::getFileInode(const char *name, uint64_t buffSize) {
+	uint64_t inode = 0;
+	auto current = files();
+	if (current) {
+		for (uint64_t i = 0; ox_strcmp(current->getName(), name) != 0;) {
+			i += current->size();
+			if (i < this->size) {
+				current = (DirectoryEntry*) (((uint8_t*) current) + current->size());
+			} else {
+				current = nullptr;
+				break;
+			}
+		}
+		if (current) {
+			inode = current->inode;
+		}
+	}
+	return inode;
+}
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::Directory::getChildrenInodes(typename FileStore::InodeId_t *inodes, size_t inodesLen) {
+	if (inodesLen >= this->children) {
+		auto current = files();
+		if (current) {
+			for (uint64_t i = 0; i < this->children; i++) {
+				inodes[i] = current->inode;
+				current = (DirectoryEntry*) (((uint8_t*) current) + current->size());
+			}
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		return 2;
+	}
+}
+
+template<typename FileStore, FsType FS_TYPE>
+int FileSystemTemplate<FileStore, FS_TYPE>::Directory::rmFile(const char *name) {
+	int err = 1;
+	auto current = files();
+	if (current) {
+		for (uint64_t i = 0; i < this->size;) {
+			i += current->size();
+			if (ox_strcmp(current->getName(), name) == 0) {
+				auto dest = (uint8_t*) current;
+				auto src = dest + current->size();
+				ox_memcpy(dest, src, this->size - i);
+				this->size -= current->size();
+				this->children--;
+				err = 0;
+				break;
+			}
+			current = (DirectoryEntry*) (((uint8_t*) current) + current->size());
+		}
+	}
+	return err;
+}
+
+typedef FileSystemTemplate<FileStore16, OxFS_16> FileSystem16;
+typedef FileSystemTemplate<FileStore32, OxFS_32> FileSystem32;
+typedef FileSystemTemplate<FileStore64, OxFS_64> FileSystem64;
+
+}
+}

deps/ox/src/ox/fs/oxfstool.cpp

@@ -0,0 +1,365 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <iostream>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ox/std/strops.hpp>
+#include <ox/fs/filesystem.hpp>
+
+// suppress warnings about using fopen
+#ifdef _MSC_VER
+#pragma warning(disable:4996)
+#endif
+
+using namespace ox::fs;
+using namespace std;
+
+const static auto oxfstoolVersion = "1.3.0";
+const static auto usage = "usage:\n"
+"\toxfs format [16,32,64] <size> <path>\n"
+"\toxfs read <FS file> <inode>\n"
+"\toxfs write <FS file> <inode> <insertion file>\n"
+"\toxfs write-expand <FS file> <inode> <insertion file>\n"
+"\toxfs rm <FS file> <inode>\n"
+"\toxfs compact <FS file>\n"
+"\toxfs version\n";
+
+char *loadFileBuff(FILE *file, ::size_t *sizeOut = nullptr) {
+	if (file) {
+		fseek(file, 0, SEEK_END);
+		const auto size = ftell(file);
+		rewind(file);
+		auto buff = new char[size];
+		auto itemsRead = fread(buff, size, 1, file);
+		fclose(file);
+		if (sizeOut) {
+			*sizeOut = itemsRead ? size : 0;
+		}
+		return buff;
+	} else {
+		return nullptr;
+	}
+}
+
+char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
+	return loadFileBuff(fopen(path, "rb"), sizeOut);
+}
+
+size_t bytes(const char *str) {
+	auto size = ::ox_strlen(str);
+	const auto lastChar = str[size-1];
+	auto multiplier = 1;
+	char copy[size + 1];
+	ox_memcpy(copy, str, size + 1);
+	// parse size unit
+	if (lastChar < '0' || lastChar > '9') {
+		copy[size-1] = 0;
+		switch (lastChar) {
+			case 'k':
+			case 'K':
+				multiplier = 1024;
+				break;
+			case 'm':
+			case 'M':
+				multiplier = 1024 * 1024;
+				break;
+			case 'g':
+			case 'G':
+				multiplier = 1024 * 1024 * 1024;
+				break;
+			default:
+				multiplier = -1;
+		}
+	}
+	return ox_atoi(copy) * multiplier;
+}
+
+int format(int argc, char **args) {
+	printf("Creating file system...\n");
+	auto err = 0;
+	if (argc >= 5) {
+		auto type = ox_atoi(args[2]);
+		auto size = bytes(args[3]);
+		auto path = args[4];
+		auto buff = new uint8_t[size];
+
+
+		if (size < sizeof(FileStore64)) {
+			err = 1;
+			cerr <<  "File system size " << size << " too small, must be at least " << sizeof(FileStore64) << endl;
+		}
+
+		if (!err) {
+			// format
+			switch (type) {
+				case 16:
+					FileSystem16::format(buff, (FileStore16::FsSize_t) size, true);
+					break;
+				case 32:
+					FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+					break;
+				case 64:
+					FileSystem64::format(buff, size, true);
+					break;
+				default:
+					err = 1;
+			}
+
+			if (!err) {
+				auto file = fopen(path, "wb");
+				if (file) {
+					err = fwrite(buff, size, 1, file) != 1;
+					err |= fclose(file);
+					if (err) {
+						fprintf(stderr, "Could not write to file: %s.\n", path);
+					}
+				} else {
+					fprintf(stderr, "Could not open file: %s.\n", path);
+				}
+			}
+		}
+
+		delete []buff;
+
+		if (err == 0) {
+			cerr <<  "Created file system of type " << type << " " << path << endl;
+			cerr <<  "\ttype " << type << endl;
+			cerr <<  "\twrote " << size << " bytes\n";
+		}
+	} else {
+		fprintf(stderr, "Insufficient arguments\n");
+	}
+
+	return err;
+}
+
+int read(int argc, char **args) {
+	auto err = 1;
+	if (argc >= 4) {
+		auto fsPath = args[2];
+		auto inode = ox_atoi(args[3]);
+		size_t fsSize;
+		size_t fileSize;
+
+		auto fsBuff = loadFileBuff(fsPath, &fsSize);
+		
+		if (fsBuff) {
+			auto fs = createFileSystem(fsBuff, fsSize);
+
+			if (fs) {
+				auto output = fs->read(inode, &fileSize);
+
+				if (output) {
+					fwrite(output, fileSize, 1, stdout);
+					delete []output;
+					err = 0;
+				}
+
+				delete fs;
+				delete []fsBuff;
+			} else {
+				fprintf(stderr, "Invalid file system type: %d.\n", *(uint32_t*) fsBuff);
+			}
+		} else {
+			fprintf(stderr, "Could not open file: %s\n", fsPath);
+		}
+	} else {
+		fprintf(stderr, "Insufficient arguments\n");
+	}
+	return err;
+}
+
+int write(int argc, char **args, bool expand) {
+	auto err = 0;
+	if (argc >= 5) {
+		auto fsPath = args[2];
+		auto inode = ox_atoi(args[3]);
+		auto srcPath = args[4];
+		size_t srcSize;
+
+		auto fsFile = fopen(fsPath, "rb");
+		if (fsFile) {
+			fseek(fsFile, 0, SEEK_END);
+
+			auto fsSize = (size_t) ftell(fsFile);
+			rewind(fsFile);
+			auto fsBuff = new uint8_t[fsSize];
+			auto itemsRead = fread(fsBuff, fsSize, 1, fsFile);
+			fclose(fsFile);
+
+			if (itemsRead) {
+				auto srcBuff = loadFileBuff(srcPath, &srcSize);
+				if (srcBuff) {
+					auto expanded = false;
+					auto fs = createFileSystem(fsBuff, fsSize);
+					if (fs) {
+						if (expand && fs->available() <= srcSize) {
+							auto needed = fs->size() + fs->spaceNeeded(srcSize);
+							fsSize = needed;
+							fs = expandCopyCleanup(fs, needed);
+							fsBuff = fs->buff();
+						}
+						err |= fs->write(inode, srcBuff, srcSize);
+
+						// compact the file system if it was expanded
+						if (expanded) {
+							fs->resize();
+						}
+
+						if (err) {
+							fprintf(stderr, "Could not write to file system.\n");
+						}
+						delete fs;
+					} else {
+						fprintf(stderr, "Invalid file system type: %d.\n", *(uint32_t*) fsBuff);
+						err = 1;
+					}
+
+					if (!err) {
+						fsFile = fopen(fsPath, "wb");
+
+						if (fsFile) {
+							err = fwrite(fsBuff, fsSize, 1, fsFile) != 1;
+							err |= fclose(fsFile);
+							if (err) {
+								fprintf(stderr, "Could not write to file system file.\n");
+							}
+						} else {
+							err = 1;
+						}
+					}
+					delete []srcBuff;
+				} else {
+					err = 1;
+					fprintf(stderr, "Could not load source file: %s.\n", srcPath);
+				}
+			}
+
+			delete []fsBuff;
+		} else {
+			fprintf(stderr, "Could not open file system\n");
+		}
+	} else {
+		fprintf(stderr, "Insufficient arguments\n");
+	}
+	return err;
+}
+
+int compact(int argc, char **args) {
+	auto err = 1;
+	if (argc >= 2) {
+		auto fsPath = args[2];
+		size_t fsSize;
+
+		auto fsBuff = loadFileBuff(fsPath, &fsSize);
+		if (fsBuff) {
+			auto fs = createFileSystem(fsBuff, fsSize);
+
+			if (fs) {
+				fs->resize();
+			} else {
+				fprintf(stderr, "Invalid file system.\n");
+			}
+
+			// write back to file
+			auto fsFile = fopen(fsPath, "wb");
+			if (fsFile) {
+				err = fwrite(fsBuff, fs->size(), 1, fsFile) != 1;
+				err |= fclose(fsFile);
+				if (err) {
+					fprintf(stderr, "Could not write to file system file.\n");
+				}
+			} else {
+				err = 1;
+			}
+
+			delete fs;
+			delete []fsBuff;
+		} else {
+			fprintf(stderr, "Could not open file: %s\n", fsPath);
+		}
+	} else {
+		fprintf(stderr, "Insufficient arguments\n");
+	}
+	return err;
+}
+
+int remove(int argc, char **args) {
+	auto err = 1;
+	if (argc >= 4) {
+		auto fsPath = args[2];
+		auto inode = ox_atoi(args[3]);
+		size_t fsSize;
+
+		auto fsBuff = loadFileBuff(fsPath, &fsSize);
+		if (fsBuff) {
+			auto fs = createFileSystem(fsBuff, fsSize);
+
+			if (fs) {
+				err = fs->remove(inode);
+			} else {
+				fprintf(stderr, "Invalid file system.\n");
+			}
+
+			if (err) {
+				fprintf(stderr, "Could not write to file system.\n");
+			} else {
+				auto fsFile = fopen(fsPath, "wb");
+				if (fsFile) {
+					err = fwrite(fsBuff, fsSize, 1, fsFile) != 1;
+					err |= fclose(fsFile);
+					if (err) {
+						fprintf(stderr, "Could not write to file system file.\n");
+					}
+				} else {
+					err = 1;
+				}
+			}
+
+			delete fs;
+			delete []fsBuff;
+		} else {
+			fprintf(stderr, "Could not open file: %s\n", fsPath);
+		}
+	} else {
+		fprintf(stderr, "Insufficient arguments\n");
+	}
+	return err;
+}
+
+int main(int argc, char **args) {
+	auto err = 0;
+	if (argc > 1) {
+		auto cmd = args[1];
+		if (ox_strcmp(cmd, "format") == 0) {
+			err = format(argc, args);
+		} else if (ox_strcmp(cmd, "read") == 0) {
+			err = read(argc, args);
+		} else if (ox_strcmp(cmd, "write") == 0) {
+			err = write(argc, args, false);
+		} else if (ox_strcmp(cmd, "write-expand") == 0) {
+			err = write(argc, args, true);
+		} else if (ox_strcmp(cmd, "compact") == 0) {
+			err = compact(argc, args);
+		} else if (ox_strcmp(cmd, "rm") == 0) {
+			err = remove(argc, args);
+		} else if (ox_strcmp(cmd, "help") == 0) {
+			printf("%s\n", usage);
+		} else if (ox_strcmp(cmd, "version") == 0) {
+			printf("oxfstool version %s\n", oxfstoolVersion);
+			printf("oxfs format version %d\n", FileStore16::VERSION);
+		} else {
+			printf("Command '%s' not recognized.\n", cmd);
+			err = 1;
+		}
+	} else {
+		printf("%s\n", usage);
+	}
+	return err;
+}

deps/ox/src/ox/fs/pathiterator.cpp

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/std/memops.hpp>
+#include <ox/std/strops.hpp>
+#include "pathiterator.hpp"
+
+namespace ox {
+namespace fs {
+
+PathIterator::PathIterator(const char *path, size_t maxSize) {
+	m_path = path;
+	m_maxSize = maxSize;
+}
+
+/**
+ * @return 0 if no error
+ */
+int PathIterator::dirPath(char *out, size_t outSize) {
+	int idx = ox_lastIndexOf(m_path, '/', m_maxSize);
+	size_t size = idx + 1;
+	if (idx >= 0 && size < outSize) {
+		ox_memcpy(out, m_path, size);
+		out[size] = 0;
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+/**
+ * @return 0 if no error
+ */
+int PathIterator::fileName(char *out, size_t outSize) {
+	auto idx = ox_lastIndexOf(m_path, '/', m_maxSize);
+	if (idx >= 0) {
+		idx++; // pass up the preceding /
+		size_t fileNameSize = ox_strlen(&m_path[idx]);
+		if (fileNameSize < outSize) {
+			ox_memcpy(out, &m_path[idx], fileNameSize);
+			out[fileNameSize] = 0;
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		return 2;
+	}
+}
+
+int PathIterator::next(char *pathOut, size_t pathOutSize) {
+	size_t size = 0;
+	int retval = 1;
+	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
+		retval = 0;
+		if (m_path[m_iterator] == '/') {
+			m_iterator++;
+		}
+		size_t start = m_iterator;
+		// end is at the next /
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		// correct end if it is invalid, which happens if there is no next /
+		if (!substr) {
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+		}
+		size_t end = substr - m_path;
+		size = end - start;
+		ox_memcpy(pathOut, &m_path[start], size);
+	}
+	pathOut[size] = 0; // end with null terminator
+	m_iterator += size;
+	return retval;
+}
+
+bool PathIterator::hasNext() {
+	size_t size = 0;
+	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
+		size_t start = m_iterator;
+		if (m_path[start] == '/') {
+			start++;
+		}
+		// end is at the next /
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		// correct end if it is invalid, which happens if there is no next /
+		if (!substr) {
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+		}
+		size_t end = substr - m_path;
+		size = end - start;
+	}
+	return size > 0;
+}
+
+}
+}

deps/ox/src/ox/fs/pathiterator.hpp

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/types.hpp>
+
+namespace ox {
+namespace fs {
+
+class PathIterator {
+	private:
+		const char *m_path = nullptr;
+		size_t m_iterator = 0;
+		size_t m_maxSize = 0;
+
+	public:
+		PathIterator(const char *path, size_t maxSize);
+
+		/**
+		 * @return 0 if no error
+		 */
+		int dirPath(char *pathOut, size_t pathOutSize);
+
+		/**
+		 * @return 0 if no error
+		 */
+		int fileName(char *out, size_t outSize);
+
+		/**
+		 * @return 0 if no error
+		 */
+		int next(char *pathOut, size_t pathOutSize);
+
+		bool hasNext();
+};
+
+}
+}

deps/ox/src/ox/fs/test/CMakeLists.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_executable(
+	FileStoreFormat
+		filestore_format.cpp
+)
+
+add_executable(
+	FileSystemFormat
+		filesystem_format.cpp
+)
+
+add_executable(
+	FileStoreIO
+		filestoreio.cpp
+)
+
+add_executable(
+	FSTests
+		tests.cpp
+)
+
+target_link_libraries(FileStoreFormat OxFS OxStd)
+target_link_libraries(FileSystemFormat OxFS OxStd)
+target_link_libraries(FileStoreIO OxFS OxStd)
+target_link_libraries(FSTests OxFS OxStd)
+
+add_test("FileStoreFormat" FileStoreFormat)
+add_test("FileSystemFormat" FileSystemFormat)
+add_test("FileStoreIO" FileStoreIO)
+add_test("Test\\ PathIterator::next1" FSTests PathIterator::next1)
+add_test("Test\\ PathIterator::next2" FSTests PathIterator::next2)
+add_test("Test\\ PathIterator::next3" FSTests PathIterator::next3)
+add_test("Test\\ PathIterator::next4" FSTests PathIterator::next4)
+add_test("Test\\ PathIterator::next5" FSTests PathIterator::next5)
+
+add_test("Test\\ PathIterator::dirPath" FSTests PathIterator::dirPath)
+add_test("Test\\ PathIterator::fileName" FSTests PathIterator::fileName)
+
+add_test("Test\\ FileSystem32::findInodeOf\\ /" FSTests "FileSystem32::findInodeOf /")
+add_test("Test\\ FileSystem32::write\\(string\\)" FSTests "FileSystem32::write(string)")
+add_test("Test\\ FileSystem32::rmDirectoryEntry\\(string\\)" FSTests "FileSystem32::rmDirectoryEntry(string)")
+add_test("Test\\ FileSystem32::remove\\(string,\\ true\\)" FSTests "FileSystem32::remove(string, true)")
+add_test("Test\\ FileSystem32::move" FSTests "FileSystem32::move")
+add_test("Test\\ FileSystem32::stripDirectories" FSTests "FileSystem32::stripDirectories")

deps/ox/src/ox/fs/test/filestore_format.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <ox/fs/filestore.hpp>
+
+using namespace ox::fs;
+
+int main() {
+	const auto size = 65535;
+	uint8_t volume[size];
+	uint32_t err = 0;
+	FileStore32::format(volume, size);
+	return err;
+}

deps/ox/src/ox/fs/test/filestoreio.cpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <stdio.h>
+#include <ox/std/std.hpp>
+#include <ox/fs/filestore.hpp>
+
+using namespace ox::fs;
+using namespace ox::std;
+
+template<typename FileStore>
+int test() {
+	const uint16_t size = ~0;
+	uint8_t volume[size];
+	char out[6];
+	typename FileStore::FsSize_t outSize;
+	FileStore::format(volume, size);
+	FileStore *fs = (FileStore*) volume;
+
+	if (fs->write(1, (void*) "Hello", 6) ||
+		 fs->read(1, (char*) out, &outSize) ||
+		 ox_strcmp("Hello", out)) {
+		printf("Failure 1\n");
+		return 1;
+	}
+
+	if (fs->write(2, (void*) "World", 6) ||
+		 fs->read(2, (char*) out, &outSize) ||
+		 ox_strcmp("World", out)) {
+		printf("Failure 2\n");
+		return 2;
+	}
+
+	// make sure first value was not overwritten
+	if (fs->read(1, (char*) out, &outSize) ||
+		 ox_strcmp("Hello", out)) {
+		printf("Failure 3\n");
+		return 3;
+	}
+
+	if (fs->remove(1)) {
+		printf("Failure 4\n");
+		return 4;
+	}
+
+	// make sure inode is not found
+	if (fs->read(1, (char*) out, &outSize) == 0) {
+		printf("Failure 5\n");
+		return 5;
+	}
+
+	// make sure 2 is still available
+	if (fs->write(2, (void*) "World", 6) ||
+		 fs->read(2, (char*) out, &outSize) ||
+		 ox_strcmp("World", out)) {
+		printf("Failure 6\n");
+		return 6;
+	}
+
+	return 0;
+}
+
+int main() {
+	return test<FileStore16>() || test<FileStore32>() | test<FileStore64>();
+}

deps/ox/src/ox/fs/test/filesystem_format.cpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/fs/filesystem.hpp>
+
+using namespace ox::fs;
+using namespace ox::std;
+
+template<typename FileSystem>
+int test() {
+	const uint16_t size = ~0;
+	uint8_t volume[size];
+	FileSystem::format(volume, size, true);
+	return 0;
+}
+
+int main() {
+	return test<FileSystem16>() | test<FileSystem32>() | test<FileSystem64>();
+}

deps/ox/src/ox/fs/test/tests.cpp

@@ -0,0 +1,310 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <iostream>
+#include <assert.h>
+#include <map>
+#include <vector>
+#include <string>
+#include <ox/fs/filesystem.hpp>
+#include <ox/fs/pathiterator.hpp>
+#include <ox/std/std.hpp>
+
+using namespace std;
+using namespace ox::fs;
+
+map<string, int(*)(string)> tests = {
+	{
+		{
+			"PathIterator::next1",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next2",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next3",
+			[](string) {
+				int retval = 0;
+				string path = "/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "\0") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next4",
+			[](string) {
+				int retval = 0;
+				string path = "usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next5",
+			[](string) {
+				int retval = 0;
+				string path = "usr/share/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::dirPath",
+			[] (string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.dirPath(buff, path.size()) == 0 && ox_strcmp(buff, "/usr/share/") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::fileName",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.fileName(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::findInodeOf /",
+			[](string) {
+				int retval = 0;
+				const auto size = 1024;
+				uint8_t buff[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+				retval |= !(fs->findInodeOf("/") == FileSystem32::INODE_ROOT_DIR);
+				delete fs;
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::write(string)",
+			[](string) {
+				int retval = 0;
+				auto path = "/usr/share/test.txt";
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->mkdir("/usr/lib");
+
+				retval |= fs->write(path, (void*) dataIn, ox_strlen(dataIn) + 1);
+				retval |= fs->read(path, dataOut, dataOutLen);
+				retval |= ox_strcmp(dataIn, dataOut) != 0;
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::rmDirectoryEntry(string)",
+			[](string) {
+				int retval = 0;
+				auto path = "/usr/share/test.txt";
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+
+				const auto size = 1024 * 1024 * 10;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+
+				retval |= fs->write(path, (void*) dataIn, ox_strlen(dataIn) + 1);
+				retval |= fs->read(path, dataOut, dataOutLen);
+				retval |= ox_strcmp(dataIn, dataOut) != 0;
+
+				retval |= fs->rmDirectoryEntry(path);
+				// the lookup should fail
+				retval |= fs->read(path, dataOut, dataOutLen) == 0;
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::remove(string, true)",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = 1024 * 64;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				inodes.push_back(fs->stat("/usr").inode);
+				inodes.push_back(fs->stat("/usr/share").inode);
+				inodes.push_back(fs->stat("/usr/share/test.txt").inode);
+
+				retval |= fs->remove("/usr", true);
+
+				// the lookup should fail
+				for (auto inode : inodes) {
+					retval |= fs->read(inode, dataOut, dataOutLen) == 0;
+				}
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::move",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				retval |= fs->move("/usr/share", "/share");
+				retval |= fs->read("/share/test.txt", dataOut, dataOutLen);
+				retval |= !(ox_strcmp(dataIn, dataOut) == 0);
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::stripDirectories",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				auto inode = fs->stat("/usr/share/test.txt").inode;
+
+				retval |= fs->stripDirectories();
+
+				// make sure normal file is still there and the directories are gone
+				retval |= fs->read(inode, dataOut, dataOutLen);
+				retval |= !(ox_strcmp(dataIn, dataOut) == 0);
+				retval |= !(fs->stat("/usr").inode == 0);
+				retval |= !(fs->stat("/usr/share").inode == 0);
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+	},
+};
+
+int main(int argc, const char **args) {
+	int retval = -1;
+	if (argc > 1) {
+		auto testName = args[1];
+		string testArg = "";
+		if (args[2]) {
+			testArg = args[2];
+		}
+		if (tests.find(testName) != tests.end()) {
+			retval = tests[testName](testArg);
+		}
+	}
+	return retval;
+}

deps/ox/src/ox/mc/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(
+	OxMetalClaw
+		presencemask.cpp
+		read.cpp
+		write.cpp
+)
+
+set_property(
+	TARGET
+		OxMetalClaw
+	PROPERTY
+		POSITION_INDEPENDENT_CODE ON
+)
+
+install(
+	FILES
+		err.hpp
+		presencemask.hpp
+		read.hpp
+		write.hpp
+	DESTINATION
+		include/ox/mc
+)
+
+install(TARGETS OxMetalClaw
+        LIBRARY DESTINATION lib/ox
+        ARCHIVE DESTINATION lib/ox
+)
+
+if(OX_RUN_TESTS STREQUAL "ON")
+	add_subdirectory(test)
+endif()

deps/ox/src/ox/mc/err.hpp

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+namespace ox {
+
+enum {
+	MC_PRESENCEMASKOUTBOUNDS = 1,
+	MC_BUFFENDED = 2,
+	MC_OUTBUFFENDED = 4
+};
+
+}

deps/ox/src/ox/mc/mc.hpp

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include "read.hpp"
+#include "write.hpp"

deps/ox/src/ox/mc/presencemask.cpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/std/byteswap.hpp>
+#include "err.hpp"
+#include "presencemask.hpp"
+
+namespace ox {
+
+FieldPresenseMask::FieldPresenseMask(uint8_t *mask, size_t maxLen) {
+	m_mask = mask;
+	m_maxLen = maxLen;
+}
+
+bool FieldPresenseMask::get(int i) {
+	if (i / 8 < m_maxLen) {
+		return (m_mask[i / 8] >> (i % 8)) & 1;
+	} else {
+		return MC_PRESENCEMASKOUTBOUNDS;
+	}
+}
+
+int FieldPresenseMask::set(int i, bool on) {
+	if (i / 8 < m_maxLen) {
+		if (on) {
+			m_mask[i / 8] |= 1 << (i % 8);
+		} else {
+			m_mask[i / 8] &= ~(1 << (i % 8));
+		}
+		return 0;
+	} else {
+		return MC_PRESENCEMASKOUTBOUNDS;
+	}
+}
+
+void FieldPresenseMask::setMaxLen(int maxLen) {
+	m_maxLen = maxLen;
+}
+
+int FieldPresenseMask::getMaxLen() {
+	return m_maxLen;
+}
+
+}

deps/ox/src/ox/mc/presencemask.hpp

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/types.hpp>
+
+namespace ox {
+
+class FieldPresenseMask {
+	private:
+		uint8_t *m_mask;
+		int m_maxLen = 0;
+
+	public:
+		FieldPresenseMask(uint8_t *mask, size_t maxLen);
+
+		bool get(int i);
+
+		int set(int i, bool on);
+
+		void setMaxLen(int);
+
+		int getMaxLen();
+};
+
+}

deps/ox/src/ox/mc/read.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/std/byteswap.hpp>
+#include <ox/std/memops.hpp>
+#include "read.hpp"
+
+namespace ox {
+
+MetalClawReader::MetalClawReader(uint8_t *buff, size_t buffLen): m_fieldPresence(buff, buffLen) {
+	m_buff = buff;
+	m_buffLen = buffLen;
+}
+
+int MetalClawReader::op(const char*, int16_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, int32_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, int64_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, uint16_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, uint32_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, uint64_t *val) {
+	return readInteger(val);
+}
+
+int MetalClawReader::op(const char*, bool *val) {
+	*val = m_fieldPresence.get(m_field++);
+	return 0;
+}
+
+void MetalClawReader::setFields(int fields) {
+	m_fields = fields;
+	m_buffIt = (fields / 8 + 1) - (fields % 8 == 0);
+	m_fieldPresence.setMaxLen(m_buffIt);
+}
+
+}

deps/ox/src/ox/mc/read.hpp

@@ -0,0 +1,154 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/byteswap.hpp>
+#include <ox/std/string.hpp>
+#include "err.hpp"
+#include "presencemask.hpp"
+
+namespace ox {
+
+class MetalClawReader {
+
+	private:
+		FieldPresenseMask m_fieldPresence;
+		int m_fields = 0;
+		int m_field = 0;
+		size_t m_buffIt = 0;
+		size_t m_buffLen = 0;
+		uint8_t *m_buff = nullptr;
+
+	public:
+		MetalClawReader(uint8_t *buff, size_t buffLen);
+
+		int op(const char*, int16_t *val);
+		int op(const char*, int32_t *val);
+		int op(const char*, int64_t *val);
+
+		int op(const char*, uint16_t *val);
+		int op(const char*, uint32_t *val);
+		int op(const char*, uint64_t *val);
+
+		int op(const char*, bool *val);
+
+		template<typename T>
+		int op(const char*, T *val, size_t len);
+
+		template<typename T>
+		int op(const char*, T *val);
+
+		template<size_t L>
+		int op(const char*, ox::bstring<L> *val);
+
+		void setFields(int fields);
+
+	private:
+		template<typename I>
+		int readInteger(I *val);
+};
+
+template<typename T>
+int MetalClawReader::op(const char*, T *val) {
+	int err = 0;
+	if (m_fieldPresence.get(m_field)) {
+		MetalClawReader reader(m_buff + m_buffIt, m_buffLen - m_buffIt);
+		err |= ioOp(&reader, val);
+		m_buffIt += reader.m_buffIt;
+	}
+	m_field++;
+	return err;
+};
+
+template<size_t L>
+int MetalClawReader::op(const char*, ox::bstring<L> *val) {
+	int err = 0;
+	if (m_fieldPresence.get(m_field)) {
+		// read the length
+		typedef uint32_t StringLength;
+		size_t size = 0;
+		if (m_buffIt + sizeof(StringLength) < m_buffLen) {
+			size = ox::std::bigEndianAdapt(*((StringLength*) &m_buff[m_buffIt]));
+			m_buffIt += sizeof(StringLength);
+		} else {
+			err |= MC_BUFFENDED;
+		}
+
+		// read the string
+		if (val->cap() >= size) {
+			if (m_buffIt + size < m_buffLen) {
+				ox_memcpy(val, &m_buff[m_buffIt], size);
+				m_buffIt += size;
+			} else {
+				err |= MC_BUFFENDED;
+			}
+		} else {
+			err |= MC_OUTBUFFENDED;
+		}
+	} else {
+		*val = "";
+	}
+	m_field++;
+	return err;
+};
+
+template<typename I>
+int MetalClawReader::readInteger(I *val) {
+	int err = 0;
+	if (m_fieldPresence.get(m_field)) {
+		if (m_buffIt + sizeof(I) < m_buffLen) {
+			*val = ox::std::bigEndianAdapt(*((I*) &m_buff[m_buffIt]));
+			m_buffIt += sizeof(I);
+		} else {
+			err = MC_BUFFENDED;
+		}
+	} else {
+		*val = 0;
+	}
+	m_field++;
+	return err;
+};
+
+template<typename T>
+int MetalClawReader::op(const char*, T *val, size_t valLen) {
+	int err = 0;
+	if (m_fieldPresence.get(m_field)) {
+		// read the length
+		typedef uint32_t ArrayLength;
+		size_t len = 0;
+		if (m_buffIt + sizeof(ArrayLength) < m_buffLen) {
+			len = ox::std::bigEndianAdapt(*((T*) &m_buff[m_buffIt]));
+			m_buffIt += sizeof(ArrayLength);
+		} else {
+			err = MC_BUFFENDED;
+		}
+
+		// read the list
+		if (valLen >= len) {
+			MetalClawReader reader(m_buff + m_buffIt, m_buffLen - m_buffIt);
+			reader.setFields(len);
+			for (size_t i = 0; i < len; i++) {
+				err |= reader.op("", &val[i]);
+			}
+			m_buffIt += reader.m_buffIt;
+		} else {
+			err = MC_OUTBUFFENDED;
+		}
+	}
+	m_field++;
+	return err;
+};
+
+template<typename T>
+int read(uint8_t *buff, size_t buffLen, T *val) {
+	MetalClawReader reader(buff, buffLen);
+	return ioOp(&reader, val);
+}
+
+}

deps/ox/src/ox/mc/test/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_executable(
+	McTest
+		tests.cpp
+)
+
+target_link_libraries(McTest OxStd OxMetalClaw)
+
+add_test("Test\\ McTest\\ Writer" McTest MetalClawWriter)
+add_test("Test\\ McTest\\ Reader" McTest MetalClawReader)

deps/ox/src/ox/mc/test/tests.cpp

@@ -0,0 +1,158 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <iostream>
+#include <assert.h>
+#include <map>
+#include <vector>
+#include <string>
+#include <ox/mc/mc.hpp>
+#include <ox/std/std.hpp>
+
+using namespace std;
+using namespace ox;
+
+struct TestStructNest {
+	bool Bool = false;
+	uint32_t Int = 0;
+	bstring<32> String = "";
+};
+
+struct TestStruct {
+	bool Bool = false;
+	int32_t Int = 0;
+	int32_t Int1 = 0;
+	int32_t Int2 = 0;
+	int32_t Int3 = 0;
+	int32_t Int4 = 0;
+	int32_t Int5 = 0;
+	int32_t Int6 = 0;
+	int32_t Int7 = 0;
+	int32_t Int8 = 0;
+	bstring<32> String = "";
+	uint32_t List[4] = {0, 0, 0 , 0};
+	TestStructNest EmptyStruct;
+	TestStructNest Struct;
+};
+
+template<typename T>
+int ioOp(T *io, TestStructNest *obj) {
+	int32_t err = 0;
+	io->setFields(3);
+	err |= io->op("Bool", &obj->Bool);
+	err |= io->op("Int", &obj->Int);
+	err |= io->op("String", &obj->String);
+	return err;
+}
+
+template<typename T>
+int ioOp(T *io, TestStruct *obj) {
+	int err = 0;
+	io->setFields(13);
+	err |= io->op("Bool", &obj->Bool);
+	err |= io->op("Int", &obj->Int);
+	err |= io->op("Int1", &obj->Int1);
+	err |= io->op("Int2", &obj->Int2);
+	err |= io->op("Int3", &obj->Int3);
+	err |= io->op("Int4", &obj->Int4);
+	err |= io->op("Int5", &obj->Int5);
+	err |= io->op("Int6", &obj->Int6);
+	err |= io->op("Int7", &obj->Int7);
+	err |= io->op("Int8", &obj->Int8);
+	err |= io->op("String", &obj->String);
+	err |= io->op("List", obj->List, 4);
+	err |= io->op("EmptyStruct", &obj->EmptyStruct);
+	err |= io->op("Struct", &obj->Struct);
+	return err;
+}
+
+map<string, int(*)(string)> tests = {
+	{
+		{
+			"MetalClawWriter",
+			[](string) {
+				// This test doesn't confirm much, but it does show that the writer
+				// doesn't segfault
+				size_t buffLen = 1024;
+				auto buff = new uint8_t[buffLen];
+				int err = 0;
+				TestStruct ts;
+
+				err |= write(buff, buffLen, &ts);
+
+				delete []buff;
+
+				return err;
+			}
+		},
+		{
+			"MetalClawReader",
+			[](string) {
+				int err = 0;
+				size_t buffLen = 1024;
+				auto buff = new uint8_t[buffLen];
+				TestStruct testIn, testOut;
+
+				testIn.Bool = true;
+				testIn.Int = 42;
+				testIn.String = "Test String 1";
+				testIn.List[0] = 1;
+				testIn.List[1] = 2;
+				testIn.List[2] = 3;
+				testIn.List[3] = 4;
+				testIn.Struct.Bool = false;
+				testIn.Struct.Int = 300;
+				testIn.Struct.String = "Test String 2";
+
+				err |= write(buff, buffLen, &testIn);
+				err |= read(buff, buffLen, &testOut);
+
+				err |= !(testIn.Bool               == testOut.Bool);
+				err |= !(testIn.Int                == testOut.Int);
+				err |= !(testIn.Int1               == testOut.Int1);
+				err |= !(testIn.Int2               == testOut.Int2);
+				err |= !(testIn.Int3               == testOut.Int3);
+				err |= !(testIn.Int4               == testOut.Int4);
+				err |= !(testIn.Int5               == testOut.Int5);
+				err |= !(testIn.Int6               == testOut.Int6);
+				err |= !(testIn.Int7               == testOut.Int7);
+				err |= !(testIn.Int8               == testOut.Int8);
+				err |= !(testIn.String             == testOut.String);
+				err |= !(testIn.List[0]            == testOut.List[0]);
+				err |= !(testIn.List[1]            == testOut.List[1]);
+				err |= !(testIn.List[2]            == testOut.List[2]);
+				err |= !(testIn.List[3]            == testOut.List[3]);
+				err |= !(testIn.EmptyStruct.Bool   == testOut.EmptyStruct.Bool);
+				err |= !(testIn.EmptyStruct.Int    == testOut.EmptyStruct.Int);
+				err |= !(testIn.EmptyStruct.String == testOut.EmptyStruct.String);
+				err |= !(testIn.Struct.Int         == testOut.Struct.Int);
+				err |= !(testIn.Struct.String      == testOut.Struct.String);
+				err |= !(testIn.Struct.Bool        == testOut.Struct.Bool);
+
+				delete []buff;
+
+				return err;
+			}
+		},
+	}
+};
+
+int main(int argc, const char **args) {
+	int retval = -1;
+	if (argc > 1) {
+		auto testName = args[1];
+		string testArg = "";
+		if (args[2]) {
+			testArg = args[2];
+		}
+		if (tests.find(testName) != tests.end()) {
+			retval = tests[testName](testArg);
+		}
+	}
+	return retval;
+}

deps/ox/src/ox/mc/write.cpp

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/std/byteswap.hpp>
+#include <ox/std/memops.hpp>
+#include "write.hpp"
+
+namespace ox {
+
+MetalClawWriter::MetalClawWriter(uint8_t *buff, size_t buffLen): m_fieldPresence(buff, buffLen) {
+	m_buff = buff;
+	m_buffLen = buffLen;
+}
+
+int MetalClawWriter::op(const char*, int16_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, int32_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, int64_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, uint16_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, uint32_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, uint64_t *val) {
+	return appendInteger(*val);
+}
+
+int MetalClawWriter::op(const char*, bool *val) {
+	return m_fieldPresence.set(m_field++, *val);
+}
+
+void MetalClawWriter::setFields(int fields) {
+	m_fields = fields;
+	m_buffIt = (fields / 8 + 1) - (fields % 8 == 0);
+	m_fieldPresence.setMaxLen(m_buffIt);
+}
+
+}

deps/ox/src/ox/mc/write.hpp

@@ -0,0 +1,152 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/string.hpp>
+#include <ox/std/types.hpp>
+#include "err.hpp"
+#include "presencemask.hpp"
+
+namespace ox {
+
+class MetalClawWriter {
+
+	private:
+		FieldPresenseMask m_fieldPresence;
+		int m_fields = 0;
+		int m_field = 0;
+		size_t m_buffIt = 0;
+		size_t m_buffLen = 0;
+		uint8_t *m_buff = nullptr;
+
+	public:
+		MetalClawWriter(uint8_t *buff, size_t buffLen);
+
+		int op(const char*, int16_t *val);
+		int op(const char*, int32_t *val);
+		int op(const char*, int64_t *val);
+
+		int op(const char*, uint16_t *val);
+		int op(const char*, uint32_t *val);
+		int op(const char*, uint64_t *val);
+
+		int op(const char*, bool *val);
+
+		template<typename T>
+		int op(const char*, T *val, size_t len);
+
+		template<size_t L>
+		int op(const char*, ox::bstring<L> *val);
+
+		template<typename T>
+		int op(const char*, T *val);
+
+		void setFields(int fields);
+
+	private:
+		template<typename I>
+		int appendInteger(I val);
+};
+
+template<size_t L>
+int MetalClawWriter::op(const char*, ox::bstring<L> *val) {
+	int err = 0;
+	bool fieldSet = false;
+	if (val->len()) {
+		// write the length
+		typedef uint32_t StringLength;
+		if (m_buffIt + sizeof(StringLength) + val->size() < m_buffLen) {
+			*((StringLength*) &m_buff[m_buffIt]) = ox::std::bigEndianAdapt((StringLength) val->size());
+			m_buffIt += sizeof(StringLength);
+
+			// write the string
+			ox_memcpy(&m_buff[m_buffIt], val, val->size());
+			m_buffIt += val->size();
+			fieldSet = true;
+		} else {
+			err = MC_BUFFENDED;
+		}
+	}
+	err |= m_fieldPresence.set(m_field, fieldSet);
+	m_field++;
+	return err;
+};
+
+template<typename T>
+int MetalClawWriter::op(const char*, T *val) {
+	int err = 0;
+	bool fieldSet = false;
+	MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
+	err |= ioOp(&writer, val);
+	if ((size_t) writer.m_fieldPresence.getMaxLen() < writer.m_buffIt) {
+		m_buffIt += writer.m_buffIt;
+		fieldSet = true;
+	}
+	err |= m_fieldPresence.set(m_field, fieldSet);
+	m_field++;
+	return err;
+};
+
+template<typename I>
+int MetalClawWriter::appendInteger(I val) {
+	int err = 0;
+	bool fieldSet = false;
+	if (val) {
+		if (m_buffIt + sizeof(I) < m_buffLen) {
+			*((I*) &m_buff[m_buffIt]) = ox::std::bigEndianAdapt(val);
+			fieldSet = true;
+			m_buffIt += sizeof(I);
+		} else {
+			err |= MC_BUFFENDED;
+		}
+	}
+	err |= m_fieldPresence.set(m_field, fieldSet);
+	m_field++;
+	return err;
+};
+
+template<typename T>
+int MetalClawWriter::op(const char*, T *val, size_t len) {
+	int err = 0;
+	bool fieldSet = false;
+
+	if (len) {
+		// write the length
+		typedef uint32_t ArrayLength;
+		if (m_buffIt + sizeof(ArrayLength) < m_buffLen) {
+			*((T*) &m_buff[m_buffIt]) = ox::std::bigEndianAdapt((ArrayLength) len);
+			m_buffIt += sizeof(ArrayLength);
+		} else {
+			err = MC_BUFFENDED;
+		}
+
+		MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
+		writer.setFields(len);
+
+		// write the array
+		for (size_t i = 0; i < len; i++) {
+			err |= writer.op("", &val[i]);
+		}
+
+		m_buffIt += writer.m_buffIt;
+		fieldSet = true;
+	}
+
+	err |= m_fieldPresence.set(m_field, fieldSet);
+	m_field++;
+	return err;
+};
+
+template<typename T>
+int write(uint8_t *buff, size_t buffLen, T *val) {
+	MetalClawWriter writer(buff, buffLen);
+	return ioOp(&writer, val);
+}
+
+}

deps/ox/src/ox/std/CMakeLists.txt

@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(
+	OxStd
+		memops.cpp
+		random.cpp
+		strops.cpp
+)
+
+set_property(
+	TARGET
+		OxStd
+	PROPERTY
+		POSITION_INDEPENDENT_CODE ON
+)
+
+install(
+	FILES
+		bitops.hpp
+		byteswap.hpp
+		memops.hpp
+		random.hpp
+		string.hpp
+		strops.hpp
+		std.hpp
+		types.hpp
+	DESTINATION
+		include/ox/std
+)
+
+install(TARGETS OxStd
+        LIBRARY DESTINATION lib/ox
+        ARCHIVE DESTINATION lib/ox
+)
+
+if(OX_RUN_TESTS STREQUAL "ON")
+	add_subdirectory(test)
+endif()

deps/ox/src/ox/std/bitops.hpp

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include "types.hpp"
+
+namespace ox {
+
+inline uint64_t rotateLeft(uint64_t i, int shift) {
+	return (i << shift) | (i >> (64 - shift));
+}
+
+}

deps/ox/src/ox/std/byteswap.hpp

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include "types.hpp"
+
+namespace ox {
+namespace std {
+
+
+inline int16_t byteSwap(int16_t i) {
+	return (i << 8) | (i >> 8);
+}
+
+inline int32_t byteSwap(int32_t i) {
+	return ((i >> 24) & 0x000000ff) |
+	       ((i >>  8) & 0x0000ff00) |
+	       ((i <<  8) & 0x00ff0000) |
+	       ((i << 24) & 0xff000000);
+}
+
+inline int64_t byteSwap(int64_t i) {
+	return ((i >> 56) & 0x00000000000000ff) |
+	       ((i >> 40) & 0x000000000000ff00) |
+	       ((i >> 24) & 0x0000000000ff0000) |
+	       ((i >>  8) & 0x00000000ff000000) |
+	       ((i <<  8) & 0x000000ff00000000) |
+	       ((i << 24) & 0x0000ff0000000000) |
+	       ((i << 40) & 0x00ff000000000000) |
+	       ((i << 56) & 0xff00000000000000);
+}
+
+inline uint16_t byteSwap(uint16_t i) {
+	return (i << 8) | (i >> 8);
+}
+
+inline uint32_t byteSwap(uint32_t i) {
+	return ((i >> 24) & 0x000000ff) |
+	       ((i >>  8) & 0x0000ff00) |
+	       ((i <<  8) & 0x00ff0000) |
+	       ((i << 24) & 0xff000000);
+}
+
+inline uint64_t byteSwap(uint64_t i) {
+	return ((i >> 56) & 0x00000000000000ff) |
+	       ((i >> 40) & 0x000000000000ff00) |
+	       ((i >> 24) & 0x0000000000ff0000) |
+	       ((i >>  8) & 0x00000000ff000000) |
+	       ((i <<  8) & 0x000000ff00000000) |
+	       ((i << 24) & 0x0000ff0000000000) |
+	       ((i << 40) & 0x00ff000000000000) |
+	       ((i << 56) & 0xff00000000000000);
+}
+
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline int8_t bigEndianAdapt(int8_t i) {
+	return i;
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline int16_t bigEndianAdapt(int16_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline int32_t bigEndianAdapt(int32_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline int64_t bigEndianAdapt(int64_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline uint8_t bigEndianAdapt(uint8_t i) {
+	return i;
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline uint16_t bigEndianAdapt(uint16_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline uint32_t bigEndianAdapt(uint32_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+/**
+ * Takes an int and byte swaps if the platform is big endian.
+ */
+inline uint64_t bigEndianAdapt(uint64_t i) {
+#ifdef __BIG_ENDIAN__
+	return byteSwap(i);
+#else
+	return i;
+#endif
+}
+
+
+}
+}

deps/ox/src/ox/std/memops.cpp

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include "memops.hpp"
+
+int ox_memcmp(const void *ptr1, const void *ptr2, size_t size) {
+	int retval = 0;
+	auto block1 = ((uint8_t*) ptr1);
+	auto block2 = ((uint8_t*) ptr2);
+	for (size_t i = 0; i < size; i++) {
+		if (block1[i] < block2[i]) {
+			retval = -1;
+			break;
+		} else if (block1[i] > block2[i]) {
+			retval = 1;
+			break;
+		}
+	}
+	return retval;
+}
+
+void *ox_memcpy(void *dest, const void *src, int64_t size) {
+	char *srcBuf = (char*) src;
+	char *dstBuf = (char*) dest;
+	for (int64_t i = 0; i < size; i++) {
+		dstBuf[i] = (char) srcBuf[i];
+	}
+	return dest;
+}
+
+void *ox_memset(void *ptr, int val, int64_t size) {
+	char *buf = (char*) ptr;
+	for (int64_t i = 0; i < size; i++) {
+		buf[i] = val;
+	}
+	return ptr;
+}

deps/ox/src/ox/std/memops.hpp

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+#include "types.hpp"
+
+int ox_memcmp(const void *ptr1, const void *ptr2, size_t size);
+
+void *ox_memcpy(void *src, const void *dest, int64_t size);
+
+void *ox_memset(void *ptr, int val, int64_t size);

deps/ox/src/ox/std/random.cpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "bitops.hpp"
+#include "random.hpp"
+
+namespace ox {
+
+RandomSeed Random::DEFAULT_SEED = {540932923848, 540932540932};
+
+Random::Random(RandomSeed seed) {
+	m_seed[0] = seed[0];
+	m_seed[1] = seed[1];
+}
+
+uint64_t Random::gen() {
+	// An implementation of the Xoroshiro128+ algorithm
+	auto s0 = m_seed[0];
+	auto s1 = m_seed[1];
+	auto retval = s0 + s1;
+
+	s1 ^= s0;
+	m_seed[0] = ox::rotateLeft(s0, 55) ^ s1 ^ (s1 << 14);
+	m_seed[1] = ox::rotateLeft(s1, 36);
+
+	return retval;
+}
+
+}
+
+
+uint64_t ox_rand() {
+	static ox::Random rand;
+	return rand.gen();
+}

deps/ox/src/ox/std/random.hpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+uint64_t ox_rand();
+
+namespace ox {
+
+typedef uint64_t RandomSeed[2];
+
+class Random {
+	public:
+		static RandomSeed DEFAULT_SEED;
+
+	private:
+		RandomSeed m_seed;
+
+	public:
+		Random(RandomSeed seed = DEFAULT_SEED);
+
+		uint64_t gen();
+};
+
+}

deps/ox/src/ox/std/std.hpp

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+#include "bitops.hpp"
+#include "byteswap.hpp"
+#include "memops.hpp"
+#include "random.hpp"
+#include "strops.hpp"
+#include "string.hpp"
+#include "types.hpp"

deps/ox/src/ox/std/string.hpp

@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include "memops.hpp"
+#include "strops.hpp"
+#include "types.hpp"
+
+namespace ox {
+
+// Bounded String
+template<size_t buffLen>
+class bstring {
+	private:
+		uint8_t m_buff[buffLen];
+
+	public:
+		bstring();
+
+		bstring(const char *str);
+
+		const bstring &operator=(const char *str);
+
+		const bstring &operator=(char *str);
+
+		bool operator==(const bstring &other);
+
+		char *data();
+
+		/**
+		 * Returns the number of characters in this string.
+		 */
+		size_t len();
+
+		/**
+		 * Returns the number of bytes used for this string.
+		 */
+		size_t size();
+
+		/**
+		 * Returns the capacity of bytes for this string.
+		 */
+		size_t cap();
+};
+
+template<size_t size>
+bstring<size>::bstring() {
+	m_buff[0] = 0;
+}
+
+template<size_t size>
+bstring<size>::bstring(const char *str) {
+	*this = str;
+}
+
+template<size_t size>
+const bstring<size> &bstring<size>::operator=(const char *str) {
+	size_t strLen = ox_strlen(str) + 1;
+	if (cap() < strLen) {
+		strLen = cap();
+	}
+	ox_memcpy(m_buff, str, strLen);
+	// make sure last element is a null terminator
+	m_buff[cap() - 1] = 0;
+	return *this;
+}
+
+template<size_t size>
+const bstring<size> &bstring<size>::operator=(char *str) {
+	return *this = (const char*) str;
+}
+
+template<size_t buffLen>
+bool bstring<buffLen>::operator==(const bstring<buffLen> &other) {
+	bool retval = true;
+	size_t i = 0;
+	while (i < buffLen && (m_buff[i] || other.m_buff[i])) {
+		if (m_buff[i] != other.m_buff[i]) {
+			retval = false;
+			break;
+		}
+		i++;
+	}
+	return retval;
+}
+
+template<size_t buffLen>
+char *bstring<buffLen>::data() {
+	return (char*) m_buff;
+}
+
+template<size_t buffLen>
+size_t bstring<buffLen>::len() {
+	size_t length = 0;
+	for (size_t i = 0; i < buffLen; i++) {
+		uint8_t b = m_buff[i];
+		if (b) {
+			if ((b & 128) == 0) { // normal ASCII character
+				length++;
+			} else if ((b & (256 << 6)) == (256 << 6)) { // start of UTF-8 character
+				length++;
+			}
+		} else {
+			break;
+		}
+	}
+	return length;
+}
+
+template<size_t buffLen>
+size_t bstring<buffLen>::size() {
+	size_t i;
+	for (i = 0; i < buffLen && m_buff[i]; i++);
+	return i + 1; // add one for null terminator
+}
+
+template<size_t buffLen>
+size_t bstring<buffLen>::cap() {
+	return buffLen;
+}
+
+}

deps/ox/src/ox/std/strops.cpp

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "strops.hpp"
+
+int ox_strcmp(const char *str1, const char *str2) {
+	auto retval = 0;
+	auto i = 0;
+	while (str1[i] || str2[i]) {
+		if (str1[i] < str2[i]) {
+			retval = -1;
+			break;
+		} else if (str1[i] > str2[i]) {
+			retval = 1;
+			break;
+		}
+		i++;
+	}
+	return retval;
+}
+
+int ox_strlen(const char *str1) {
+	int len;
+	for (len = 0; str1[len]; len++);
+	return len;
+}
+
+int ox_strlen(char *str1) {
+	int len;
+	for (len = 0; str1[len]; len++);
+	return len;
+}
+
+const char *ox_strchr(const char *str, int character, size_t maxLen) {
+	for (size_t i = 0; i <= maxLen; i++) {
+		if (str[i] == character) {
+			return &str[i];
+		} else if (str[i] == 0) {
+			return nullptr;
+		}
+	}
+	return nullptr;
+}
+
+char *ox_strchr(char *str, int character, size_t maxLen) {
+	for (size_t i = 0; i < maxLen; i++) {
+		if (str[i] == character) {
+			return &str[i];
+		} else if (str[i] == 0) {
+			return nullptr;
+		}
+	}
+	return nullptr;
+}
+
+int ox_lastIndexOf(const char *str, int character, int maxLen) {
+	int retval = -1;
+	for (int i = 0; i < maxLen && str[i]; i++) {
+		if (str[i] == character) {
+			retval = i;
+		}
+	}
+	return retval;
+}
+
+int ox_lastIndexOf(char *str, int character, int maxLen) {
+	int retval = -1;
+	for (int i = 0; i < maxLen && str[i]; i++) {
+		if (str[i] == character) {
+			retval = i;
+		}
+	}
+	return retval;
+}
+
+int ox_atoi(const char *str) {
+	int total = 0;
+	int multiplier = 1;
+
+	for (auto i = ox_strlen(str) - 1; i != -1; i--) {
+		total += (str[i] - '0') * multiplier;
+		multiplier *= 10;
+	}
+
+	return total;
+}

deps/ox/src/ox/std/strops.hpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include "types.hpp"
+
+int ox_strcmp(const char *str1, const char *str2);
+
+int ox_strlen(const char *str1);
+
+int ox_strlen(char *str1);
+
+const char *ox_strchr(const char *str, int character, size_t maxLen = 0xFFFFFFFF);
+
+char *ox_strchr(char *str, int character, size_t maxLen = 0xFFFFFFFF);
+
+int ox_lastIndexOf(const char *str, int character, int maxLen = 0xFFFFFFFF);
+
+int ox_lastIndexOf(char *str, int character, int maxLen = 0xFFFFFFFF);
+
+int ox_atoi(const char *str);

deps/ox/src/ox/std/test/CMakeLists.txt

@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_executable(
+	StdTest
+		tests.cpp
+)
+
+target_link_libraries(StdTest OxStd)
+
+add_test("Test\\ ox_memcmp\\ ABCDEFG\\ !=\\ HIJKLMN" StdTest "ABCDEFG != HIJKLMN")
+add_test("Test\\ ox_memcmp\\ HIJKLMN\\ !=\\ ABCDEFG" StdTest "HIJKLMN != ABCDEFG")
+add_test("Test\\ ox_memcmp\\ ABCDEFG\\ ==\\ ABCDEFG" StdTest "ABCDEFG == ABCDEFG")
+add_test("Test\\ ox_memcmp\\ ABCDEFGHI\\ ==\\ ABCDEFG" StdTest "ABCDEFGHI == ABCDEFG")
+
+
+################################################################################
+# StrOps Tests
+
+add_executable(
+	StrOpsTest
+		strops_test.cpp
+)
+
+target_link_libraries(StrOpsTest OxStd)
+
+add_test("Test\\ ox_strcmp\\ asdf\\ !=\\ hijk" StrOpsTest "asdf < hijk")
+add_test("Test\\ ox_strcmp\\ hijk\\ !=\\ asdf" StrOpsTest "hijk > asdf")
+add_test("Test\\ ox_strcmp\\ read\\ !=\\ resize" StrOpsTest "read < resize")
+add_test("Test\\ ox_strcmp\\ resize\\ !=\\ read" StrOpsTest "resize > read")
+add_test("Test\\ ox_strcmp\\ resize\\ ==\\ resize" StrOpsTest "resize == resize")
+add_test("Test\\ ox_strcmp\\ resize\\ ==\\ resize" StrOpsTest " == ")
+add_test("Test\\ ox_strchr\\ 0" StrOpsTest "ox_strchr 0")
+add_test("Test\\ ox_lastIndexOf\\ aaaa\\ a" StrOpsTest "ox_lastIndexOf aaaa a")
+
+
+################################################################################
+# Byte Swap Tests
+
+add_executable(
+	ByteSwapTest
+		byteswap_test.cpp
+)
+
+target_link_libraries(ByteSwapTest OxStd)
+
+add_test("Test\\ bigEndianAdapt\\ 0x00ff" ByteSwapTest bigEndianAdapt<uint16_t> 0x00ff)
+add_test("Test\\ bigEndianAdapt\\ 0xff00" ByteSwapTest bigEndianAdapt<uint16_t> 0xff00)
+
+add_test("Test\\ bigEndianAdapt\\ 0x000000ff" ByteSwapTest bigEndianAdapt<uint32_t> 0x000000ff)
+add_test("Test\\ bigEndianAdapt\\ 0x0000ff00" ByteSwapTest bigEndianAdapt<uint32_t> 0x0000ff00)
+add_test("Test\\ bigEndianAdapt\\ 0x00ff0000" ByteSwapTest bigEndianAdapt<uint32_t> 0x00ff0000)
+add_test("Test\\ bigEndianAdapt\\ 0xff000000" ByteSwapTest bigEndianAdapt<uint32_t> 0xff000000)
+
+add_test("Test\\ bigEndianAdapt\\ 0x00000000000000ff" ByteSwapTest bigEndianAdapt<uint64_t> 0x00000000000000ff)
+add_test("Test\\ bigEndianAdapt\\ 0x000000000000ff00" ByteSwapTest bigEndianAdapt<uint64_t> 0x000000000000ff00)
+add_test("Test\\ bigEndianAdapt\\ 0x0000000000ff0000" ByteSwapTest bigEndianAdapt<uint64_t> 0x0000000000ff0000)
+add_test("Test\\ bigEndianAdapt\\ 0x00000000ff000000" ByteSwapTest bigEndianAdapt<uint64_t> 0x00000000ff000000)
+add_test("Test\\ bigEndianAdapt\\ 0x000000ff00000000" ByteSwapTest bigEndianAdapt<uint64_t> 0x000000ff00000000)
+add_test("Test\\ bigEndianAdapt\\ 0x0000ff0000000000" ByteSwapTest bigEndianAdapt<uint64_t> 0x0000ff0000000000)
+add_test("Test\\ bigEndianAdapt\\ 0x00ff000000000000" ByteSwapTest bigEndianAdapt<uint64_t> 0x00ff000000000000)
+add_test("Test\\ bigEndianAdapt\\ 0xff00000000000000" ByteSwapTest bigEndianAdapt<uint64_t> 0xff00000000000000)

deps/ox/src/ox/std/test/byteswap_test.cpp

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <map>
+#include <string>
+#include <ox/std/std.hpp>
+
+using namespace std;
+using namespace ox::std;
+
+template<typename T>
+int testBigEndianAdapt(string str) {
+	auto i = (T) stoull(str, nullptr, 16);
+	return !(bigEndianAdapt(bigEndianAdapt(i)) == i);
+}
+
+map<string, int(*)(string)> tests = {
+	{
+		{ "bigEndianAdapt<uint16_t>", testBigEndianAdapt<uint16_t> },
+		{ "bigEndianAdapt<uint32_t>", testBigEndianAdapt<uint32_t> },
+		{ "bigEndianAdapt<uint64_t>", testBigEndianAdapt<uint64_t> },
+	},
+};
+
+int main(int argc, const char **args) {
+	int retval = -1;
+	if (argc > 1) {
+		auto testName = args[1];
+		string testArg = args[2];
+		if (tests.find(testName) != tests.end()) {
+			retval = tests[testName](testArg);
+		}
+	}
+	return retval;
+}

deps/ox/src/ox/std/test/strops_test.cpp

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <iostream>
+#include <map>
+#include <functional>
+#include <ox/std/std.hpp>
+
+using namespace std;
+
+map<string, function<int()>> tests = {
+	{
+		"asdf < hijk",
+		[]() {
+			return !(ox_strcmp("asdf", "hijk") < 0);
+		}
+	},
+	{
+		"hijk > asdf",
+		[]() {
+			return !(ox_strcmp("hijk", "asdf") > 0);
+		}
+	},
+	{
+		"resize > read",
+		[]() {
+			return !(ox_strcmp("resize", "read") > 0);
+		}
+	},
+	{
+		"read < resize",
+		[]() {
+			return !(ox_strcmp("read", "resize") < 0);
+		}
+	},
+	{
+		"resize == resize",
+		[]() {
+			return !(ox_strcmp("resize", "resize") == 0);
+		}
+	},
+	{
+		" == ",
+		[]() {
+			return !(ox_strcmp("", "") == 0);
+		}
+	},
+	{
+		"ox_strchr 0",
+		[]() {
+			auto testStr = "asdf";
+			return !(ox_strchr(testStr, 0, 4) == &testStr[4]);
+		}
+	},
+	{
+		"ox_lastIndexOf aaaa a",
+		[]() {
+			int retval = 0;
+			auto testStr = "aaaa";
+			retval |= !(ox_lastIndexOf((char*) testStr, 'a', ox_strlen(testStr)) == 3);
+			retval |= !(ox_lastIndexOf((const char*) testStr, 'a', ox_strlen(testStr)) == 3);
+			return retval;
+		}
+	},
+};
+
+int main(int argc, const char **args) {
+	if (argc > 1) {
+		auto testName = args[1];
+		if (tests.find(testName) != tests.end()) {
+			return tests[testName]();
+		}
+	}
+	return -1;
+}

deps/ox/src/ox/std/test/tests.cpp

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <iostream>
+#include <map>
+#include <functional>
+#include <ox/std/std.hpp>
+
+using namespace std;
+
+map<string, function<int()>> tests = {
+	{
+		"ABCDEFG != HIJKLMN",
+		[]() {
+			return !(ox_memcmp("ABCDEFG", "HIJKLMN", 7) < 0);
+		}
+	},
+	{
+		"HIJKLMN != ABCDEFG",
+		[]() {
+			return !(ox_memcmp("HIJKLMN", "ABCDEFG", 7) > 0);
+		}
+	},
+	{
+		"ABCDEFG == ABCDEFG",
+		[]() {
+			return !(ox_memcmp("ABCDEFG", "ABCDEFG", 7) == 0);
+		}
+	},
+	{
+		"ABCDEFGHI == ABCDEFG",
+		[]() {
+			return !(ox_memcmp("ABCDEFGHI", "ABCDEFG", 7) == 0);
+		}
+	},
+};
+
+int main(int argc, const char **args) {
+	if (argc > 1) {
+		auto testName = args[1];
+		if (tests.find(testName) != tests.end()) {
+			return tests[testName]();
+		}
+	}
+	return -1;
+}

deps/ox/src/ox/std/types.hpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+typedef signed char        int8_t;
+typedef unsigned char      uint8_t;
+typedef short              int16_t;
+typedef unsigned short     uint16_t;
+typedef int                int32_t;
+typedef unsigned int       uint32_t;
+typedef unsigned           uint_t;
+#if defined(_WIN32) || defined(__APPLE__) || defined(__arm__) || defined(__ppc__)
+typedef long long          int64_t;
+typedef unsigned long long uint64_t;
+#else
+typedef long               int64_t;
+typedef unsigned long      uint64_t;
+#endif
+
+namespace ox {
+
+typedef uint32_t Error;
+
+}
+
+#if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__)
+typedef unsigned long size_t;
+#elif defined(_WIN64)
+typedef uint64_t size_t;
+#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__)
+typedef uint32_t size_t;
+#else
+#error size_t undefined
+#endif