simono41/TerminalImageViewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace constants copied from sysexits.h with our own definitions

Browse source
This commit is contained in:
Stefan Haustein 2024-02-14 19:51:05 +01:00
parent 1c2c1c27e8
commit a901624905
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/tiv.cpp
View file

@ -59,19 +59,11 @@
#include <system_error> #include <system_error>
#endif #endif
// Following codes copied from /usr/include/sysexits.h, // Program exit code constants compatible with sysexits.h.
// license: https://opensource.org/license/BSD-3-clause/ #define EXITCODE_OK 0
#define EX_OK 0 /* successful termination */ #define EXITCODE_COMMAND_LINE_USAGE_ERROR 64
#define EX__BASE 64 /* base value for error messages */ #define EXITCODE_DATA_FORMAT_ERROR 65
#define EX_USAGE 64 /* command line usage error */ #define EXITCODE_NO_INPUT_ERROR 66
#define EX_DATAERR 65 /* data format error */
#define EX_NOINPUT 66 /* cannot open input */
#define EX_SOFTWARE 70 /* internal software error */
#define EX_CANTCREAT 73 /* can't create (user) output file */
#define EX_IOERR 74 /* input/output error */
#define EX_TEMPFAIL 75 /* temp failure; user is invited to retry */
#define EX_NOPERM 77 /* permission denied */
#define EX_CONFIG 78 /* configuration error */
// Implementation of flag representation for flags in the main() method // Implementation of flag representation for flags in the main() method
constexpr int FLAG_FG = 1; constexpr int FLAG_FG = 1;
@ -581,11 +573,11 @@ int main(int argc, char *argv[]) {
int columns = 3; int columns = 3;
std::vector<std::string> file_names; std::vector<std::string> file_names;
int ret = EX_OK; // The return code for the program int ret = EXITCODE_OK; // The return code for the program
if (argc <= 1) { if (argc <= 1) {
printUsage(); printUsage();
return EX_USAGE; return EXITCODE_COMMAND_LINE_USAGE_ERROR;
} }
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
@ -597,7 +589,7 @@ int main(int argc, char *argv[]) {
columns = std::stoi(argv[++i]); columns = std::stoi(argv[++i]);
} else { } else {
std::cerr << "Error: -c requires a number" << std::endl; std::cerr << "Error: -c requires a number" << std::endl;
ret = EX_USAGE; ret = EXITCODE_COMMAND_LINE_USAGE_ERROR;
} }
} else if (arg == "-d" || arg == "--dir") { } else if (arg == "-d" || arg == "--dir") {
mode = THUMBNAILS; mode = THUMBNAILS;
@ -608,7 +600,7 @@ int main(int argc, char *argv[]) {
maxWidth = 4 * std::stoi(argv[++i]), detectSize = false; maxWidth = 4 * std::stoi(argv[++i]), detectSize = false;
} else { } else {
std::cerr << "Error: -w requires a number" << std::endl; std::cerr << "Error: -w requires a number" << std::endl;
ret = EX_USAGE; ret = EXITCODE_COMMAND_LINE_USAGE_ERROR;
} }
} else if (arg == "-h") { } else if (arg == "-h") {
if (i < argc - 1) if (i < argc - 1)
@ -623,7 +615,7 @@ int main(int argc, char *argv[]) {
flags |= FLAG_TELETEXT; flags |= FLAG_TELETEXT;
} else if (arg[0] == '-') { } else if (arg[0] == '-') {
std::cerr << "Error: Unrecognized argument: " << arg << std::endl; std::cerr << "Error: Unrecognized argument: " << arg << std::endl;
ret = EX_USAGE; ret = EXITCODE_COMMAND_LINE_USAGE_ERROR;
} else { } else {
// Arguments that will be displayed // Arguments that will be displayed
if (std::filesystem::is_directory(arg)) { if (std::filesystem::is_directory(arg)) {
@ -638,7 +630,7 @@ int main(int argc, char *argv[]) {
} else { } else {
std::cerr << "Error: Cannot open '" << arg std::cerr << "Error: Cannot open '" << arg
<< "', permission issue?" << std::endl; << "', permission issue?" << std::endl;
ret = EX_NOINPUT; ret = EXITCODE_NO_INPUT_ERROR;
} }
} }
} }
@ -694,7 +686,7 @@ int main(int argc, char *argv[]) {
} catch (cimg_library::CImgIOException &e) { } catch (cimg_library::CImgIOException &e) {
std::cerr << "Error: '" << filename std::cerr << "Error: '" << filename
<< "' has an unrecognized file format" << std::endl; << "' has an unrecognized file format" << std::endl;
ret = EX_DATAERR; ret = EXITCODE_DATA_FORMAT_ERROR;
} }
} }
} else { // Thumbnail mode } else { // Thumbnail mode