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

Modernize libc usage: stop using off_t, use modern printf.

Browse Source 
C++ 14 is here, and old versions of MSVC and MSVCRT have
haunted us long enough.
This commit is contained in:
Markus F.X.J. Oberhumer
2021-01-05 18:52:05 +01:00
parent b4429e1a42
commit 700c8730cf
19 changed files with 130 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinz.cpp
+6 -6
View File
@@ -116,7 +116,7 @@ int PackVmlinuzI386::readFileHeader()
return 0;
int format = UPX_F_VMLINUZ_i386;
unsigned sys_size = ALIGN_UP((unsigned) file_size, 16u) - setup_size;
unsigned sys_size = ALIGN_UP((unsigned) file_size_u, 16u) - setup_size;
const unsigned char *p = (const unsigned char *) &h + 0x1e3;
@@ -234,7 +234,7 @@ int PackVmlinuzI386::decompressKernel()
}
}
checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024));
checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, 1024LL));
int gzoff = setup_size;
if (0x208<=h.version) {
@@ -259,7 +259,7 @@ int PackVmlinuzI386::decompressKernel()
// try to decompress
int klen;
int fd;
off_t fd_pos;
upx_off_t fd_pos;
for (;;)
{
klen = -1;
@@ -344,7 +344,7 @@ int PackVmlinuzI386::decompressKernel()
// some checks
if (fd_pos != file_size)
{
//printf("fd_pos: %ld, file_size: %ld\n", (long)fd_pos, (long)file_size);
NO_printf("fd_pos: %lld, file_size: %lld\n", fd_pos, file_size);
// linux-2.6.21.5/arch/i386/boot/compressed/vmlinux.lds
// puts .data.compressed ahead of .text, .rodata, etc;
@@ -759,7 +759,7 @@ int PackVmlinuzARMEL::decompressKernel()
fi->seek(0, SEEK_SET);
fi->readx(obuf, file_size);
//checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024));
//checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, 1024LL));
// Find head.S:
// bl decompress_kernel # 0xeb......
@@ -841,7 +841,7 @@ int PackVmlinuzARMEL::decompressKernel()
// try to decompress
int klen;
int fd;
off_t fd_pos;
upx_off_t fd_pos;
for (;;)
{
klen = -1;