Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

src: cleanup option handling, add testcases; fixes #587

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2022-09-11 15:58:37 +02:00
parent 575cb720c6
commit 4318cc22ee
8 changed files with 175 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/work.cpp
+7 -7
View File
@@ -271,40 +271,40 @@ int do_files(int i, int argc, char *argv[]) {
unlink_ofile(oname);
if (opt->verbose >= 1 || (opt->verbose >= 0 && !e.isWarning()))
printErr(iname, &e);
set_exit_code(e.isWarning() ? EXIT_WARN : EXIT_ERROR);
main_set_exit_code(e.isWarning() ? EXIT_WARN : EXIT_ERROR);
// continue processing more files
} catch (const Error &e) {
unlink_ofile(oname);
printErr(iname, &e);
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
} catch (std::bad_alloc *e) {
unlink_ofile(oname);
printErr(iname, "out of memory");
UNUSED(e);
// delete e;
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
} catch (const std::bad_alloc &) {
unlink_ofile(oname);
printErr(iname, "out of memory");
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
} catch (std::exception *e) {
unlink_ofile(oname);
printUnhandledException(iname, e);
// delete e;
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
} catch (const std::exception &e) {
unlink_ofile(oname);
printUnhandledException(iname, &e);
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
} catch (...) {
unlink_ofile(oname);
printUnhandledException(iname, nullptr);
set_exit_code(EXIT_ERROR);
main_set_exit_code(EXIT_ERROR);
return -1;
}
}