diff options
| author | Amlal <amlal@zka.com> | 2024-09-08 21:27:22 +0200 |
|---|---|---|
| committer | Amlal <amlal@zka.com> | 2024-09-08 21:27:22 +0200 |
| commit | 602a5b177636ed55e950b239eedfc0d3217b97e1 (patch) | |
| tree | 310385b731b349a918de2b24a13f15cdf07e59fe | |
| parent | b24daff9b2931a8152e6056a88b40823d6adcd78 (diff) | |
[src/ManifestBuilder.cxx] Almost detect ELF executables.
[cli/BuilderJSON.cxx] Improve code readiblity.
Signed-off-by: Amlal <amlal@zka.com>
| -rw-r--r-- | cli/BuilderJSON.cxx (renamed from cli/tool.cxx) | 15 | ||||
| -rw-r--r-- | src/ManifestBuilder.cxx (renamed from src/build.cxx) | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/cli/tool.cxx b/cli/BuilderJSON.cxx index b48ac62..cffbe45 100644 --- a/cli/tool.cxx +++ b/cli/BuilderJSON.cxx @@ -5,8 +5,8 @@ #include <iostream> #include <thread> -int cJobIndex = 0; -bool cFailed = false; +int cJobIndex = 0; +bool cFailed = false; int main(int argc, char** argv) { @@ -18,14 +18,16 @@ int main(int argc, char** argv) if (index_json == "/Ver" || index_json == "/Version" || - index_json == "/?" || + index_json == "/?" || index_json == "/Help") { - std::cout << "btb: 🚀 Basic Tool for Building.\n"; + std::cout << "btb: 🚀 Basic Tool for Building (JSON support).\n"; std::cout << "btb: Brought to you by Amlal El Mahrouss.\n"; std::cout << "btb: © ZKA Technologies, all rights reserved.\n"; - std::cout << "btb: 🆘 run file: btb <json_path>.json\n"; + if (index_json == "/?" || + index_json == "/Help") + std::cout << "btb: 🆘 run file: btb <json_path>.json\n"; return 0; } @@ -54,8 +56,7 @@ int main(int argc, char** argv) // wait for completion of all jobs. while (cJobIndex) - { - } + ; return cFailed ? 1 : 0; } diff --git a/src/build.cxx b/src/ManifestBuilder.cxx index b0e759f..70f3475 100644 --- a/src/build.cxx +++ b/src/ManifestBuilder.cxx @@ -107,15 +107,20 @@ bool ManifestBuilder::buildJson(int arg_sz, const char* arg_val) ss.str()[1] == 'o' && ss.str()[2] == 'y' && ss.str()[3] == '!') - std::cout << "btb: error: can't open PEF DLL, it mayn't contain an entrypoint." << std::endl; + std::cout << "btb: error: can't open Joy! DLL, it maynt't contain an entrypoint." << std::endl; else if (ss.str()[0] == '!' && ss.str()[1] == 'y' && ss.str()[2] == 'o' && ss.str()[3] == 'J') - std::cout << "btb: error: can't open FEP DLL, it mayn't contain an entrypoint." << std::endl; + std::cout << "btb: error: can't open !yoJ DLL, it maynt't contain an entrypoint." << std::endl; else if (ss.str()[0] == 'M' && ss.str()[1] == 'Z') - std::cout << "btb: error: can't open MZ DLL, it mayn't contain an entrypoint." << std::endl; + std::cout << "btb: error: can't open MZ DLL, it maynt't contain an entrypoint." << std::endl; + else if (ss.str()[0] == 0x7F && + ss.str()[1] == 'E') + { + std::cout << "btb: error: can't open ELF DLL, it maynt't contain an entrypoint." << std::endl; + } return true; } @@ -125,13 +130,13 @@ bool ManifestBuilder::buildJson(int arg_sz, const char* arg_val) } catch (...) { - // ignore... + // ignore error... } } catch (std::runtime_error& err) { std::cout << "btb: error: " << err.what() << std::endl; - perror("buildme"); + perror("btb"); return false; } |