ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into compressionFlow

Browse Source
This commit is contained in:
Yann Collet
2017-04-18 03:18:34 -07:00
parent af4f45b682 1c286950af
commit 291f0cb54a
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/Makefile
+1 -1
View File
@@ -136,7 +136,7 @@ zstd-nogz : LZMA_MSG := $(NO_LZMA_MSG)
xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP) xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP)
xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD) xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD)
zstd zstd-nogz xzstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) zstd zstd-nogz xzstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
zstd zstd-nogz xzstd : $(ZSTDLIB_OBJ) zstdcli.o fileio.o bench.o datagen.o dibio.o zstd zstd-nogz xzstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
@echo "$(THREAD_MSG)" @echo "$(THREAD_MSG)"
@echo "$(ZLIB_MSG)" @echo "$(ZLIB_MSG)"
@echo "$(LZMA_MSG)" @echo "$(LZMA_MSG)"
programs/zstd.1
+5 -2
View File
@@ -2,12 +2,15 @@
.TH "ZSTD" "1" "April 2017" "zstd 1.1.5" "User Commands" .TH "ZSTD" "1" "April 2017" "zstd 1.1.5" "User Commands"
. .
.SH "NAME" .SH "NAME"
\fBzstd\fR \- zstd, unzstd, zstdcat \- Compress or decompress \.zst files \fBzstd\fR \- zstd, zstdmt, unzstd, zstdcat \- Compress or decompress \.zst files
. .
.SH "SYNOPSIS" .SH "SYNOPSIS"
\fBzstd\fR [\fIOPTIONS\fR] [\-|<INPUT\-FILE>] [\-o <OUTPUT\-FILE>] \fBzstd\fR [\fIOPTIONS\fR] [\-|<INPUT\-FILE>] [\-o <OUTPUT\-FILE>]
. .
.P .P
\fBzstdmt\fR is equivalent to \fBzstd \-T0\fR
.
.P
\fBunzstd\fR is equivalent to \fBzstd \-d\fR \fBunzstd\fR is equivalent to \fBzstd \-d\fR
. .
.P .P
@@ -98,7 +101,7 @@ unlocks high compression levels 20+ (maximum 22), using a lot more memory\. Note
. .
.TP .TP
\fB\-T#\fR \fB\-T#\fR
Compress using # threads (default: 1)\. This modifier is only available if \fBzstd\fR was compiled with multithreading support\. Compress using # threads (default: 1)\. If \fB#\fR is 0, attempt to detect the number of physical CPU cores and compress with that many threads\. This modified does nothing if \fBzstd\fR was compiled without multithread support\.
. .
.TP .TP
\fB\-D file\fR \fB\-D file\fR
programs/zstd.1.md
+7 -3
View File
@@ -1,11 +1,13 @@
zstd(1) -- zstd, unzstd, zstdcat - Compress or decompress .zst files zstd(1) -- zstd, zstdmt, unzstd, zstdcat - Compress or decompress .zst files
==================================================================== ============================================================================
SYNOPSIS SYNOPSIS
-------- --------
`zstd` [*OPTIONS*] [-|&lt;INPUT-FILE&gt;] [-o &lt;OUTPUT-FILE&gt;] `zstd` [*OPTIONS*] [-|&lt;INPUT-FILE&gt;] [-o &lt;OUTPUT-FILE&gt;]
`zstdmt` is equivalent to `zstd -T0`
`unzstd` is equivalent to `zstd -d` `unzstd` is equivalent to `zstd -d`
`zstdcat` is equivalent to `zstd -dcf` `zstdcat` is equivalent to `zstd -dcf`
@@ -101,7 +103,9 @@ the last one takes effect.
Note that decompression will also require more memory when using these levels. Note that decompression will also require more memory when using these levels.
* `-T#`: * `-T#`:
Compress using # threads (default: 1). Compress using # threads (default: 1).
This modifier is only available if `zstd` was compiled with multithreading support. If `#` is 0, attempt to detect the number of physical CPU cores and compress with
that many threads.
This modified does nothing if `zstd` was compiled without multithread support.
* `-D file`: * `-D file`:
use `file` as Dictionary to compress or decompress FILE(s) use `file` as Dictionary to compress or decompress FILE(s)
* `--nodictID`: * `--nodictID`: