summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2019-09-26 01:42:09 +0000
committerMartin Matuska <mm@FreeBSD.org>2019-09-26 01:42:09 +0000
commita297901e6c90d415ac49c88002dd4e02dc49e32b (patch)
treed717949fae352e99fdd30d0cee7a2f09cbe11595 /contrib
parent085fce401bac81381be296026985e704e94a99e2 (diff)
downloadsrc-test-a297901e6c90d415ac49c88002dd4e02dc49e32b.tar.gz
src-test-a297901e6c90d415ac49c88002dd4e02dc49e32b.zip
Update vendor/libarchive/dist to git 2f3033ca23f8c21160506c3c7ac8a0df0d3fde42
Relevant vendor changes: Issue #1237: Fix integer overflow in archive_read_support_filter_lz4.c PR #1249: Correct some typographical and grammatical errors. PR #1250: Minor corrections to the formatting of manual pages
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=352731
Diffstat (limited to 'contrib')
-rw-r--r--contrib/shar/shar.111
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/shar/shar.1 b/contrib/shar/shar.1
index e3152f299ebe3..31561978f05c8 100644
--- a/contrib/shar/shar.1
+++ b/contrib/shar/shar.1
@@ -61,7 +61,8 @@ or
The following options are available:
.Bl -tag -width indent
.It Fl b
-Use an alternative binary format. Content of files will be uuencoded.
+Use an alternative binary format.
+Content of files will be uuencoded.
This option should be used to archive binary files correctly.
In this mode also file permissions will be stored to the archive.
uudecode(1) is needed to extract archives created with this option.
@@ -72,8 +73,8 @@ Redirect output to
If
.Ar file
given on command line is a directory the entire subtree will be archived.
-Symbolic links given on command line are followed. Other symbolic links will
-be archived as such.
+Symbolic links given on command line are followed.
+Other symbolic links will be archived as such.
.El
.Sh EXAMPLES
To create a shell archive of the program
@@ -111,7 +112,9 @@ The
command makes no provisions for hard links.
.Pp
Files containing magic characters or files without a newline ('\\n') as the
-last character are not handled correctly with the default format. Use the -b
+last character are not handled correctly with the default format.
+Use the
+.Fl b
option for binary files.
.Pp
It is easy to insert trojan horses into