aboutsummaryrefslogtreecommitdiff
path: root/src/xz/xz.1
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2020-02-06 07:45:07 +0000
committerXin LI <delphij@FreeBSD.org>2020-02-06 07:45:07 +0000
commit9657691eff9c78f404f3f9d5907240d267893826 (patch)
tree624fe09d8d878d15f2ea5f01b555f32ef74c14ec /src/xz/xz.1
parent20fabbfb3d6c183f1a77c820da48c340fbd36f1b (diff)
downloadsrc-9657691eff9c78f404f3f9d5907240d267893826.tar.gz
src-9657691eff9c78f404f3f9d5907240d267893826.zip
Apply a reduced version of upstream 353970510895f6a80adfe60cf71b70a95adfa8bc
which implements memory limit in xz(1) when running in 32-bit mode. The change is applied directly in vendor area to ease future import.
Notes
Notes: svn path=/vendor/xz/dist/; revision=357608
Diffstat (limited to 'src/xz/xz.1')
-rw-r--r--src/xz/xz.119
1 files changed, 19 insertions, 0 deletions
diff --git a/src/xz/xz.1 b/src/xz/xz.1
index 9dffdc6f82be..a4aaa0027ecb 100644
--- a/src/xz/xz.1
+++ b/src/xz/xz.1
@@ -1005,6 +1005,25 @@ instead of
until the details have been decided.
.RE
.IP ""
+For 32-bit
+.BR xz
+there is a special case: if the
+.I limit
+would be over
+.BR "4020\ MiB" ,
+the
+.I limit
+is set to
+.BR "4020\ MiB" .
+(The values
+.B 0
+and
+.B max
+aren't affected by this.
+A similar feature doesn't exist for decompression.)
+This can be helpful when a 32-bit executable has access
+to 4\ GiB address space while hopefully doing no harm in other situations.
+.IP ""
See also the section
.BR "Memory usage" .
.TP