From owner-p4-projects@FreeBSD.ORG Fri Aug 8 11:48:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAC00106566C; Fri, 8 Aug 2008 11:48:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E916106564A for ; Fri, 8 Aug 2008 11:48:45 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 713D38FC19 for ; Fri, 8 Aug 2008 11:48:45 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m78Bmjef047916 for ; Fri, 8 Aug 2008 11:48:45 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m78Bmjew047914 for perforce@freebsd.org; Fri, 8 Aug 2008 11:48:45 GMT (envelope-from strauss@FreeBSD.org) Date: Fri, 8 Aug 2008 11:48:45 GMT Message-Id: <200808081148.m78Bmjew047914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 146908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2008 11:48:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=146908 Change 146908 by strauss@strauss_marvelman on 2008/08/08 11:47:58 - Removed archive error setting when compressor fails - Comment updates Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#24 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#24 (text+ko) ==== @@ -6,8 +6,8 @@ * - No compression support. * - No encryption support. * - No ZIP64 support. - * - Central directory is missing. * - No support for splitting and spanning. + * - Only writes regular file entries. * * Note that generally data in ZIP files is little-endian encoded, * with some exceptions. @@ -198,7 +198,7 @@ * - compression: Not yet supported (TODO) * - timedate: Means standard input (TODO) * - crc32, compressed_size, uncompressed_size: written in data descriptor - * - extra_length: first used when + * - extra_length: not used (TODO) */ memset(&h, 0, sizeof(h)); zip_encode(ZIP_SIGNATURE_LOCAL_FILE_HEADER, &h.signature, sizeof(h.signature)); @@ -212,17 +212,15 @@ zip_encode(size, &d->uncompressed_size, sizeof(d->uncompressed_size)); ret = (a->compressor.write)(a, &h, sizeof(h)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write local file header"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } + zip->written_bytes += sizeof(h); ret = (a->compressor.write)(a, path, strlen(path)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write path field"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } + zip->written_bytes += strlen(path); return (ARCHIVE_OK); @@ -241,7 +239,6 @@ l->crc32 = crc32(l->crc32, buff, s); return s; } else { - archive_set_error(&a->archive, EIO, "Error while writing ZIP data"); return (ret); } } @@ -259,10 +256,8 @@ zip_encode(l->crc32, &d->crc32, sizeof(d->crc32)); ret = (a->compressor.write)(a, d, sizeof(*d)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write data descriptor"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } zip->written_bytes += sizeof(*d); return (ARCHIVE_OK); @@ -314,18 +309,14 @@ /* Writing file header. */ ret = (a->compressor.write)(a, &h, sizeof(h)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write file header"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } zip->written_bytes += sizeof(h); /* Writing filename. */ ret = (a->compressor.write)(a, path, strlen(path)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write path field"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } zip->written_bytes += strlen(path); l = l->next; @@ -343,10 +334,8 @@ /* Writing end of central directory. */ ret = (a->compressor.write)(a, &end, sizeof(end)); - if (ret != ARCHIVE_OK) { - archive_set_error(&a->archive, EIO, "Can't write end of central directory"); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - } zip->written_bytes += sizeof(end); return (ARCHIVE_OK);