From owner-cvs-src@FreeBSD.ORG Thu Oct 18 05:19:45 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1F7116A47B; Thu, 18 Oct 2007 05:19:45 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 665C613C478; Thu, 18 Oct 2007 05:19:45 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5JiI3006572; Thu, 18 Oct 2007 05:19:44 GMT (envelope-from kientzle@repoman.freebsd.org) Received: (from kientzle@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5JiFU006571; Thu, 18 Oct 2007 05:19:44 GMT (envelope-from kientzle) Message-Id: <200710180519.l9I5JiFU006571@repoman.freebsd.org> From: Tim Kientzle Date: Thu, 18 Oct 2007 05:19:44 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/lib/libarchive archive_read_support_format_zip.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2007 05:19:45 -0000 kientzle 2007-10-18 05:19:44 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) lib/libarchive archive_read_support_format_zip.c Log: MFC 1.15: Return EOF immediately for non-regular files, don't return an empty block first. In particular, this fixes a bogus warning from bsdtar when restoring directories from ZIP archives. Also, correct the return values at EOF to include the correct offset. Revision Changes Path 1.5.2.5 +7 -0 src/lib/libarchive/archive_read_support_format_zip.c