[src/trunk]: src/bin/pax Do not throw a usage message for -i followed by -t

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf7c4054f96f
branches:  trunk
changeset: 757342:bf7c4054f96f
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Aug 25 21:36:02 2010 +0000

description:
Do not throw a usage message for -i followed by -t
since 'cpio -itv' is a valid command.

diffstat:

 bin/pax/options.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r affb9e30ee8a -r bf7c4054f96f bin/pax/options.c
--- a/bin/pax/options.c Wed Aug 25 20:16:48 2010 +0000
+++ b/bin/pax/options.c Wed Aug 25 21:36:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $   */
+/*     $NetBSD: options.c,v 1.108 2010/08/25 21:36:02 sjg Exp $        */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.108 2010/08/25 21:36:02 sjg Exp $");
 #endif
 #endif /* not lint */
 
@@ -1462,6 +1462,8 @@
 {
        if ((act == APPND && op == ARCHIVE) || (act == ARCHIVE && op == APPND))
                act = APPND;
+       else if (act == EXTRACT && op == LIST)
+               act = op;
        else if (act != ERROR && act != op)
                cpio_usage();
        else