Deleted Added
full compact
archive.h (311041) archive.h (315432)
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive.h 311041 2017-01-02 01:41:31Z mm $
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive.h 315432 2017-03-16 23:07:35Z mm $
26 */
27
28#ifndef ARCHIVE_H_INCLUDED
29#define ARCHIVE_H_INCLUDED
30
31/*
32 * The version number is expressed as a single integer that makes it
33 * easy to compare versions at build time: for version a.b.c, the
34 * version number is printf("%d%03d%03d",a,b,c). For example, if you
35 * know your application requires version 2.12.108 or later, you can
36 * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
37 */
38/* Note: Compiler will complain if this does not match archive_entry.h! */
26 */
27
28#ifndef ARCHIVE_H_INCLUDED
29#define ARCHIVE_H_INCLUDED
30
31/*
32 * The version number is expressed as a single integer that makes it
33 * easy to compare versions at build time: for version a.b.c, the
34 * version number is printf("%d%03d%03d",a,b,c). For example, if you
35 * know your application requires version 2.12.108 or later, you can
36 * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
37 */
38/* Note: Compiler will complain if this does not match archive_entry.h! */
39#define ARCHIVE_VERSION_NUMBER 3002002
39#define ARCHIVE_VERSION_NUMBER 3003001
40
41#include <sys/stat.h>
42#include <stddef.h> /* for wchar_t */
43#include <stdio.h> /* For FILE * */
44#include <time.h> /* For time_t */
45
46/*
47 * Note: archive.h is for use outside of libarchive; the configuration

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

150 * header and library are very different, you should expect some
151 * strangeness. Don't do that.
152 */
153__LA_DECL int archive_version_number(void);
154
155/*
156 * Textual name/version of the library, useful for version displays.
157 */
40
41#include <sys/stat.h>
42#include <stddef.h> /* for wchar_t */
43#include <stdio.h> /* For FILE * */
44#include <time.h> /* For time_t */
45
46/*
47 * Note: archive.h is for use outside of libarchive; the configuration

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

150 * header and library are very different, you should expect some
151 * strangeness. Don't do that.
152 */
153__LA_DECL int archive_version_number(void);
154
155/*
156 * Textual name/version of the library, useful for version displays.
157 */
158#define ARCHIVE_VERSION_ONLY_STRING "3.2.2"
158#define ARCHIVE_VERSION_ONLY_STRING "3.3.1"
159#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
160__LA_DECL const char * archive_version_string(void);
161
162/*
163 * Detailed textual name/version of the library and its dependencies.
164 * This has the form:
165 * "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..."
166 * the list of libraries described here will vary depending on how

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

996#define ARCHIVE_READDISK_HONOR_NODUMP (0x0002)
997/* Default: Skip a mac resource fork file whose prefix is "._" because of
998 * using copyfile. */
999#define ARCHIVE_READDISK_MAC_COPYFILE (0x0004)
1000/* Default: Traverse mount points. */
1001#define ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS (0x0008)
1002/* Default: Xattrs are read from disk. */
1003#define ARCHIVE_READDISK_NO_XATTR (0x0010)
159#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
160__LA_DECL const char * archive_version_string(void);
161
162/*
163 * Detailed textual name/version of the library and its dependencies.
164 * This has the form:
165 * "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..."
166 * the list of libraries described here will vary depending on how

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

996#define ARCHIVE_READDISK_HONOR_NODUMP (0x0002)
997/* Default: Skip a mac resource fork file whose prefix is "._" because of
998 * using copyfile. */
999#define ARCHIVE_READDISK_MAC_COPYFILE (0x0004)
1000/* Default: Traverse mount points. */
1001#define ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS (0x0008)
1002/* Default: Xattrs are read from disk. */
1003#define ARCHIVE_READDISK_NO_XATTR (0x0010)
1004/* Default: ACLs are read from disk. */
1005#define ARCHIVE_READDISK_NO_ACL (0x0020)
1006/* Default: File flags are read from disk. */
1007#define ARCHIVE_READDISK_NO_FFLAGS (0x0040)
1004
1005__LA_DECL int archive_read_disk_set_behavior(struct archive *,
1006 int flags);
1007
1008/*
1009 * Set archive_match object that will be used in archive_read_disk to
1010 * know whether an entry should be skipped. The callback function
1011 * _excluded_func will be invoked when an entry is skipped by the result

--- 172 unchanged lines hidden ---
1008
1009__LA_DECL int archive_read_disk_set_behavior(struct archive *,
1010 int flags);
1011
1012/*
1013 * Set archive_match object that will be used in archive_read_disk to
1014 * know whether an entry should be skipped. The callback function
1015 * _excluded_func will be invoked when an entry is skipped by the result

--- 172 unchanged lines hidden ---