Module Name: othersrc
Committed By: wiz
Date: Mon Jun 20 15:09:18 UTC 2011
Modified Files:
othersrc/external/bsd/mat/dist: mat.1
Log Message:
Reinstate my changes which got lost in mattar conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/mat/dist/mat.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/mat/dist/mat.1
diff -u othersrc/external/bsd/mat/dist/mat.1:1.3 othersrc/external/bsd/mat/dist/mat.1:1.4
--- othersrc/external/bsd/mat/dist/mat.1:1.3 Mon Jun 20 14:58:53 2011
+++ othersrc/external/bsd/mat/dist/mat.1 Mon Jun 20 15:09:18 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: mat.1,v 1.3 2011/06/20 14:58:53 agc Exp $
+.\" $NetBSD: mat.1,v 1.4 2011/06/20 15:09:18 wiz Exp $
.\"
.\" Copyright (c) 2011 Alistair Crooks <[email protected]>
.\" All rights reserved.
@@ -31,10 +31,10 @@
.Nd minimalist archive tool program
.Sh SYNOPSIS
.Nm
-.Op Fl Vcptvx
+.Op Fl cptVvx
.Op Fl C Ar directory
-.Op Fl T Ar template
.Op Fl f Ar archive
+.Op Fl T Ar template
.Op Ar file ...
.Sh DESCRIPTION
The
@@ -56,15 +56,8 @@
perform an initial
.Xr chdir 2
into the specified directory before attempting to resolve any filenames.
-.It Fl T Ar template
-takes the names of the entries to be included in the archive
-from the template file provided.
-This template file is expected to be in the
-.Dv METALOG
-format, as generated during the
-.Nx
-.Dv build.sh
-phase.
+.It Fl c
+create the archive
.It Fl f Ar archive
Use the
.Xr libmat 3
@@ -76,12 +69,6 @@
or will be read from
.Dv stdin
depending on the action specified.
-.It Fl V
-verify the archive does not contain dangerous
-entries which could compromise a machine if the archive
-is extracted or listed.
-.It Fl c
-create the archive
.It Fl p
when extracting the components of the archive,
preserve the file owner and group information,
@@ -89,17 +76,32 @@
Setuid and setgid bits are only preserved
if the program is run with an effective
uid of 0.
+.It Fl T Ar template
+takes the names of the entries to be included in the archive
+from the template file provided.
+This template file is expected to be in the
+.Dv METALOG
+format, as generated during the
+.Nx
+.Dv build.sh
+phase.
.It Fl t
list the contents of the archive on stdout.
+.It Fl V
+verify the archive does not contain dangerous
+entries which could compromise a machine if the archive
+is extracted or listed.
.It Fl v
perform operations in a verbose manner.
-This option can be repeated to provide higher
+This option can be repeated to provide higher
levels of verbosity.
For instance, when listing entries,
a verbosity level of 2 will also show
the
.Xr SHA256 3
digests associated with the archive component.
+.It Fl x
+extract the contents of the archive.
.El
.Pp
.Nm
@@ -111,7 +113,7 @@
but without some of the constraints and limits
inherent in those archivers.
In addition,
-digests are used to make sure that the
+digests are used to make sure that the
contents of the archive remain the same as when the archive was made.
To protect against malicious archives, a sanity
check,
