aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-07-08 22:50:16 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-07-08 22:50:16 +0300
commit3bdb53792c0e3e3febe9370e56eda5b08f89410f (patch)
tree202cda092bc195d8605f1a2166c80f6017574bef /src
parentUse sed instead of $(SED) so that we don't need to (diff)
downloadxz-3bdb53792c0e3e3febe9370e56eda5b08f89410f.tar.xz
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.
Diffstat (limited to 'src')
-rw-r--r--src/xzdec/xzdec.15
-rw-r--r--src/xzdec/xzdec.c5
2 files changed, 1 insertions, 9 deletions
diff --git a/src/xzdec/xzdec.1 b/src/xzdec/xzdec.1
index facfadea..442a19ec 100644
--- a/src/xzdec/xzdec.1
+++ b/src/xzdec/xzdec.1
@@ -70,11 +70,6 @@ compatibility.
.B xzdec
never creates or removes any files.
.TP
-.BR \-f ", " \-\-force
-Ignored for
-.BR xz (1)
-compatibility.
-.TP
.BR \-c ", " \-\-stdout ", " \-\-to-stdout
Ignored for
.BR xz (1)
diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c
index 33a7004c..4827fc60 100644
--- a/src/xzdec/xzdec.c
+++ b/src/xzdec/xzdec.c
@@ -95,7 +95,6 @@ help(void)
" -c, --stdout (ignored)\n"
" -d, --decompress (ignored)\n"
" -k, --keep (ignored)\n"
-" -f, --force (ignored)\n"
" -M, --memory=NUM use NUM bytes of memory at maximum (0 means default)\n"
" -q, --quiet specify *twice* to suppress errors\n"
" -Q, --no-warn (ignored)\n"
@@ -233,13 +232,12 @@ str_to_uint64(const char *value, uint64_t max)
static void
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[] = {
{ "stdout", no_argument, NULL, 'c' },
{ "to-stdout", no_argument, NULL, 'c' },
{ "decompress", no_argument, NULL, 'd' },
{ "uncompress", no_argument, NULL, 'd' },
- { "force", no_argument, NULL, 'f' },
{ "keep", no_argument, NULL, 'k' },
{ "memory", required_argument, NULL, 'M' },
{ "quiet", no_argument, NULL, 'q' },
@@ -256,7 +254,6 @@ parse_options(int argc, char **argv)
switch (c) {
case 'c':
case 'd':
- case 'f':
case 'k':
case 'Q':
break;