From 3b4c125ca2c6f61484a2cb0c85a7e49d4c2a0b79 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Wed, 5 Oct 2022 05:26:04 +0200 Subject: [PATCH] tools/arraydump: Reimplement in C++ --- scripts/build.sh | 1 + scripts/tools/.placeholder | 0 scripts/tools/arraydump.sh | 25 -------- src/tools/arraydump.cpp | 117 +++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 25 deletions(-) create mode 100644 scripts/tools/.placeholder delete mode 100755 scripts/tools/arraydump.sh create mode 100644 src/tools/arraydump.cpp diff --git a/scripts/build.sh b/scripts/build.sh index ef6c18e..3873af7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -60,6 +60,7 @@ create_directory bin/tools # add compile commands to this array COMPILE_COMMANDS=( "$CXX_WITH_FLAGS src/tools/dumpnbt.cpp -I./include -Lbin/lib -l:nbt.so -l:javacompat.so -l:cli.so -o bin/tools/dumpnbt" + "$CXX_WITH_FLAGS src/tools/arraydump.cpp -I./include -Lbin/lib -l:file.so -l:cli.so -o bin/tools/arraydump" #"$CXX_WITH_FLAGS src/tools/hexnet.cpp -I./include -Lbin/lib -l:cli.so -l:libsockpp.so -o bin/tools/hexnet" ) for command in ${!COMPILE_COMMANDS[@]}; do diff --git a/scripts/tools/.placeholder b/scripts/tools/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/scripts/tools/arraydump.sh b/scripts/tools/arraydump.sh deleted file mode 100755 index 1fef15a..0000000 --- a/scripts/tools/arraydump.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2022, FOSS-VG Developers and Contributers -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, version 3. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# version 3 along with this program. -# If not, see https://www.gnu.org/licenses/agpl-3.0.en.html - -if [ -z "$1" ]; then - echo -e "Usage: $0 FILE\n\nRead FILE and print its contents to standard output formatted as array of hexadecimal numbers." - exit 1 -fi - -echo -n "{" -xxd -p $1 | tr -d '\n\r' | sed -e 's/../0x&, /g;s/, $//' -echo "}" diff --git a/src/tools/arraydump.cpp b/src/tools/arraydump.cpp new file mode 100644 index 0000000..d180470 --- /dev/null +++ b/src/tools/arraydump.cpp @@ -0,0 +1,117 @@ +// Copyright 2022, FOSS-VG Developers and Contributers +// +// Author(s): +// BodgeMaster +// +// This program is free software: you can redistribute it and/or modify it +// under the terms of the GNU Affero General Public License as published +// by the Free Software Foundation, version 3. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied +// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// version 3 along with this program. +// If not, see https://www.gnu.org/licenses/agpl-3.0.en.html + +#include +#include +#include +#include + +#include "../lib/cli.hpp" +#include "../lib/file.hpp" + +#define EXIT_SUCCESS 0 +#define EXIT_RUNTIME 1 +#define EXIT_USAGE 2 + +int main(int argc, char* argv[]) { + std::vector flags; + flags.push_back(CLI::Flag('x', "hexadecimal", "write output as hexadecimal numbers")); + flags.push_back(CLI::Flag('o', "octal", "write output as octal numbers")); + flags.push_back(CLI::Flag('b', "binary", "write output as binary numbers")); + flags.push_back(CLI::Flag('h', "help", "print help and exit")); + flags.push_back(CLI::Flag('l', "license", "print license information and exit")); + std::vector options; + std::vector arguments; + arguments.push_back(CLI::Argument("FILE", "path of the file to dump")); + CLI::ArgumentsParser cliParser = CLI::ArgumentsParser(argc, argv, flags, options, arguments, "Dump files as C++ array literals"); + + if (cliParser.getFlag("help").value) { + std::cout << "I was here" << std::endl; + std::cout << cliParser.getUsage() << std::endl; + return EXIT_SUCCESS; + } + + if (cliParser.getFlag("license").value){ + std::cout + << "Copyright 2022, FOSS-VG Developers and Contributers\n" + << "\n" + << "ArrayDump is part of the FOSS-VG development tool suite.\n" + << "\n" + << "This program is free software: you can redistribute it and/or modify it\n" + << "under the terms of the GNU Affero General Public License as published\n" + << "by the Free Software Foundation, version 3.\n" + << "\n" + << "This program is distributed in the hope that it will be useful,\n" + << "but WITHOUT ANY WARRANTY; without even the implied\n" + << "warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" + << "See the GNU Affero General Public License for more details.\n" + << "\n" + << "You should have received a copy of the GNU Affero General Public License\n" + << "version 3 along with this program.\n" + << "If not, see https://www.gnu.org/licenses/agpl-3.0.en.html" + << std::endl; + return EXIT_SUCCESS; + } + + if (cliParser.wrongUsage) { + std::cout << cliParser.getUsage() << std::endl; + return EXIT_USAGE; + } + + ErrorOr filePointer = File::open(cliParser.getArgument(0).value, 'r'); + if (filePointer.isError) { + std::cout << "Failed to open file: " << cliParser.getArgument(0).value << std::endl; + return EXIT_RUNTIME; + } + File* file = filePointer.value; + + std::cout << "{"; + if (cliParser.getFlag("hexadecimal").value) { + if (!file->eof()) { + std::cout << "0x" << std::setw(2) << std::setfill('0') << std::hex << (int) file->readByte().value; + } + while (!file->eof()) { + std::cout << ", 0x" << std::setw(2) << std::setfill('0') << std::hex << (int) file->readByte().value; + } + } else if (cliParser.getFlag("octal").value) { + if (!file->eof()) { + std::cout << "0" << std::setw(3) << std::setfill('0') << std::oct << (int) file->readByte().value; + } + while (!file->eof()) { + std::cout << ", 0" << std::setw(3) << std::setfill('0') << std::oct << (int) file->readByte().value; + } + } else if (cliParser.getFlag("binary").value) { + if (!file->eof()) { + std::cout << "0b" << std::bitset<8>((int) file->readByte().value); + } + while (!file->eof()) { + std::cout << ", 0b" << std::bitset<8>((int) file->readByte().value); + } + } else { + if (!file->eof()) { + std::cout << (int) file->readByte().value; + } + while (!file->eof()) { + std::cout << ", " << (int) file->readByte().value; + } + } + std::cout << "}" << std::endl; + + delete file; + return EXIT_SUCCESS; +}