From owner-svn-src-stable-7@FreeBSD.ORG  Sun Mar 29 01:04:13 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8807C1065670;
	Sun, 29 Mar 2009 01:04:13 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 760008FC21;
	Sun, 29 Mar 2009 01:04:13 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2T14DN0017755;
	Sun, 29 Mar 2009 01:04:13 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2T14D7g017754;
	Sun, 29 Mar 2009 01:04:13 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903290104.n2T14D7g017754@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 29 Mar 2009 01:04:13 +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: r190517 - stable/7/usr.bin/tar
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 01:04:14 -0000

Author: kientzle
Date: Sun Mar 29 01:04:13 2009
New Revision: 190517
URL: http://svn.freebsd.org/changeset/base/190517

Log:
  Merge r188343 from -CURRENT:   Unbreak writing shar archives.
     When copying file data to the archive, don't write more
     than was read.  This seems to have only affected the shar
     writer, since other formats proactively truncate output
     to the originally-advertised size.
  
  PR:		bin/131244
  Approved by:	re (Ken Smith)

Modified:
  stable/7/usr.bin/tar/   (props changed)
  stable/7/usr.bin/tar/write.c

Modified: stable/7/usr.bin/tar/write.c
==============================================================================
--- stable/7/usr.bin/tar/write.c	Sun Mar 29 01:00:48 2009	(r190516)
+++ stable/7/usr.bin/tar/write.c	Sun Mar 29 01:04:13 2009	(r190517)
@@ -966,7 +966,7 @@ write_file_data(struct bsdtar *bsdtar, s
 		siginfo_printinfo(bsdtar, progress);
 
 		bytes_written = archive_write_data(a, bsdtar->buff,
-		    FILEDATABUFLEN);
+		    bytes_read);
 		if (bytes_written < 0) {
 			/* Write failed; this is bad */
 			bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a));