More work on ACLs: fix error in archive_entry's ACL parsing code,

  try to set ACLs even if fflag restore fails, first cut at reading
  Solaris tar ACLs

Code improvement: merge gnu tar read support into main tar reader;
  this eliminates a lot of duplicate code and generalizes the tar
  reader to handle formats with GNU-like extensions.

Style: Makefile cleanup, eliminate 'dmalloc' references, remove 'tartype'
  from archive_entry (this makes archive_entry more format-agnostic)

Thanks to: David Magda for providing Solaris tar test files

1 files changed, 1 insertions, 14 deletions

diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index 7cb654e..83fddc3 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -201,7 +201,7 @@ struct archive {
 /* Utility function to format a USTAR header into a buffer. */
 int
 __archive_write_format_header_ustar(struct archive *, char buff[512],
-    struct archive_entry *);
+    struct archive_entry *, int tartype);
 
 #define	ARCHIVE_STATE_ANY	0xFFFFU
 #define	ARCHIVE_STATE_NEW	1U
@@ -231,17 +231,4 @@ int	__archive_read_register_compression(struct archive *a,
 
 #define err_combine(a,b)	((a) < (b) ? (a) : (b))
 
-
-/*
- * Private ACL handling:  parse and generate ACL strings.
- * These are private because they handle a lot of very weird formats
- * that clients should not be messing with.  Clients should only
- * deal with their platform-native formats.  Because of the need to
- * support many formats cleanly, new arguments are likely to get added
- * on a regular basis.  Clients who try to use this interface are
- * likely to be surprised when it changes.
- */
-int		 __archive_entry_acl_parse_w(struct archive_entry *,
-		     const wchar_t *, int type);
-
 #endif