Deleted Added
full compact
unzip.c (236226) unzip.c (248612)
1/*-
2 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>
3 * Copyright (c) 2007-2008 Dag-Erling Sm��rgrav
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>
3 * Copyright (c) 2007-2008 Dag-Erling Sm��rgrav
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/usr.bin/unzip/unzip.c 236226 2012-05-29 09:11:19Z des $
28 * $FreeBSD: head/usr.bin/unzip/unzip.c 248612 2013-03-22 10:17:42Z mm $
29 *
30 * This file would be much shorter if we didn't care about command-line
31 * compatibility with Info-ZIP's UnZip, which requires us to duplicate
32 * parts of libarchive in order to gain more detailed control of its
33 * behaviour for the purpose of implementing the -n, -o, -L and -a
34 * options.
35 */
36

--- 884 unchanged lines hidden (view full) ---

921 printf("-------- ------- --- -------\n");
922 printf("%8ju %7ju 0%% %ju file%s\n",
923 total_size, total_size, file_count,
924 file_count != 1 ? "s" : "");
925 }
926 }
927
928 ac(archive_read_close(a));
29 *
30 * This file would be much shorter if we didn't care about command-line
31 * compatibility with Info-ZIP's UnZip, which requires us to duplicate
32 * parts of libarchive in order to gain more detailed control of its
33 * behaviour for the purpose of implementing the -n, -o, -L and -a
34 * options.
35 */
36

--- 884 unchanged lines hidden (view full) ---

921 printf("-------- ------- --- -------\n");
922 printf("%8ju %7ju 0%% %ju file%s\n",
923 total_size, total_size, file_count,
924 file_count != 1 ? "s" : "");
925 }
926 }
927
928 ac(archive_read_close(a));
929 (void)archive_read_finish(a);
929 (void)archive_read_free(a);
930
931 if (t_opt) {
932 if (error_count > 0) {
933 errorx("%d checksum error(s) found.", error_count);
934 }
935 else {
936 printf("No errors detected in compressed data of %s.\n",
937 fn);

--- 136 unchanged lines hidden ---
930
931 if (t_opt) {
932 if (error_count > 0) {
933 errorx("%d checksum error(s) found.", error_count);
934 }
935 else {
936 printf("No errors detected in compressed data of %s.\n",
937 fn);

--- 136 unchanged lines hidden ---