Module Name: src
Committed By: joerg
Date: Thu Feb 18 15:51:57 UTC 2010
Modified Files:
src/usr.bin/unzip: unzip.c
Log Message:
Only print the "Archive: xxx" header if not in extract-to-stdout mode.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/unzip/unzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/unzip/unzip.c
diff -u src/usr.bin/unzip/unzip.c:1.11 src/usr.bin/unzip/unzip.c:1.12
--- src/usr.bin/unzip/unzip.c:1.11 Sat Jan 9 09:27:42 2010
+++ src/usr.bin/unzip/unzip.c Thu Feb 18 15:51:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.11 2010/01/09 09:27:42 mbalmer Exp $ */
+/* $NetBSD: unzip.c,v 1.12 2010/02/18 15:51:57 joerg Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <[email protected]>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: unzip.c,v 1.11 2010/01/09 09:27:42 mbalmer Exp $");
+__RCSID("$NetBSD: unzip.c,v 1.12 2010/02/18 15:51:57 joerg Exp $");
#include <sys/queue.h>
#include <sys/stat.h>
@@ -865,7 +865,7 @@
ac(archive_read_support_format_zip(a));
ac(archive_read_open_fd(a, fd, 8192));
- if (!q_opt)
+ if (!q_opt && !p_opt)
printf("Archive: %s\n", fn);
if (v_opt == 1) {
