Author | Jamozed <[email protected]> |
Date | 2022-03-05 23:55:13 |
Commit | 7f427d9a31853bc24017388e170854cdc9cd9c5d |
Parent | 483949f44663424c8c39c0d9417cf5b0698412e5 |
Relicense to MIT
Diffstat
M | .gitignore | | | 1 | + |
M | CMakeLists.txt | | | 64 | ++++++++++++++++++++++++++++++++-------------------------------- |
M | LICENCE | | | 24 | ++++++++++-------------- |
M | README.md | | | 3 | +-- |
M | man/error.3 | | | 5 | ++--- |
M | man/optget.3 | | | 5 | ++--- |
M | src/alloc.c | | | 29 | +---------------------------- |
M | src/alloc.h | | | 29 | +---------------------------- |
M | src/base32.c | | | 29 | +---------------------------- |
M | src/base32.h | | | 29 | +---------------------------- |
M | src/base64.c | | | 29 | +---------------------------- |
M | src/base64.h | | | 29 | +---------------------------- |
M | src/crypt.h | | | 29 | +---------------------------- |
M | src/endian.h | | | 29 | +---------------------------- |
M | src/error.c | | | 29 | +---------------------------- |
M | src/error.h | | | 29 | +---------------------------- |
M | src/fnv.c | | | 29 | +---------------------------- |
M | src/fnv.h | | | 29 | +---------------------------- |
M | src/map.c | | | 29 | +---------------------------- |
M | src/map.h | | | 29 | +---------------------------- |
M | src/mode.c | | | 29 | +---------------------------- |
M | src/mode.h | | | 29 | +---------------------------- |
M | src/optget.c | | | 29 | +---------------------------- |
M | src/optget.h | | | 29 | +---------------------------- |
M | src/rc2.c | | | 29 | +---------------------------- |
M | src/rc2.h | | | 29 | +---------------------------- |
M | src/strconv.h | | | 29 | +---------------------------- |
M | src/strtos.c | | | 29 | +---------------------------- |
M | src/strtou.c | | | 29 | +---------------------------- |
M | src/test/test_base32.c | | | 16 | +--------------- |
M | src/test/test_base64.c | | | 16 | +--------------- |
M | src/test/test_crypt.c | | | 16 | +--------------- |
M | src/test/test_endian.c | | | 16 | +--------------- |
M | src/test/test_error.c | | | 16 | +--------------- |
M | src/test/test_fnv.c | | | 16 | +--------------- |
M | src/test/test_map.c | | | 16 | +--------------- |
M | src/test/test_optget.c | | | 16 | +--------------- |
M | src/test/test_rc2.c | | | 16 | +--------------- |
M | src/test/test_strtou.c | | | 16 | +--------------- |
M | src/test/unit.h | | | 16 | +--------------- |
M | src/util.h | | | 29 | +---------------------------- |
41 files changed, 83 insertions, 891 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/CMakeLists.txt b/CMakeLists.txt index ad026ee..175d9f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,38 +1,38 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) -PROJECT(libutil LANGUAGES C) +cmake_minimum_required(VERSION 3.12) +project(libutil LANGUAGES C) -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -SET(CMAKE_STATIC_LIBRARY_PREFIX "") -SET(CMAKE_SHARED_LIBRARY_PREFIX "") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) +set(CMAKE_STATIC_LIBRARY_PREFIX "") +set(CMAKE_SHARED_LIBRARY_PREFIX "") -FILE(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*) +file(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*) -ADD_LIBRARY(libutil_static STATIC ${SRC}) -ADD_LIBRARY(libutil_shared SHARED ${SRC}) +add_library(libutil_static STATIC ${SRC}) +add_library(libutil_shared SHARED ${SRC}) -LINK_LIBRARIES(libutil_static) +link_libraries(libutil_static) -ADD_EXECUTABLE(test_base32 ${PROJECT_SOURCE_DIR}/src/test/test_base32.c) -ADD_EXECUTABLE(test_base64 ${PROJECT_SOURCE_DIR}/src/test/test_base64.c) -ADD_EXECUTABLE(test_crypt ${PROJECT_SOURCE_DIR}/src/test/test_crypt.c) -ADD_EXECUTABLE(test_endian ${PROJECT_SOURCE_DIR}/src/test/test_endian.c) -ADD_EXECUTABLE(test_error ${PROJECT_SOURCE_DIR}/src/test/test_error.c) -ADD_EXECUTABLE(test_fnv ${PROJECT_SOURCE_DIR}/src/test/test_fnv.c) -ADD_EXECUTABLE(test_map ${PROJECT_SOURCE_DIR}/src/test/test_map.c) -ADD_EXECUTABLE(test_optget ${PROJECT_SOURCE_DIR}/src/test/test_optget.c) -ADD_EXECUTABLE(test_rc2 ${PROJECT_SOURCE_DIR}/src/test/test_rc2.c) -ADD_EXECUTABLE(test_strtou ${PROJECT_SOURCE_DIR}/src/test/test_strtou.c) +add_executable(test_base32 ${PROJECT_SOURCE_DIR}/src/test/test_base32.c) +add_executable(test_base64 ${PROJECT_SOURCE_DIR}/src/test/test_base64.c) +add_executable(test_crypt ${PROJECT_SOURCE_DIR}/src/test/test_crypt.c) +add_executable(test_endian ${PROJECT_SOURCE_DIR}/src/test/test_endian.c) +add_executable(test_error ${PROJECT_SOURCE_DIR}/src/test/test_error.c) +add_executable(test_fnv ${PROJECT_SOURCE_DIR}/src/test/test_fnv.c) +add_executable(test_map ${PROJECT_SOURCE_DIR}/src/test/test_map.c) +add_executable(test_optget ${PROJECT_SOURCE_DIR}/src/test/test_optget.c) +add_executable(test_rc2 ${PROJECT_SOURCE_DIR}/src/test/test_rc2.c) +add_executable(test_strtou ${PROJECT_SOURCE_DIR}/src/test/test_strtou.c) -ENABLE_TESTING() -ADD_TEST(NAME test_base32 COMMAND test_base32) -ADD_TEST(NAME test_base64 COMMAND test_base64) -ADD_TEST(NAME test_crypt COMMAND test_crypt) -ADD_TEST(NAME test_endian COMMAND test_endian) -ADD_TEST(NAME test_error COMMAND test_error) -ADD_TEST(NAME test_fnv COMMAND test_fnv) -ADD_TEST(NAME test_map COMMAND test_map) -ADD_TEST(NAME test_optget COMMAND test_optget) -ADD_TEST(NAME test_rc2 COMMAND test_rc2) -ADD_TEST(NAME test_strtou COMMAND test_strtou) +enable_testing() +add_test(NAME test_base32 COMMAND test_base32) +add_test(NAME test_base64 COMMAND test_base64) +add_test(NAME test_crypt COMMAND test_crypt) +add_test(NAME test_endian COMMAND test_endian) +add_test(NAME test_error COMMAND test_error) +add_test(NAME test_fnv COMMAND test_fnv) +add_test(NAME test_map COMMAND test_map) +add_test(NAME test_optget COMMAND test_optget) +add_test(NAME test_rc2 COMMAND test_rc2) +add_test(NAME test_strtou COMMAND test_strtou) 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 9535567..cdb7f1f 100644 --- a/README.md +++ b/README.md @@ -49,5 +49,4 @@ To run **libutil** unit tests on UNIX, run TestUNIX.sh once built. ## 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/man/error.3 b/man/error.3 index f628336..9fc50a8 100644 --- a/man/error.3 +++ b/man/error.3 @@ -1,4 +1,4 @@ -.TH ERROR 3 2021-11-27 "libutil" "libutil Programmer's Manual" +.TH ERROR 3 2022-03-06 "libutil" "libutil Programmer's Manual" .SH NAME error, warn, alert \(em error reporting functions .SH SYNOPSYS @@ -27,6 +27,5 @@ The \fBwarn\fR() function will set the global variable \fIwarned\fR to true. .SH COPYRIGHT .nf Copyright (C) 2020, Jakob Wakeling -All rights reserved. -OMKOV Permissive Licence (https://www.omkov.net/OLPE) +MIT Licence (https://opensource.org/licenses/MIT) .fi diff --git a/man/optget.3 b/man/optget.3 index 6e22896..0ff6dd1 100644 --- a/man/optget.3 +++ b/man/optget.3 @@ -1,4 +1,4 @@ -.TH OPTGET 3 2021-11-27 "libutil" "libutil Programmer's Manual" +.TH OPTGET 3 2022-03-06 "libutil" "libutil Programmer's Manual" .SH NAME optget \(em parse command line options .SH SYNOPSYS @@ -51,6 +51,5 @@ int main(int ac, char *av[]) { A0 = av[0]; .SH COPYRIGHT .nf Copyright (C) 2020, Jakob Wakeling -All rights reserved. -OMKOV Permissive Licence (https://www.omkov.net/OLPE) +MIT Licence (https://opensource.org/licenses/MIT) .fi diff --git a/src/alloc.c b/src/alloc.c index 10067ae..588ef6d 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1,34 +1,7 @@ // util/alloc.h, version 1.0.1 // Memory allocation source file from libutil // Copyright (C) 2021, 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 #include "alloc.h" #include "error.h" diff --git a/src/alloc.h b/src/alloc.h index 7f07d0a..7a73863 100644 --- a/src/alloc.h +++ b/src/alloc.h @@ -1,34 +1,7 @@ // util/alloc.h, version 1.0.1 // Memory allocation header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_ALLOC_H_M0UWQ8LT #define UTIL_ALLOC_H_M0UWQ8LT diff --git a/src/base32.c b/src/base32.c index bbf9f9c..8b7eaef 100644 --- a/src/base32.c +++ b/src/base32.c @@ -1,34 +1,7 @@ // util/base32.c, version 1.0.4 // Base32 source file from libutil // Copyright (C) 2021, 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 #include "base32.h" diff --git a/src/base32.h b/src/base32.h index 30ed6b3..ca6d3b4 100644 --- a/src/base32.h +++ b/src/base32.h @@ -1,34 +1,7 @@ // util/base32.h, version 1.0.4 // Base32 header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_BASE32_H_2PSMZTB0 #define UTIL_BASE32_H_2PSMZTB0 diff --git a/src/base64.c b/src/base64.c index 69cee8f..b7a572d 100644 --- a/src/base64.c +++ b/src/base64.c @@ -1,34 +1,7 @@ // util/base64.c, version 1.1.5 // Base64 source file from libutil // Copyright (C) 2021, 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 #include "base64.h" diff --git a/src/base64.h b/src/base64.h index df04fb1..2aae130 100644 --- a/src/base64.h +++ b/src/base64.h @@ -1,34 +1,7 @@ // util/base64.h, version 1.1.5 // Base64 header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_BASE64_H_5YQ80JRV #define UTIL_BASE64_H_5YQ80JRV diff --git a/src/crypt.h b/src/crypt.h index c6f3470..813e908 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -1,34 +1,7 @@ // util/crypt.h, version 0.1.2 // Crypt header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_CRYPT_H_RDY6J5JV #define UTIL_CRYPT_H_RDY6J5JV diff --git a/src/endian.h b/src/endian.h index f715377..23413c0 100644 --- a/src/endian.h +++ b/src/endian.h @@ -1,34 +1,7 @@ // util/endian.h, version 1.0.2 // Endian header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_ENDIAN_H_G7AID2RQ #define UTIL_ENDIAN_H_G7AID2RQ diff --git a/src/error.c b/src/error.c index f096704..68f230b 100644 --- a/src/error.c +++ b/src/error.c @@ -1,34 +1,7 @@ // util/error.h, version 1.1.2 // Error source file from libutil // 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 #include "error.h" diff --git a/src/error.h b/src/error.h index e13c32b..1dbe3a2 100644 --- a/src/error.h +++ b/src/error.h @@ -1,34 +1,7 @@ // util/error.h, version 1.1.2 // Error header file from libutil // 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 #ifndef UTIL_ERROR_H_38W06M3W #define UTIL_ERROR_H_38W06M3W diff --git a/src/fnv.c b/src/fnv.c index 0454249..b99060e 100644 --- a/src/fnv.c +++ b/src/fnv.c @@ -1,34 +1,7 @@ // util/fnv.c, version 1.0.2 // FNV hash source file from libutil // Copyright (C) 2021, 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 #include "fnv.h" #include "util.h" diff --git a/src/fnv.h b/src/fnv.h index 0123a2e..6fe8a7b 100644 --- a/src/fnv.h +++ b/src/fnv.h @@ -1,34 +1,7 @@ // util/fnv.h, version 1.0.2 // FNV hash header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_FNV_H_O4TYU6Q1 #define UTIL_FNV_H_O4TYU6Q1 diff --git a/src/map.c b/src/map.c index 0241488..ec7dc9d 100644 --- a/src/map.c +++ b/src/map.c @@ -1,34 +1,7 @@ // util/map.c, version 0.1.2 // Map utility source file from libutil // Copyright (C) 2021, 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 /* This file uses the currently non-standard 'typeof' operator. Its use is diff --git a/src/map.h b/src/map.h index ac42bd9..200a5b9 100644 --- a/src/map.h +++ b/src/map.h @@ -1,34 +1,7 @@ // util/map.h, version 0.1.2 // Map utility header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_MAP_H_NB53CJJ8 #define UTIL_MAP_H_NB53CJJ8 diff --git a/src/mode.c b/src/mode.c index 02634c7..e9aa4bb 100644 --- a/src/mode.c +++ b/src/mode.c @@ -1,34 +1,7 @@ // util/mode.c, version 1.0.3 // Mode source file from libutil // 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 /* TODO Handle copying permissions diff --git a/src/mode.h b/src/mode.h index 99f4ecb..3694af6 100644 --- a/src/mode.h +++ b/src/mode.h @@ -1,34 +1,7 @@ // util/mode.h, version 1.0.3 // Mode header file from libutil // 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 #ifndef UTIL_MODE_H_0C99POMA #define UTIL_MODE_H_0C99POMA diff --git a/src/optget.c b/src/optget.c index 4b46a47..62b6272 100644 --- a/src/optget.c +++ b/src/optget.c @@ -1,34 +1,7 @@ // util/optget.h, version 1.6.2 // optget source file from libutil // 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 #include "error.h" #include "optget.h" diff --git a/src/optget.h b/src/optget.h index fffd345..0ee1b84 100644 --- a/src/optget.h +++ b/src/optget.h @@ -1,34 +1,7 @@ // util/optget.h, version 1.6.2 // optget header file from libutil // 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 #ifndef UTIL_OPTGET_H_W3LIZK1S #define UTIL_OPTGET_H_W3LIZK1S diff --git a/src/rc2.c b/src/rc2.c index 469be05..cc359e0 100644 --- a/src/rc2.c +++ b/src/rc2.c @@ -1,34 +1,7 @@ // util/rc2.c, version 1.0.1 // RC2 source file from libutil // Copyright (C) 2021, 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 #include "rc2.h" diff --git a/src/rc2.h b/src/rc2.h index 50473e8..eb0f40f 100644 --- a/src/rc2.h +++ b/src/rc2.h @@ -1,34 +1,7 @@ // util/rc2.h, version 1.0.1 // RC2 header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_RC2_H_PMXL29JH #define UTIL_RC2_H_PMXL29JH diff --git a/src/strconv.h b/src/strconv.h index f991e32..bdfaff1 100644 --- a/src/strconv.h +++ b/src/strconv.h @@ -1,34 +1,7 @@ // util/strconv.h // String conversion header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_STRCONV_H_3EQMSZZK #define UTIL_STRCONV_H_3EQMSZZK diff --git a/src/strtos.c b/src/strtos.c index e5ce76f..5aff849 100644 --- a/src/strtos.c +++ b/src/strtos.c @@ -1,34 +1,7 @@ // util/strtos.c // String conversion source file from libutil // Copyright (C) 2021, 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 #include "util.h" diff --git a/src/strtou.c b/src/strtou.c index e64d762..5e0a01c 100644 --- a/src/strtou.c +++ b/src/strtou.c @@ -1,34 +1,7 @@ // util/strtou.c // String conversion source file from libutil // Copyright (C) 2021, 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 #include "util.h" diff --git a/src/test/test_base32.c b/src/test/test_base32.c index f435460..a4652ce 100644 --- a/src/test/test_base32.c +++ b/src/test/test_base32.c @@ -1,21 +1,7 @@ // test_base32.c // Base32 unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../base32.h" #include "unit.h" diff --git a/src/test/test_base64.c b/src/test/test_base64.c index bf4435a..a34a67d 100644 --- a/src/test/test_base64.c +++ b/src/test/test_base64.c @@ -1,21 +1,7 @@ // test_base64.c // Base64 unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../base64.h" #include "unit.h" diff --git a/src/test/test_crypt.c b/src/test/test_crypt.c index 3fdb634..64ef159 100644 --- a/src/test/test_crypt.c +++ b/src/test/test_crypt.c @@ -1,21 +1,7 @@ // test_crypt.c // Crypt unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../crypt.h" #include "unit.h" diff --git a/src/test/test_endian.c b/src/test/test_endian.c index cb2f50f..bc78e5d 100644 --- a/src/test/test_endian.c +++ b/src/test/test_endian.c @@ -1,21 +1,7 @@ // test_endian.c // Endian unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../endian.h" #include "unit.h" diff --git a/src/test/test_error.c b/src/test/test_error.c index 4e6d8a7..d222700 100644 --- a/src/test/test_error.c +++ b/src/test/test_error.c @@ -1,21 +1,7 @@ // test_error.c // Error unit test for libutil // Copyright (C) 2020, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../error.h" diff --git a/src/test/test_fnv.c b/src/test/test_fnv.c index 9eadf21..a3c6b5a 100644 --- a/src/test/test_fnv.c +++ b/src/test/test_fnv.c @@ -1,21 +1,7 @@ // test_fnv.c // FNV unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../fnv.h" #include "../util.h" diff --git a/src/test/test_map.c b/src/test/test_map.c index 9a74c77..c648074 100644 --- a/src/test/test_map.c +++ b/src/test/test_map.c @@ -1,21 +1,7 @@ // test_map.c // Map unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../map.h" #include "../util.h" diff --git a/src/test/test_optget.c b/src/test/test_optget.c index fd619d8..f6cdc0f 100644 --- a/src/test/test_optget.c +++ b/src/test/test_optget.c @@ -1,21 +1,7 @@ // test_optget.c // optget unit test for libutil // Copyright (C) 2020, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../optget.h" #include "unit.h" diff --git a/src/test/test_rc2.c b/src/test/test_rc2.c index a53bb09..872cd99 100644 --- a/src/test/test_rc2.c +++ b/src/test/test_rc2.c @@ -1,21 +1,7 @@ // test_crypt.c // Crypt unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../rc2.h" #include "unit.h" diff --git a/src/test/test_strtou.c b/src/test/test_strtou.c index 9fb4e6f..66adfca 100644 --- a/src/test/test_strtou.c +++ b/src/test/test_strtou.c @@ -1,21 +1,7 @@ // test_strtou.c // String conversion unit test for libutil // Copyright (C) 2021, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #include "../strconv.h" #include "unit.h" diff --git a/src/test/unit.h b/src/test/unit.h index fdfe25a..166d467 100644 --- a/src/test/unit.h +++ b/src/test/unit.h @@ -1,21 +1,7 @@ // unit.h // Unit testing library // Copyright (C) 2019, Jakob Wakeling -// All righs reserved. - -/* -OMKOV Public Domain Licence, version 1.0 - -Permission is hereby granted to deal with this software and its associated -documentation files without restriction. - -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 #ifndef OMKOV_UNIT_H_YNUUN45Z #define OMKOV_UNIT_H_YNUUN45Z diff --git a/src/util.h b/src/util.h index f1ee66a..3d85789 100644 --- a/src/util.h +++ b/src/util.h @@ -1,34 +1,7 @@ // util/util.h, version 1.0.1 // Utility header file from libutil // Copyright (C) 2021, 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 #ifndef UTIL_UTIL_H_KP8NS9DC #define UTIL_UTIL_H_KP8NS9DC