From owner-svn-src-head@FreeBSD.ORG Thu Mar 5 01:59:50 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3988B1065670;
Thu, 5 Mar 2009 01:59:50 +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 27EED8FC0C;
Thu, 5 Mar 2009 01:59:50 +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 n251xo6T059358;
Thu, 5 Mar 2009 01:59:50 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n251xoFP059357;
Thu, 5 Mar 2009 01:59:50 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903050159.n251xoFP059357@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Thu, 5 Mar 2009 01:59:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r189388 - head/lib/libarchive
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2009 01:59:50 -0000
Author: kientzle
Date: Thu Mar 5 01:59:49 2009
New Revision: 189388
URL: http://svn.freebsd.org/changeset/base/189388
Log:
Correct r189383, which mis-merged a change from libarchive.googlecode.com.
Modified:
head/lib/libarchive/archive_write_disk.c
Modified: head/lib/libarchive/archive_write_disk.c
==============================================================================
--- head/lib/libarchive/archive_write_disk.c Thu Mar 5 00:57:01 2009 (r189387)
+++ head/lib/libarchive/archive_write_disk.c Thu Mar 5 01:59:49 2009 (r189388)
@@ -573,8 +573,8 @@ write_data_block(struct archive_write_di
bytes_to_write = block_end - a->offset;
}
/* Seek if necessary to the specified offset. */
- if (offset != a->fd_offset) {
- if (lseek(a->fd, offset, SEEK_SET) < 0) {
+ if (a->offset != a->fd_offset) {
+ if (lseek(a->fd, a->offset, SEEK_SET) < 0) {
archive_set_error(&a->archive, errno,
"Seek failed");
return (ARCHIVE_FATAL);