Author | Jamozed <[email protected]> |
Date | 2020-07-25 00:58:26 |
Commit | 2ec1a04686939492d63a2b09ca3290588f2665e0 |
Parent | d11afb10c67d6c24ab88e94ea2c7e16624b831ba |
crc32: Move crc32 utility to OMKOV cryptutils
Diffstat
M | CMakeLists.txt | | | 1 | - |
M | README.md | | | 1 | - |
D | man/crc32.1 | | | 36 | ------------------------------------ |
D | src/crc32.c | | | 155 | -------------------------------------------------------------------------------- |
4 files changed, 0 insertions, 193 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4185662..f7cd570 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,6 @@ LINK_LIBRARIES(libokv.a) ADD_EXECUTABLE(basename ${PROJECT_SOURCE_DIR}/src/basename.c) ADD_EXECUTABLE(cat ${PROJECT_SOURCE_DIR}/src/cat.c) -ADD_EXECUTABLE(crc32 ${PROJECT_SOURCE_DIR}/src/crc32.c) ADD_EXECUTABLE(dirname ${PROJECT_SOURCE_DIR}/src/dirname.c) ADD_EXECUTABLE(echo ${PROJECT_SOURCE_DIR}/src/echo.c) ADD_EXECUTABLE(env ${PROJECT_SOURCE_DIR}/src/env.c) diff --git a/README.md b/README.md index 97fd177..ffe23fe 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ UNIX-like systems. | ---------------- | ---------------------------------------- | -------- | | basename | Return non-directory portion of a path | POSIX | | cat | Concatenate and print files | POSIX | -| crc32 | Compute the CRC-32 for a file | | | dirname | Return the directory portion of a path | POSIX | | echo | Write arguments to standard output | POSIX | | env | Execute with an altered enviroment | POSIX | diff --git a/man/crc32.1 b/man/crc32.1 deleted file mode 100644 index 5816e52..0000000 --- a/man/crc32.1 +++ /dev/null @@ -1,36 +0,0 @@ -.TH CRC32 1 2020-06-27 "OMKOV coreutils" "General Commands Manual" -.SH NAME -crc32 \(em compute the CRC-32 for a file -.SH SYNOPSYS -\fBcrc32\fR [\fIfile\fR...] -.SH DESCRIPTION -Compute and print a CRC-32 for each input file, as well as the file size in -bytes. -.SH OPTIONS -The following options are supported: -.TP -.B --help -Display help information. -.TP -.B --version -Display version information. -.SH OPERANDS -The following operand is supported: -.TP -.I file -A pathname of an input file. If no \fIfile\fR operands are specified, or -\fIfile\fR is a '\fB-\fR', \fIcrc32\fR will read from standard input. -.SH EXIT STATUS -The following exit values will be returned: -.TP -\ 0 -All files were processed successfully. -.TP ->0 -An error occurred. -.SH COPYRIGHT -.nf -Copyright (C) 2020, Jakob Wakeling -All rights reserved. -OMKOV Permissive Licence (https://www.omkov.net/OLPE) -.fi diff --git a/src/crc32.c b/src/crc32.c deleted file mode 100644 index 057538f..0000000 --- a/src/crc32.c +++ /dev/null @@ -1,155 +0,0 @@ -// crc32.c, version 1.0.3 -// OMKOV coreutils crc32 -// Copyright (C) 2020, Jakob Wakeling -// All rights reserved. - -/* -OMKOV Permissive Licence, version 1.0 - -Copyright (C) 2020, Jakob Wakeling -All rights reserved. - -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. -*/ - -#include "optget.h" - -#include <error.h> - -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> - -#define VERSION "1.0.3" - -static const uint32_t CRC32[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -static inline int crc32(const char *file); - -static void help(void); -static void version(void); - -int main(int ac, char *av[]) { A0 = av[0]; - lop_t lops[] = { - { "help", ARG_NUL, 256 }, - { "version", ARG_NUL, 257 }, - { NULL, 0, 0 } - }; - - opt_t opt = OPTGET_INIT; opt.str = ""; opt.lops = lops; int o; - while((o = optget(&opt, av, 1)) != -1) switch (o) { - case 256: { help(); return 0; } - case 257: { version(); return 0; } - default: { return 1; } - } - - bool warned = false; - - if (opt.ind == ac) { crc32(NULL); } - else for (char **p = &av[opt.ind]; *p; ++p) if (crc32(*p)) { - warn("%s: %s", *p, serr()); warned = true; - } - - return warned; -} - -static inline int crc32(const char *file) { - char stdbuf[BUFSIZ * 16]; FILE *fi; - register size_t fl = 0; register uint32_t crc = (uint32_t)~0; - - if (!file || (file[0] == '-' && file[1] == 0)) { fi = stdin; } - else if (!(fi = fopen(file, "r"))) { return 1; } - - for (size_t c; (c = fread(stdbuf, 1, sizeof (stdbuf), fi)); fl += c) { - for (register size_t i = 0; i != c; ++i) { - crc = (crc >> 8) ^ CRC32[(crc ^ (unsigned int)stdbuf[i]) & 0xFF]; - } - } crc = ~crc; - - printf("%u %zu", crc, fl); - if (file) { printf(" %s", file); } fputc('\n', stdout); - - if (fi != stdin) { fclose(fi); } return 0; -} - -static void help(void) { - puts("crc32 - compute the CRC-32 for a file\n"); - puts("usage: crc32 [file...]\n"); - puts("options:"); - puts(" --help Display help information"); - puts(" --version Display version information"); - return; -} - -static void version() { - puts("OMKOV coreutils crc32, version " VERSION); - puts("Copyright (C) 2020, Jakob Wakeling"); - puts("All rights reserved."); - puts("OMKOV Permissive Licence (https://www.omkov.net/OLPE)"); - return; -}