[src/netbsd-7]: src/usr.bin/gzip Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/b69dc4e8e5ec
branches:  netbsd-7
changeset: 799479:b69dc4e8e5ec
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Jul 17 03:37:40 2015 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #870):
        usr.bin/gzip/zgrep: revision 1.9
zgrep(1): suppress the prefixing of filename on output when only
one file is specified to match the grep(1)'s output.

diffstat:

 usr.bin/gzip/zgrep |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 73ee02a37c01 -r b69dc4e8e5ec usr.bin/gzip/zgrep
--- a/usr.bin/gzip/zgrep        Fri Jul 17 03:34:01 2015 +0000
+++ b/usr.bin/gzip/zgrep        Fri Jul 17 03:37:40 2015 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: zgrep,v 1.8 2013/07/25 12:25:23 pgoyette Exp $
+# $NetBSD: zgrep,v 1.8.4.1 2015/07/17 03:37:40 snj Exp $
 #
 # Copyright (c) 2003 Thomas Klausner.
 #
@@ -113,7 +113,7 @@
     ${zcat} -fq - | ${grep} ${grep_args} -- "${pattern}" -
 else
     # ... on all files given on the command line
-    if [ ${silent} -lt 1 ]; then
+    if [ ${silent} -lt 1 -a $# -gt 1 ]; then
        grep_args="-H ${grep_args}"
     fi
     while [ $# -gt 0 ]