1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00

Remove --force from xzdec.

It was ignored for compatibility with xz, but now that
--decompress --stdout --force copies unrecognized files
as is to stdout, simply ignoring --force in xzdec would
be wrong. xzdec will not support copying unrecognized
data as is to stdout, so it cannot support --force.
This commit is contained in:
Lasse Collin 2009-07-08 22:50:16 +03:00
parent 5f16ef4abf
commit 3bdb53792c
2 changed files with 1 additions and 9 deletions

View file

@ -70,11 +70,6 @@ compatibility.
.B xzdec .B xzdec
never creates or removes any files. never creates or removes any files.
.TP .TP
.BR \-f ", " \-\-force
Ignored for
.BR xz (1)
compatibility.
.TP
.BR \-c ", " \-\-stdout ", " \-\-to-stdout .BR \-c ", " \-\-stdout ", " \-\-to-stdout
Ignored for Ignored for
.BR xz (1) .BR xz (1)

View file

@ -95,7 +95,6 @@ help(void)
" -c, --stdout (ignored)\n" " -c, --stdout (ignored)\n"
" -d, --decompress (ignored)\n" " -d, --decompress (ignored)\n"
" -k, --keep (ignored)\n" " -k, --keep (ignored)\n"
" -f, --force (ignored)\n"
" -M, --memory=NUM use NUM bytes of memory at maximum (0 means default)\n" " -M, --memory=NUM use NUM bytes of memory at maximum (0 means default)\n"
" -q, --quiet specify *twice* to suppress errors\n" " -q, --quiet specify *twice* to suppress errors\n"
" -Q, --no-warn (ignored)\n" " -Q, --no-warn (ignored)\n"
@ -233,13 +232,12 @@ str_to_uint64(const char *value, uint64_t max)
static void static void
parse_options(int argc, char **argv) parse_options(int argc, char **argv)
{ {
static const char short_opts[] = "cdkfM:hqQV"; static const char short_opts[] = "cdkM:hqQV";
static const struct option long_opts[] = { static const struct option long_opts[] = {
{ "stdout", no_argument, NULL, 'c' }, { "stdout", no_argument, NULL, 'c' },
{ "to-stdout", no_argument, NULL, 'c' }, { "to-stdout", no_argument, NULL, 'c' },
{ "decompress", no_argument, NULL, 'd' }, { "decompress", no_argument, NULL, 'd' },
{ "uncompress", no_argument, NULL, 'd' }, { "uncompress", no_argument, NULL, 'd' },
{ "force", no_argument, NULL, 'f' },
{ "keep", no_argument, NULL, 'k' }, { "keep", no_argument, NULL, 'k' },
{ "memory", required_argument, NULL, 'M' }, { "memory", required_argument, NULL, 'M' },
{ "quiet", no_argument, NULL, 'q' }, { "quiet", no_argument, NULL, 'q' },
@ -256,7 +254,6 @@ parse_options(int argc, char **argv)
switch (c) { switch (c) {
case 'c': case 'c':
case 'd': case 'd':
case 'f':
case 'k': case 'k':
case 'Q': case 'Q':
break; break;