Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/bin/pax Use Fl Fl for long options.
details: https://anonhg.NetBSD.org/src/rev/bd17c12737e5
branches: trunk
changeset: 766242:bd17c12737e5
user: wiz <wiz%NetBSD.org@localhost>
date: Sun Jun 19 07:34:24 2011 +0000
description:
Use Fl Fl for long options.
diffstat:
bin/pax/cpio.1 | 58 ++++++++++++++++++++++++------------------------
bin/pax/pax.1 | 10 ++++----
bin/pax/tar.1 | 68 +++++++++++++++++++++++++++++-----------------------------
3 files changed, 68 insertions(+), 68 deletions(-)
diffs (truncated from 394 to 300 lines):
diff -r 6e55d1f03a5d -r bd17c12737e5 bin/pax/cpio.1
--- a/bin/pax/cpio.1 Sun Jun 19 07:17:18 2011 +0000
+++ b/bin/pax/cpio.1 Sun Jun 19 07:34:24 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpio.1,v 1.12 2011/06/19 00:55:09 christos Exp $
+.\" $NetBSD: cpio.1,v 1.13 2011/06/19 07:34:24 wiz Exp $
.\"
.\" Copyright (c) 1997 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\"
.\" OpenBSD: cpio.1,v 1.14 2000/11/10 17:52:02 aaron Exp
.\"
-.Dd April 23, 2007
+.Dd June 18, 2011
.Dt CPIO 1
.Os
.Sh NAME
@@ -69,16 +69,16 @@
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl o , -create
+.It Fl o , Fl Fl create
Create an archive.
Reads the list of files to store in the
archive from standard input, and writes the archive on standard
output.
.Bl -tag -width Ds
-.It Fl a , -reset-access-time
+.It Fl a , Fl Fl reset-access-time
Reset the access times on files that have been copied to the
archive.
-.It Fl A , -append
+.It Fl A , Fl Fl append
Append to the specified archive.
.It Fl B
Set block size of output to 5120 bytes.
@@ -119,11 +119,7 @@
.It Fl v
Be verbose about operations.
List filenames as they are written to the archive.
-.It Fl z
-Compress/decompress archive using
-.Xr gzip 1
-format.
-.It Fl -xz
+.It Fl Fl xz
Compress/decompress archive using
.Xr xz 1
format.
@@ -131,8 +127,12 @@
Compress archive using
.Xr compress 1
format.
+.It Fl z
+Compress/decompress archive using
+.Xr gzip 1
+format.
.El
-.It Fl i , -extract
+.It Fl i , Fl Fl extract
Restore files from an archive.
Reads the archive file from
standard input and extracts files matching the
@@ -150,20 +150,20 @@
.It Fl C Ar bytes
Read archive written with a block size of
.Ar bytes .
-.It Fl d , -make-directories
+.It Fl d , Fl Fl make-directories
Create any intermediate directories as needed during
restore.
-.It Fl E Ar file , Fl -pattern-file Ar file
+.It Fl E Ar file , Fl Fl pattern-file Ar file
Read list of file name patterns to extract or list from
.Ar file .
-.It Fl f , -nonmatching
+.It Fl f , Fl Fl nonmatching
Restore all files except those matching the
.Ar patterns
given on the command line.
-.It Fl F Ar archive , Fl -file Ar archive
+.It Fl F Ar archive , Fl Fl file Ar archive
.It Fl I Ar archive
Use the specified file as the input for the archive.
-.It Fl H Ar format , Fl -format Ar format
+.It Fl H Ar format , Fl Fl format Ar format
Read an archive of the specified format.
Recognized formats are:
.Pp
@@ -187,19 +187,19 @@
.El
.It Fl m
Restore modification times on files.
-.It Fl r , -rename
+.It Fl r , Fl Fl rename
Rename restored files interactively.
.It Fl s
Swap bytes after reading data from the archive.
-.It Fl S , -swap-halfwords
+.It Fl S , Fl Fl swap-halfwords
Swap words after reading data from the archive.
-.It Fl t , -list
+.It Fl t , Fl Fl list
Only list the contents of the archive, no files or
directories will be created.
-.It Fl u , -unconditional
+.It Fl u , Fl Fl unconditional
Overwrite files even when the file in the archive is
older than the one that will be overwritten.
-.It Fl v , -verbose
+.It Fl v , Fl Fl verbose
Be verbose about operations.
List filenames as they are copied in from the archive.
.It Fl z
@@ -215,7 +215,7 @@
.Nm
format archives.
.El
-.It Fl p , -pass-through
+.It Fl p , Fl Fl pass-through
Copy files from one location to another in a single pass.
The list of files to copy are read from standard input and
written out to a directory relative to the specified
@@ -227,24 +227,24 @@
.It Fl d
Create any intermediate directories as needed to write
the files at the new location.
-.It Fl l , -link
+.It Fl l , Fl Fl link
When possible, link files rather than creating an
extra copy.
-.It Fl L , -dereference
+.It Fl L , Fl Fl dereference
Follow symbolic links.
-.It Fl m , -preserve-modification-time
+.It Fl m , Fl Fl preserve-modification-time
Restore modification times on files.
-.It Fl u , -unconditional
+.It Fl u , Fl Fl unconditional
Overwrite files even when the original file being copied is
older than the one that will be overwritten.
-.It Fl v , -verbose
+.It Fl v , Fl Fl verbose
Be verbose about operations.
List filenames as they are copied.
-.It Fl -force-local
+.It Fl Fl force-local
Do not interpret filenames that contain a
.Sq \&:
as remote files.
-.It Fl -insecure
+.It Fl Fl insecure
Normally
.Nm
ignores filenames that contain
diff -r 6e55d1f03a5d -r bd17c12737e5 bin/pax/pax.1
--- a/bin/pax/pax.1 Sun Jun 19 07:17:18 2011 +0000
+++ b/bin/pax/pax.1 Sun Jun 19 07:34:24 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pax.1,v 1.60 2011/06/19 00:55:09 christos Exp $
+.\" $NetBSD: pax.1,v 1.61 2011/06/19 07:34:24 wiz Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
.\" Copyright (c) 1992, 1993
@@ -740,14 +740,14 @@
The individual archive formats may impose additional restrictions on use.
Typical archive format restrictions include (but are not limited to):
file pathname length, file size, link pathname length and the type of the file.
+.It Fl Fl xz
+Use
+.Xr xz 1
+compression, when reading or writing archive files.
.It Fl z
Use
.Xr gzip 1
compression, when reading or writing archive files.
-.It Fl -xz
-Use
-.Xr xz 1
-compression, when reading or writing archive files.
.It Fl A
Do not strip leading `/'s from file names.
.It Fl B Ar bytes
diff -r 6e55d1f03a5d -r bd17c12737e5 bin/pax/tar.1
--- a/bin/pax/tar.1 Sun Jun 19 07:17:18 2011 +0000
+++ b/bin/pax/tar.1 Sun Jun 19 07:34:24 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: tar.1,v 1.31 2011/06/19 00:55:09 christos Exp $
+.\" $NetBSD: tar.1,v 1.32 2011/06/19 07:34:24 wiz Exp $
.\"
.\" Copyright (c) 1996 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -55,21 +55,21 @@
.Pp
One of the following flags must be present:
.Bl -tag -width Ar
-.It Fl c , -create
+.It Fl c , Fl Fl create
Create new archive, or overwrite an existing archive,
adding the specified files to it.
-.It Fl r , -append
+.It Fl r , Fl Fl append
Append the named new files to existing archive.
Note that this will only work on media on which an end-of-file mark
can be overwritten.
-.It Fl t , -list
+.It Fl t , Fl Fl list
List contents of archive.
If any files are named on the
command line, only those files will be listed.
-.It Fl u , -update
+.It Fl u , Fl Fl update
Alias for
.Fl r .
-.It Fl x , -extract , -get
+.It Fl x , Fl Fl extract , Fl Fl get
Extract files from archive.
If any files are named on the
command line, only those files will be extracted from the
@@ -86,7 +86,7 @@
In addition to the flags mentioned above, any of the following
flags may be used:
.Bl -tag -width Ar
-.It Fl b Ar "blocking factor" , Fl -block-size Ar "blocking factor"
+.It Fl b Ar "blocking factor" , Fl Fl block-size Ar "blocking factor"
Set blocking factor to use for the archive.
.Nm
uses 512 byte blocks.
@@ -96,7 +96,7 @@
standard and will not be portable to all systems.
.It Fl e
Stop after first error.
-.It Fl f Ar archive , Fl -file Ar archive
+.It Fl f Ar archive , Fl Fl file Ar archive
Filename where the archive is stored.
Defaults to
.Pa /dev/rst0 .
@@ -104,32 +104,32 @@
.Ar [[user@]host:]file
then the archive will be processed using
.Xr rmt 8 .
-.It Fl h , -dereference
+.It Fl h , Fl Fl dereference
Follow symbolic links as if they were normal files
or directories.
-.It Fl j, -bzip2, -bunzip2
+.It Fl j, Fl Fl bzip2, Fl Fl bunzip2
Use
.Xr bzip2 1
for compression of the archive.
This option is a GNU extension.
-.It Fl k , -keep-old-files
+.It Fl k , Fl Fl keep-old-files
Keep existing files; don't overwrite them from archive.
-.It Fl l , -one-file-system
+.It Fl l , Fl Fl one-file-system
Do not descend across mount points.
.\" should be '-X'
-.It Fl m , -modification-time
+.It Fl m , Fl Fl modification-time
Do not preserve modification time.
.It Fl O
When creating and appending to an archive, write old-style (non-POSIX) archives.
When extracting from an archive, extract to standard output.
-.It Fl o , -portability , -old-archive
+.It Fl o , Fl Fl portability , Fl Fl old-archive
Don't write directory information that the older (V7) style
.Nm
is unable to decode.
This implies the
.Fl O
flag.
-.It Fl p , -preserve-permissions , -preserve
+.It Fl p , Fl Fl preserve-permissions , Fl Fl preserve
Preserve user and group ID as well as file mode regardless of
the current
.Xr umask 2 .
@@ -138,7 +138,7 @@
Only meaningful in conjunction with the
.Fl x
flag.
-.It Fl q , -fast-read
+.It Fl q , Fl Fl fast-read
Select the first archive member that matches each
.Ar pattern
operand.
@@ -146,7 +146,7 @@
.Ar pattern .
When members of type directory are matched, the file hierarchy rooted at that
directory is also matched.
-.It Fl S , -sparse
+.It Fl S , Fl Fl sparse
This flag has no effect as
.Nm
always generates sparse files.
@@ -203,21 +203,21 @@
prevents the substitutions from being performed on symbolic link destinations.
.It Fl v
Home |
Main Index |
Thread Index |
Old Index