| write.c (299529) | write.c (302075) |
|---|---|
| 1/*- 2 * Copyright (c) 2003-2007 Tim Kientzle 3 * Copyright (c) 2012 Michihiro NAKAJIMA 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 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include "bsdtar_platform.h" | 1/*- 2 * Copyright (c) 2003-2007 Tim Kientzle 3 * Copyright (c) 2012 Michihiro NAKAJIMA 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 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include "bsdtar_platform.h" |
| 28__FBSDID("$FreeBSD: head/contrib/libarchive/tar/write.c 299529 2016-05-12 10:16:16Z mm $"); | 28__FBSDID("$FreeBSD: head/contrib/libarchive/tar/write.c 302075 2016-06-22 07:49:59Z mm $"); |
| 29 30#ifdef HAVE_SYS_TYPES_H 31#include <sys/types.h> 32#endif 33#ifdef HAVE_SYS_STAT_H 34#include <sys/stat.h> 35#endif 36#ifdef HAVE_ATTR_XATTR_H --- 842 unchanged lines hidden (view full) --- 879 archive_entry_free(entry); 880 entry = archive_entry_new(); 881 r = archive_read_next_header2(disk, entry); 882 if (r == ARCHIVE_EOF) 883 break; 884 else if (r != ARCHIVE_OK) { 885 lafe_warnc(archive_errno(disk), 886 "%s", archive_error_string(disk)); | 29 30#ifdef HAVE_SYS_TYPES_H 31#include <sys/types.h> 32#endif 33#ifdef HAVE_SYS_STAT_H 34#include <sys/stat.h> 35#endif 36#ifdef HAVE_ATTR_XATTR_H --- 842 unchanged lines hidden (view full) --- 879 archive_entry_free(entry); 880 entry = archive_entry_new(); 881 r = archive_read_next_header2(disk, entry); 882 if (r == ARCHIVE_EOF) 883 break; 884 else if (r != ARCHIVE_OK) { 885 lafe_warnc(archive_errno(disk), 886 "%s", archive_error_string(disk)); |
| 887 if (r == ARCHIVE_FATAL) { | 887 if (r == ARCHIVE_FATAL || r == ARCHIVE_FAILED) { |
| 888 bsdtar->return_value = 1; 889 return; 890 } else if (r < ARCHIVE_WARN) 891 continue; 892 } 893 894 if (bsdtar->uid >= 0) { 895 archive_entry_set_uid(entry, bsdtar->uid); --- 156 unchanged lines hidden --- | 888 bsdtar->return_value = 1; 889 return; 890 } else if (r < ARCHIVE_WARN) 891 continue; 892 } 893 894 if (bsdtar->uid >= 0) { 895 archive_entry_set_uid(entry, bsdtar->uid); --- 156 unchanged lines hidden --- |