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

Disallow --exact with --overlay=strip.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2006-11-22 19:29:07 +01:00
parent 76b81c7b35
commit 29c099fe56
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+12 -10
View File
@@ -237,12 +237,24 @@ void check_options(int i, int argc)
{ {
assert(i <= argc); assert(i <= argc);
if (opt->cmd != CMD_COMPRESS)
{
// invalidate compression options
opt->method = 0;
opt->level = 0;
opt->exact = 0;
opt->small = 0;
opt->crp.reset();
}
// set default overlay action // set default overlay action
if (!(opt->cmd == CMD_COMPRESS || opt->cmd == CMD_DECOMPRESS)) if (!(opt->cmd == CMD_COMPRESS || opt->cmd == CMD_DECOMPRESS))
opt->overlay = opt->COPY_OVERLAY; opt->overlay = opt->COPY_OVERLAY;
else if (opt->overlay < 0) else if (opt->overlay < 0)
opt->overlay = opt->COPY_OVERLAY; opt->overlay = opt->COPY_OVERLAY;
check_not_both(opt->exact, opt->overlay == opt->STRIP_OVERLAY, "--exact", "--overlay=strip");
// set default backup option // set default backup option
if (opt->backup < 0) if (opt->backup < 0)
opt->backup = 0; opt->backup = 0;
@@ -1421,16 +1433,6 @@ int __acc_cdecl_main main(int argc, char *argv[])
break; break;
} }
if (opt->cmd != CMD_COMPRESS)
{
// invalidate compression options
opt->method = 0;
opt->level = 0;
opt->exact = 0;
opt->small = 0;
opt->crp.reset();
}
/* check options */ /* check options */
if (argc == 1) if (argc == 1)
e_help(); e_help();