| read.c (176434) | read.c (201166) |
|---|---|
| 1/*- 2 * Copyright (c) 2007 Kai Wang 3 * Copyright (c) 2007 Tim Kientzle 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: --- 12 unchanged lines hidden (view full) --- 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2007 Kai Wang 3 * Copyright (c) 2007 Tim Kientzle 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: --- 12 unchanged lines hidden (view full) --- 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/usr.bin/ar/read.c 176434 2008-02-21 10:52:31Z kaiw $"); | 29__FBSDID("$FreeBSD: head/usr.bin/ar/read.c 201166 2009-12-29 05:58:40Z kientzle $"); |
| 30 31#include <sys/queue.h> 32#include <sys/stat.h> 33#include <archive.h> 34#include <archive_entry.h> 35#include <errno.h> 36#include <libgen.h> 37#include <stdio.h> --- 45 unchanged lines hidden (view full) --- 83 char **av; 84 char buf[25]; 85 char find; 86 int flags, r, i; 87 88 if ((a = archive_read_new()) == NULL) 89 bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); 90 archive_read_support_compression_all(a); | 30 31#include <sys/queue.h> 32#include <sys/stat.h> 33#include <archive.h> 34#include <archive_entry.h> 35#include <errno.h> 36#include <libgen.h> 37#include <stdio.h> --- 45 unchanged lines hidden (view full) --- 83 char **av; 84 char buf[25]; 85 char find; 86 int flags, r, i; 87 88 if ((a = archive_read_new()) == NULL) 89 bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); 90 archive_read_support_compression_all(a); |
| 91 archive_read_support_format_all(a); | 91 archive_read_support_format_ar(a); |
| 92 AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ)); 93 94 for (;;) { 95 r = archive_read_next_header(a, &entry); 96 if (r == ARCHIVE_WARN || r == ARCHIVE_RETRY || 97 r == ARCHIVE_FATAL) 98 bsdar_warnc(bsdar, 0, "%s", archive_error_string(a)); 99 if (r == ARCHIVE_EOF || r == ARCHIVE_FATAL) --- 105 unchanged lines hidden --- | 92 AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ)); 93 94 for (;;) { 95 r = archive_read_next_header(a, &entry); 96 if (r == ARCHIVE_WARN || r == ARCHIVE_RETRY || 97 r == ARCHIVE_FATAL) 98 bsdar_warnc(bsdar, 0, "%s", archive_error_string(a)); 99 if (r == ARCHIVE_EOF || r == ARCHIVE_FATAL) --- 105 unchanged lines hidden --- |