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

src: major cleanups, introduce new eXtended Span class

Browse Source 
- initial minimally invasive eXtended Span implementation
- rename ptr_diff to ptr_diff_bytes
- move some files to util subdir
- lots of cleanups
- start using the new checked pointers - this needs some real-world testing
This commit is contained in:
Markus F.X.J. Oberhumer
2022-09-11 16:03:56 +02:00
parent 4318cc22ee
commit c75d7a685d
54 changed files with 3521 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/work.cpp
+10 -10
View File
@@ -190,15 +190,15 @@ void do_one_file(const char *iname, char *oname) {
r = chmod(iname, 0777);
IGNORE_ERROR(r);
#endif
File::unlink(iname);
FileBase::unlink(iname);
} else {
// make backup
char bakname[ACC_FN_PATH_MAX + 1];
if (!makebakname(bakname, sizeof(bakname), iname))
throwIOException("could not create a backup file name");
File::rename(iname, bakname);
FileBase::rename(iname, bakname);
}
File::rename(oname, iname);
FileBase::rename(oname, iname);
}
// copy file attributes
@@ -272,40 +272,40 @@ int do_files(int i, int argc, char *argv[]) {
if (opt->verbose >= 1 || (opt->verbose >= 0 && !e.isWarning()))
printErr(iname, &e);
main_set_exit_code(e.isWarning() ? EXIT_WARN : EXIT_ERROR);
// continue processing more files
// this is not fatal, continue processing more files
} catch (const Error &e) {
unlink_ofile(oname);
printErr(iname, &e);
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
} catch (std::bad_alloc *e) {
unlink_ofile(oname);
printErr(iname, "out of memory");
UNUSED(e);
// delete e;
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
} catch (const std::bad_alloc &) {
unlink_ofile(oname);
printErr(iname, "out of memory");
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
} catch (std::exception *e) {
unlink_ofile(oname);
printUnhandledException(iname, e);
// delete e;
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
} catch (const std::exception &e) {
unlink_ofile(oname);
printUnhandledException(iname, &e);
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
} catch (...) {
unlink_ofile(oname);
printUnhandledException(iname, nullptr);
main_set_exit_code(EXIT_ERROR);
return -1;
return -1; // fatal error
}
}