OBFI

Relicense to MIT

Diffstat

4 files changed, 25 insertions, 62 deletions

diff --git a/.gitignore b/.gitignore
index 5497595..f563e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /.cache/
+/.vscode/
 /bin/
 /build/
 /compile_commands.json
diff --git a/LICENCE b/LICENCE
index 5e4b579..c6e3a71 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,24 +1,20 @@
-OMKOV Permissive Licence, version 1.0
+MIT Licence
+
+Copyright (C) 2020, Jakob Wakeling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
+this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimers.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimers in the documentation and/or
-  other materials provided with the distribution.
-* Neither the names of the copyright holders, nor the names of its contributors
-  may be used to endorse or promote products derived from this Software without
-  specific prior written permission.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 1a6282b..603df77 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # OBFI
 
-> OMKOV Brainfuck Interpreter
-
-The OMKOV Brainfuck Interpreter (OBFI) is a minimal Brainfuck interpreter.
+**OBFI** is a minimal and performant Brainfuck interpreter.
 
 ## Implementation Details
 
@@ -20,21 +18,19 @@ The OMKOV Brainfuck Interpreter (OBFI) is a minimal Brainfuck interpreter.
 * Replace `[+>+>]` and `[>+>+]` with a 'move to' instruction.
 * Replace `[-<-<]` and `[<-<-]` with a 'move to' instruction.
 
-## Build Instructions
+## Usage
+
+### Dependencies
 
-OBFI uses CMake to build.  
-Binaries will be located in the `bin` directory.
+- CMake >= 3.12, to build
 
-### UNIX Build
+### Building
 
-Run `BuildUNIX.sh`, or
+To build **OBFI** on UNIX, run `BuildUNIX.sh`.
 
-```sh
-cmake -S . -B build && cmake --build build
-```
+- Binaries will be located in the `bin` directory.
 
 ## Meta
 
 Copyright (C) 2020, Jakob Wakeling
-All rights reserved.  
-[OMKOV Permissive Licence](https://www.omkov.net/OLPE)
+[MIT Licence](https://opensource.org/licenses/MIT)
diff --git a/src/obfi.c b/src/obfi.c
index df0d22e..aa71c96 100644
--- a/src/obfi.c
+++ b/src/obfi.c
@@ -1,34 +1,7 @@
 // obfi.c
 // Main source file for OBFI
 // Copyright (C) 2020, Jakob Wakeling
-// All rights reserved.
-
-/*
-OMKOV Permissive Licence, version 1.0
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimers.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimers in the documentation and/or
-  other materials provided with the distribution.
-* Neither the names of the copyright holders, nor the names of its contributors
-  may be used to endorse or promote products derived from this Software without
-  specific prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-*/
+// MIT Licence
 
 /*
 	FIXME Segfault with large tape lengths and certain programs.
@@ -182,19 +155,16 @@ static inline int run(const char *fb, const long *fc) {
 
 /* Print help information */
 static void hlp(void) {
-	puts("OBFI - OMKOV Brainfuck Interpreter\n");
-	puts("USAGE: obfi file\n");
-	puts("OPTIONS:");
+	puts("OBFI - Brainfuck Interpreter\n");
+	puts("Usage: obfi file\n");
+	puts("Options:");
 	puts("  --help     Display help information");
 	puts("  --version  Display version information");
-	return;
 }
 
 /* Print version information */
 static void ver(void) {
 	puts("OBFI, version " PROJECT_VERSION);
 	puts("Copyright (C) 2020, Jakob Wakeling");
-	puts("All rights reserved.");
-	puts("OMKOV Permissive Licence (https://www.omkov.net/OLPE)");
-	return;
+	puts("MIT Licence (https://opensource.org/licenses/MIT)");
 }