aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-03-01 08:25:45 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-03-01 08:25:45 +0100
commit2fe5fed2dfea4ffdb8af5f6352ea2c19641de3bd (patch)
tree08a0219c7de6449930f0ed77a608d558fc588e78
parent08e28e806dc6afdd1de5dac3f1471fd0310bf02b (diff)
downloadbusybox-w32-2fe5fed2dfea4ffdb8af5f6352ea2c19641de3bd.tar.gz
busybox-w32-2fe5fed2dfea4ffdb8af5f6352ea2c19641de3bd.tar.bz2
busybox-w32-2fe5fed2dfea4ffdb8af5f6352ea2c19641de3bd.zip
lzop: fiq -q and OPTION_DECOMPRESS mismatch
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/lzop.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/archival/lzop.c b/archival/lzop.c
index 56003d421..f5e06b54b 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -436,25 +436,26 @@ struct globals {
436//#define LZOP_VERSION_STRING "1.01" 436//#define LZOP_VERSION_STRING "1.01"
437//#define LZOP_VERSION_DATE "Apr 27th 2003" 437//#define LZOP_VERSION_DATE "Apr 27th 2003"
438 438
439#define OPTION_STRING "cfvdt123456789CF" 439#define OPTION_STRING "cfvqdt123456789CF"
440 440
441enum { 441enum {
442 OPT_STDOUT = (1 << 0), 442 OPT_STDOUT = (1 << 0),
443 OPT_FORCE = (1 << 1), 443 OPT_FORCE = (1 << 1),
444 OPT_VERBOSE = (1 << 2), 444 OPT_VERBOSE = (1 << 2),
445 OPT_DECOMPRESS = (1 << 3), 445 OPT_QUIET = (1 << 3),
446 OPT_TEST = (1 << 4), 446 OPT_DECOMPRESS = (1 << 4),
447 OPT_1 = (1 << 5), 447 OPT_TEST = (1 << 5),
448 OPT_2 = (1 << 6), 448 OPT_1 = (1 << 6),
449 OPT_3 = (1 << 7), 449 OPT_2 = (1 << 7),
450 OPT_4 = (1 << 8), 450 OPT_3 = (1 << 8),
451 OPT_5 = (1 << 9), 451 OPT_4 = (1 << 9),
452 OPT_6 = (1 << 10), 452 OPT_5 = (1 << 10),
453 OPT_789 = (7 << 11), 453 OPT_6 = (1 << 11),
454 OPT_7 = (1 << 11), 454 OPT_789 = (7 << 12),
455 OPT_8 = (1 << 12), 455 OPT_7 = (1 << 13),
456 OPT_C = (1 << 14), 456 OPT_8 = (1 << 14),
457 OPT_F = (1 << 15), 457 OPT_C = (1 << 15),
458 OPT_F = (1 << 16),
458}; 459};
459 460
460/**********************************************************************/ 461/**********************************************************************/
@@ -1093,7 +1094,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
1093 if (applet_name[4] == 'c') 1094 if (applet_name[4] == 'c')
1094 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS); 1095 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
1095 /* unlzop? */ 1096 /* unlzop? */
1096 if (applet_name[0] == 'u') 1097 if (applet_name[4] == 'o')
1097 option_mask32 |= OPT_DECOMPRESS; 1098 option_mask32 |= OPT_DECOMPRESS;
1098 1099
1099 global_crc32_table = crc32_filltable(NULL, 0); 1100 global_crc32_table = crc32_filltable(NULL, 0);