From owner-svn-src-stable@FreeBSD.ORG  Thu Oct  7 00:30:30 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47C44106566B;
	Thu,  7 Oct 2010 00:30:30 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 36E728FC19;
	Thu,  7 Oct 2010 00:30:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o970UUfl023055;
	Thu, 7 Oct 2010 00:30:30 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o970UUJA023053;
	Thu, 7 Oct 2010 00:30:30 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201010070030.o970UUJA023053@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 7 Oct 2010 00:30:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213504 - stable/7/usr.bin/gzip
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Oct 2010 00:30:30 -0000

Author: delphij
Date: Thu Oct  7 00:30:29 2010
New Revision: 213504
URL: http://svn.freebsd.org/changeset/base/213504

Log:
  MFC r210344:
  
  In the past gunzip(1) write()'s after each inflate return.  This is
  not optimal from a performance standpoint since the write buffer is
  not necessarily be filled up when the inflate rountine reached the
  end of input buffer and it's not the end of file.
  
  This problem gets uncovered by trying to pipe gunzip -c output to
  a GEOM device directly, which enforces the writes be multiple of
  sector size.
  
  Sponsored by: iXsystems, Inc.
  Reported by:  jpaetzel

Modified:
  stable/7/usr.bin/gzip/gzip.c
Directory Properties:
  stable/7/usr.bin/gzip/   (props changed)

Modified: stable/7/usr.bin/gzip/gzip.c
==============================================================================
--- stable/7/usr.bin/gzip/gzip.c	Thu Oct  7 00:29:07 2010	(r213503)
+++ stable/7/usr.bin/gzip/gzip.c	Thu Oct  7 00:30:29 2010	(r213504)
@@ -920,6 +920,8 @@ gz_uncompress(int in, int out, char *pre
 			switch (error) {
 			/* Z_BUF_ERROR goes with Z_FINISH... */
 			case Z_BUF_ERROR:
+				if (z.avail_out > 0 && !done_reading)
+					continue;
 			case Z_STREAM_END:
 			case Z_OK:
 				break;