Module Name: src Committed By: sjg Date: Wed Aug 25 21:36:03 UTC 2010
Modified Files: src/bin/pax: options.c Log Message: Do not throw a usage message for -i followed by -t since 'cpio -itv' is a valid command. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/bin/pax/options.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/bin/pax/options.c diff -u src/bin/pax/options.c:1.107 src/bin/pax/options.c:1.108 --- src/bin/pax/options.c:1.107 Sat Jun 19 00:43:57 2010 +++ src/bin/pax/options.c Wed Aug 25 21:36:02 2010 @@ -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