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

Cleanups.

Browse Source 
committer: mfx <mfx> 1036984522 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2002-11-11 03:15:22 +00:00
parent f66d8f98c9
commit 6cd0d5d779
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_sh.cpp
+9 -7
View File
@@ -79,7 +79,7 @@ PackLinuxI386sh::buildLoader(Filter const *ft)
// filter // filter
optimizeFilter(&fold_ft, buf, sz_fold); optimizeFilter(&fold_ft, buf, sz_fold);
bool success = fold_ft.filter(buf + sizeof(cprElfHdr2), sz_fold - sizeof(cprElfHdr2)); bool success = fold_ft.filter(buf + sizeof(cprElfHdr2), sz_fold - sizeof(cprElfHdr2));
(void)success; UNUSED(success);
return buildLinuxLoader( return buildLinuxLoader(
linux_i386sh_loader, sizeof(linux_i386sh_loader), linux_i386sh_loader, sizeof(linux_i386sh_loader),
@@ -94,14 +94,16 @@ bool PackLinuxI386sh::getShellName(char *buf)
exetype = -1; exetype = -1;
l_shname = strcspn(buf, " \t\n\v\f\r"); l_shname = strcspn(buf, " \t\n\v\f\r");
buf[l_shname] = 0; buf[l_shname] = 0;
char const *const basename = 1+strrchr(buf, '/');
static char const *const shname[] = { // known shells that accept "-c" arg static char const *const shname[] = { // known shells that accept "-c" arg
"sh", "ash", "bsh", "csh", "ksh", "bash", "tcsh", "pdksh", "ash", "bash", "bsh", "csh", "ksh", "pdksh", "sh", "tcsh", "zsh",
//"python", // FIXME: does python work ??? //"python", // FIXME: does python work ???
NULL NULL
}; };
for (int j=0; 0 != shname[j]; ++j) { const char *bname = strrchr(buf, '/');
if (0==strcmp(shname[j], basename)) { if (bname == NULL)
return false;
for (int j = 0; NULL != shname[j]; ++j) {
if (0 == strcmp(shname[j], bname + 1)) {
return super::canPack(); return super::canPack();
} }
} }
@@ -115,9 +117,9 @@ bool PackLinuxI386sh::canPack()
// only compress i386sh scripts when running under Linux // only compress i386sh scripts when running under Linux
char buf[512]; char buf[512];
fi->readx(buf, 512); fi->readx(buf, sizeof(buf));
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
buf[511] = 0; buf[sizeof(buf) - 1] = 0;
if (!memcmp(buf, "#!/", 3)) { // #!/bin/sh if (!memcmp(buf, "#!/", 3)) { // #!/bin/sh
o_shname = 2; o_shname = 2;
return getShellName(&buf[o_shname]); return getShellName(&buf[o_shname]);