From 2c4acdabdc85b86e957f753e10d12ddb9cc5dcde Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 2 Jun 2016 17:05:50 +0200 Subject: [PATCH] Changed command name to `--check` , `-C`, following `xz` convention --- programs/zstd.1 | 9 ++++++++- programs/zstdcli.c | 9 ++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/zstd.1 b/programs/zstd.1 index 1bab57ab..cc62eb30 100644 --- a/programs/zstd.1 +++ b/programs/zstd.1 @@ -52,7 +52,7 @@ It also features a very fast decoder, with speed > 500 MB/s per core. use `file` as Dictionary to compress or decompress FILE(s) .TP .B \-o file - save result into `file` (only possible with a single input FILE) + save result into `file` (only possible with a single INPUT-FILE) .TP .BR \-f ", " --force overwrite output without prompting @@ -71,6 +71,13 @@ It also features a very fast decoder, with speed > 500 MB/s per core. .TP .BR \-c ", " --stdout force write to standard output, even if it is the console +.TP +.BR \-C ", " --check + add integrity check computed from uncompressed data +.TP +.BR \-t ", " --test + Test the integrity of compressed files. This option is equivalent to \fB--decompress --stdout > /dev/null\fR. + No files are created or removed. .SH DICTIONARY .PP diff --git a/programs/zstdcli.c b/programs/zstdcli.c index f31b6e1f..df7a3320 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -134,10 +134,10 @@ static int usage_advanced(const char* programName) #ifndef ZSTD_NOCOMPRESS DISPLAY( "--ultra : enable ultra modes (requires more memory to decompress)\n"); DISPLAY( "--no-dictID:don't write dictID into header (dictionary compression)\n"); - DISPLAY( "--checksum:compute checksum of content, for decompressor validation\n"); + DISPLAY( "--check : enable integrity check\n"); #endif #ifndef ZSTD_NODECOMPRESS - DISPLAY( " -t : test compressed file integrity \n"); + DISPLAY( "--test : test compressed file integrity \n"); DISPLAY( "--[no-]sparse : sparse mode (default:enabled on file, disabled on stdout)\n"); #endif #ifndef ZSTD_NODICT @@ -241,7 +241,7 @@ int main(int argCount, const char** argv) if (!strcmp(argument, "--quiet")) { displayLevel--; continue; } if (!strcmp(argument, "--stdout")) { forceStdout=1; outFileName=stdoutmark; displayLevel=1; continue; } if (!strcmp(argument, "--ultra")) { FIO_setMaxWLog(0); continue; } - if (!strcmp(argument, "--checksum")) { FIO_setChecksumFlag(2); continue; } + if (!strcmp(argument, "--check")) { FIO_setChecksumFlag(2); continue; } if (!strcmp(argument, "--no-dictID")) { FIO_setDictIDFlag(0); continue; } if (!strcmp(argument, "--sparse")) { FIO_setSparseWrite(2); continue; } if (!strcmp(argument, "--no-sparse")) { FIO_setSparseWrite(0); continue; } @@ -305,6 +305,9 @@ int main(int argCount, const char** argv) /* keep source file (default anyway, so useless; for gzip/xz compatibility) */ case 'k': argument++; break; + /* Checksum */ + case 'C': argument++; FIO_setChecksumFlag(2); break; + /* test compressed file */ case 't': decode=1; outFileName=nulmark; argument++; break;