From owner-cvs-all@FreeBSD.ORG Tue Jan 15 16:27:15 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 985AE16A41A; Tue, 15 Jan 2008 16:27:15 +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 8FADA13C465; Tue, 15 Jan 2008 16:27:15 +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 m0FGRFqn089103; Tue, 15 Jan 2008 16:27:15 GMT (envelope-from kientzle@repoman.freebsd.org) Received: (from kientzle@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FGRFlW089102; Tue, 15 Jan 2008 16:27:15 GMT (envelope-from kientzle) Message-Id: <200801151627.m0FGRFlW089102@repoman.freebsd.org> From: Tim Kientzle Date: Tue, 15 Jan 2008 16:27:15 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/lib/libarchive archive_read_support_format_zip.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 16:27:15 -0000 kientzle 2008-01-15 16:27:15 UTC FreeBSD src repository Modified files: lib/libarchive archive_read_support_format_zip.c Log: Handle Zip archives that are "multi-part archives with only one part" by simply ignoring the marker at the beginning of the file. (Zip archivers reserve four bytes at the beginning of each part of a multi-part archive, if it happens to only require one part, those four bytes get filled with a placeholder that can be ignored.) Thanks to: Marius Nuennerich, for pointing me to a Zip archive that libarchive couldn't handle MFC after: 7 days Revision Changes Path 1.20 +19 -1 src/lib/libarchive/archive_read_support_format_zip.c