summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/pax/options.c8
-rw-r--r--bin/pax/tar.115
2 files changed, 17 insertions, 6 deletions
diff --git a/bin/pax/options.c b/bin/pax/options.c
index eccfd4dbe91..13036656dd1 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.18 1997/04/02 17:48:53 millert Exp $ */
+/* $OpenBSD: options.c,v 1.19 1997/04/04 20:54:50 millert Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: options.c,v 1.18 1997/04/02 17:48:53 millert Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.19 1997/04/04 20:54:50 millert Exp $";
#endif
#endif /* not lint */
@@ -782,6 +782,10 @@ tar_options(argc, argv)
argc -= optind;
argv += optind;
+ /* Traditional tar behaviour (pax wants to read filelist from stdin) */
+ if (argc == 0)
+ exit(0);
+
/*
* if we are writing (ARCHIVE) specify tar, otherwise run like pax
*/
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index 5523f4efbb4..891d740063f 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: tar.1,v 1.6 1997/03/26 01:20:45 millert Exp $
+.\" $OpenBSD: tar.1,v 1.7 1997/04/04 20:54:52 millert Exp $
.\"
.Dd June 11, 1996
.Dt TAR 1
@@ -98,10 +98,14 @@ or directories.
.It Fl m
Do not preserve modification time.
.It Fl o
-Do not create directories.
+Don't write directory information that the older (V7) style
+.Nm tar
+is enable to decode.
.It Fl p
Preserve user id, group id, file mode, access and modification
-times.
+times if possible. The user id and group id will only bet set
+if the user is the superuser (unless these values correspond
+to the user's user and group ids).
.It Fl s Ar replstr
Modify the file or archive member names specified by the
.Ar pattern
@@ -150,7 +154,10 @@ are not selected and will be skipped.
.It Fl v
Verbose operation mode.
.It Fl w
-Interactively rename files.
+Interactively rename files. This option causes
+.Nm tar
+to prompt the user for the filename to use when storing or
+extracting files in an archive.
.It Fl z
Compress archive using gzip.
.It Fl C Ar directory