Author: mm
Date: Tue Mar 28 10:39:17 2017
New Revision: 316095
URL: https://svnweb.freebsd.org/changeset/base/316095
Log:
MFV r316083,316094:
Sync libarchive with vendor
Vendor changes (FreeBSD-related):
- constify variables in several places
- unify platform ACL code in a single source file
- fix unused variable if compiling on FreeBSD without NFSv4 ACL support
MFC after: 3 days
X-MFC-with: 315636, 315876
Added:
head/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c
- copied, changed from r316083,
vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c
Deleted:
head/contrib/libarchive/libarchive/archive_acl_maps.h
head/contrib/libarchive/libarchive/archive_acl_maps_freebsd.c
head/contrib/libarchive/libarchive/archive_read_disk_acl_freebsd.c
head/contrib/libarchive/libarchive/archive_write_disk_acl_freebsd.c
Modified:
head/contrib/libarchive/FREEBSD-Xlist
head/contrib/libarchive/libarchive/archive_entry.c
head/contrib/libarchive/libarchive/archive_getdate.c
head/contrib/libarchive/libarchive/archive_pack_dev.c
head/contrib/libarchive/libarchive/archive_read_support_format_cab.c
head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
head/contrib/libarchive/libarchive/archive_read_support_format_zip.c
head/contrib/libarchive/libarchive/archive_string_sprintf.c
head/contrib/libarchive/libarchive/archive_util.c
head/contrib/libarchive/libarchive/archive_write_add_filter.c
head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c
head/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c
head/contrib/libarchive/libarchive/archive_write_add_filter_program.c
head/contrib/libarchive/libarchive/archive_write_set_format.c
head/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
head/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
head/contrib/libarchive/libarchive/archive_write_set_format_warc.c
head/lib/libarchive/Makefile
Directory Properties:
head/contrib/libarchive/ (props changed)
Modified: head/contrib/libarchive/FREEBSD-Xlist
==============================================================================
--- head/contrib/libarchive/FREEBSD-Xlist Tue Mar 28 10:34:44 2017
(r316094)
+++ head/contrib/libarchive/FREEBSD-Xlist Tue Mar 28 10:39:17 2017
(r316095)
@@ -21,6 +21,9 @@ doc
examples
libarchive/CMakeLists.txt
libarchive/archive_entry_copy_bhfi.c
+libarchive/archive_disk_acl_darwin.c
+libarchive/archive_disk_acl_linux.c
+libarchive/archive_disk_acl_sunos.c
libarchive/archive_read_disk_windows.c
libarchive/archive_windows.c
libarchive/archive_windows.h
Copied and modified:
head/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c (from r316083,
vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c)
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c Tue Mar
28 09:58:54 2017 (r316083, copy source)
+++ head/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c Tue Mar
28 10:39:17 2017 (r316095)
@@ -27,6 +27,8 @@
#include "archive_platform.h"
+#if ARCHIVE_ACL_FREEBSD
+
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -695,3 +697,4 @@ archive_write_disk_set_acls(struct archi
#endif
return (ret);
}
+#endif /* ARCHIVE_ACL_FREEBSD */
Modified: head/contrib/libarchive/libarchive/archive_entry.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry.c Tue Mar 28 10:34:44
2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_entry.c Tue Mar 28 10:39:17
2017 (r316095)
@@ -1638,7 +1638,7 @@ _archive_entry_acl_text_l(struct archive
* SUCH DAMAGE.
*/
-static struct flag {
+static const struct flag {
const char *name;
const wchar_t *wname;
unsigned long set;
@@ -1843,7 +1843,7 @@ ae_fflagstostr(unsigned long bitset, uns
char *string, *dp;
const char *sp;
unsigned long bits;
- struct flag *flag;
+ const struct flag *flag;
size_t length;
bits = bitset | bitclear;
@@ -1895,7 +1895,7 @@ static const char *
ae_strtofflags(const char *s, unsigned long *setp, unsigned long *clrp)
{
const char *start, *end;
- struct flag *flag;
+ const struct flag *flag;
unsigned long set, clear;
const char *failed;
@@ -1963,7 +1963,7 @@ static const wchar_t *
ae_wcstofflags(const wchar_t *s, unsigned long *setp, unsigned long *clrp)
{
const wchar_t *start, *end;
- struct flag *flag;
+ const struct flag *flag;
unsigned long set, clear;
const wchar_t *failed;
Modified: head/contrib/libarchive/libarchive/archive_getdate.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_getdate.c Tue Mar 28
10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_getdate.c Tue Mar 28
10:39:17 2017 (r316095)
@@ -691,7 +691,7 @@ Convert(time_t Month, time_t Day, time_t
time_t Hours, time_t Minutes, time_t Seconds,
time_t Timezone, enum DSTMODE DSTmode)
{
- static int DaysInMonth[12] = {
+ int DaysInMonth[12] = {
31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
time_t Julian;
Modified: head/contrib/libarchive/libarchive/archive_pack_dev.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_pack_dev.c Tue Mar 28
10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_pack_dev.c Tue Mar 28
10:39:17 2017 (r316095)
@@ -280,7 +280,7 @@ pack_bsdos(int n, unsigned long numbers[
/* list of formats and pack functions */
/* this list must be sorted lexically */
-static struct format {
+static const struct format {
const char *name;
pack_t *pack;
} formats[] = {
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_cab.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_cab.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_cab.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -187,7 +187,7 @@ struct lzx_stream {
#define CFDATA_cbData 4
#define CFDATA_cbUncomp 6
-static const char *compression_name[] = {
+static const char * const compression_name[] = {
"NONE",
"MSZIP",
"Quantum",
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_lha.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -2477,7 +2477,7 @@ lzh_huffman_free(struct huffman *hf)
free(hf->tree);
}
-static char bitlen_tbl[0x400] = {
+static const char bitlen_tbl[0x400] = {
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -399,41 +399,41 @@ bid_keycmp(const char *p, const char *ke
static int
bid_keyword(const char *p, ssize_t len)
{
- static const char *keys_c[] = {
+ static const char * const keys_c[] = {
"content", "contents", "cksum", NULL
};
- static const char *keys_df[] = {
+ static const char * const keys_df[] = {
"device", "flags", NULL
};
- static const char *keys_g[] = {
+ static const char * const keys_g[] = {
"gid", "gname", NULL
};
- static const char *keys_il[] = {
+ static const char * const keys_il[] = {
"ignore", "inode", "link", NULL
};
- static const char *keys_m[] = {
+ static const char * const keys_m[] = {
"md5", "md5digest", "mode", NULL
};
- static const char *keys_no[] = {
+ static const char * const keys_no[] = {
"nlink", "nochange", "optional", NULL
};
- static const char *keys_r[] = {
+ static const char * const keys_r[] = {
"resdevice", "rmd160", "rmd160digest", NULL
};
- static const char *keys_s[] = {
+ static const char * const keys_s[] = {
"sha1", "sha1digest",
"sha256", "sha256digest",
"sha384", "sha384digest",
"sha512", "sha512digest",
"size", NULL
};
- static const char *keys_t[] = {
+ static const char * const keys_t[] = {
"tags", "time", "type", NULL
};
- static const char *keys_u[] = {
+ static const char * const keys_u[] = {
"uid", "uname", NULL
};
- const char **keys;
+ const char * const *keys;
int i;
switch (*p) {
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_zip.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_zip.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_zip.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -347,7 +347,7 @@ fake_crc32(unsigned long crc, const void
return 0;
}
-static struct {
+static const struct {
int id;
const char * name;
} compression_methods[] = {
Modified: head/contrib/libarchive/libarchive/archive_string_sprintf.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_string_sprintf.c Tue Mar 28
10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_string_sprintf.c Tue Mar 28
10:39:17 2017 (r316095)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
static void
append_uint(struct archive_string *as, uintmax_t d, unsigned base)
{
- static const char *digits = "0123456789abcdef";
+ static const char digits[] = "0123456789abcdef";
if (d >= base)
append_uint(as, d/base, base);
archive_strappend_char(as, digits[d % base]);
Modified: head/contrib/libarchive/libarchive/archive_util.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_util.c Tue Mar 28 10:34:44
2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_util.c Tue Mar 28 10:39:17
2017 (r316095)
@@ -193,7 +193,7 @@ archive_copy_error(struct archive *dest,
void
__archive_errx(int retvalue, const char *msg)
{
- static const char *msg1 = "Fatal Internal Error in libarchive: ";
+ static const char msg1[] = "Fatal Internal Error in libarchive: ";
size_t s;
s = write(2, msg1, strlen(msg1));
@@ -221,8 +221,8 @@ __archive_errx(int retvalue, const char
int
__archive_mktemp(const char *tmpdir)
{
- static const wchar_t *prefix = L"libarchive_";
- static const wchar_t *suffix = L"XXXXXXXXXX";
+ static const wchar_t prefix[] = L"libarchive_";
+ static const wchar_t suffix[] = L"XXXXXXXXXX";
static const wchar_t num[] = {
L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7',
L'8', L'9', L'A', L'B', L'C', L'D', L'E', L'F',
Modified: head/contrib/libarchive/libarchive/archive_write_add_filter.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_add_filter.c Tue Mar
28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_add_filter.c Tue Mar
28 10:39:17 2017 (r316095)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
/* A table that maps filter codes to functions. */
-static
+static const
struct { int code; int (*setter)(struct archive *); } codes[] =
{
{ ARCHIVE_FILTER_NONE, archive_write_add_filter_none },
Modified: head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
/* A table that maps names to functions. */
-static
+static const
struct { const char *name; int (*setter)(struct archive *); } names[] =
{
{ "b64encode", archive_write_add_filter_b64encode },
Modified: head/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c Tue Mar
28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c Tue Mar
28 10:39:17 2017 (r316095)
@@ -225,7 +225,7 @@ archive_filter_lz4_open(struct archive_w
struct private_data *data = (struct private_data *)f->data;
int ret;
size_t required_size;
- static size_t bkmap[] = { 64 * 1024, 256 * 1024, 1 * 1024 * 1024,
+ static size_t const bkmap[] = { 64 * 1024, 256 * 1024, 1 * 1024 * 1024,
4 * 1024 * 1024 };
size_t pre_block_size;
Modified: head/contrib/libarchive/libarchive/archive_write_add_filter_program.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_add_filter_program.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_add_filter_program.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -92,7 +92,7 @@ archive_write_add_filter_program(struct
{
struct archive_write_filter *f = __archive_write_allocate_filter(_a);
struct private_data *data;
- static const char *prefix = "Program: ";
+ static const char prefix[] = "Program: ";
archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
ARCHIVE_STATE_NEW, "archive_write_add_filter_program");
Modified: head/contrib/libarchive/libarchive/archive_write_set_format.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_set_format.c Tue Mar
28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_set_format.c Tue Mar
28 10:39:17 2017 (r316095)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
/* A table that maps format codes to functions. */
-static
+static const
struct { int code; int (*setter)(struct archive *); } codes[] =
{
{ ARCHIVE_FORMAT_7ZIP, archive_write_set_format_7zip },
Modified: head/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
/* A table that maps names to functions. */
-static
+static const
struct { const char *name; int (*setter)(struct archive *); } names[] =
{
{ "7zip", archive_write_set_format_7zip },
Modified:
head/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
Tue Mar 28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
Tue Mar 28 10:39:17 2017 (r316095)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
/* A table that maps names to functions. */
-static
+static const
struct { const char *name; int (*format)(struct archive *); int
(*filter)(struct archive *); } names[] =
{
{ ".7z", archive_write_set_format_7zip,
archive_write_add_filter_none},
Modified: head/contrib/libarchive/libarchive/archive_write_set_format_warc.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_write_set_format_warc.c Tue Mar
28 10:34:44 2017 (r316094)
+++ head/contrib/libarchive/libarchive/archive_write_set_format_warc.c Tue Mar
28 10:39:17 2017 (r316095)
@@ -354,7 +354,7 @@ static ssize_t
_popul_ehdr(struct archive_string *tgt, size_t tsz, warc_essential_hdr_t hdr)
{
static const char _ver[] = "WARC/1.0\r\n";
- static const char *_typ[LAST_WT] = {
+ static const char * const _typ[LAST_WT] = {
NULL, "warcinfo", "metadata", "resource", NULL
};
char std_uuid[48U];
Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile Tue Mar 28 10:34:44 2017
(r316094)
+++ head/lib/libarchive/Makefile Tue Mar 28 10:39:17 2017
(r316095)
@@ -45,10 +45,10 @@ INCS= archive.h archive_entry.h
# Sources to be compiled.
SRCS= archive_acl.c \
- archive_acl_maps_freebsd.c \
archive_check_magic.c \
archive_cmdline.c \
archive_cryptor.c \
+ archive_disk_acl_freebsd.c \
archive_digest.c \
archive_entry.c \
archive_entry_copy_stat.c \
@@ -70,7 +70,6 @@ SRCS= archive_acl.c \
archive_read_add_passphrase.c \
archive_read_append_filter.c \
archive_read_data_into_fd.c \
- archive_read_disk_acl_freebsd.c \
archive_read_disk_entry_from_file.c \
archive_read_disk_posix.c \
archive_read_disk_set_standard_lookup.c \
@@ -118,7 +117,6 @@ SRCS= archive_acl.c
\
archive_virtual.c \
archive_write.c \
archive_write_add_filter.c \
- archive_write_disk_acl_freebsd.c \
archive_write_disk_set_standard_lookup.c \
archive_write_disk_posix.c \
archive_write_open_fd.c \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
