libtar: add support for xattr extensions

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

3 files changed, 131 insertions, 1 deletions

diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 2c8344a..ad6532c 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -60,18 +60,28 @@ test_tar_sparse_gnu2_LDADD = libtar.a libutil.a
 test_tar_sparse_gnu2_CPPFLAGS = $(AM_CPPFLAGS)
 test_tar_sparse_gnu2_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar
 
+test_tar_xattr_bsd_SOURCES = tests/tar_xattr_bsd.c
+test_tar_xattr_bsd_LDADD = libtar.a libutil.a
+test_tar_xattr_bsd_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar
+
+test_tar_xattr_schily_SOURCES = tests/tar_xattr_schily.c
+test_tar_xattr_schily_LDADD = libtar.a libutil.a
+test_tar_xattr_schily_CPPFLAGS = $(AM_CPPFLAGS)
+test_tar_xattr_schily_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar
+
 check_PROGRAMS += test_canonicalize_name test_mknode_simple test_mknode_slink
 check_PROGRAMS += test_mknode_reg test_mknode_dir test_gen_inode_table
 check_PROGRAMS += test_add_by_path test_get_path test_fstree_sort
 check_PROGRAMS += test_fstree_from_file test_fstree_init test_fstree_xattr
 check_PROGRAMS += test_tar_ustar test_tar_pax test_tar_gnu test_tar_sparse_gnu
 check_PROGRAMS += test_tar_sparse_gnu1 test_tar_sparse_gnu2
+check_PROGRAMS += test_tar_xattr_bsd test_tar_xattr_schily
 
 TESTS += test_canonicalize_name test_mknode_simple test_mknode_slink
 TESTS += test_mknode_reg test_mknode_dir test_gen_inode_table
 TESTS += test_add_by_path test_get_path test_fstree_sort test_fstree_from_file
 TESTS += test_fstree_init test_fstree_xattr test_tar_ustar test_tar_pax
 TESTS += test_tar_gnu test_tar_sparse_gnu test_tar_sparse_gnu1
-TESTS += test_tar_sparse_gnu2
+TESTS += test_tar_sparse_gnu2 test_tar_xattr_bsd test_tar_xattr_schily
 
 EXTRA_DIST += $(top_srcdir)/tests/tar
diff --git a/tests/tar_xattr_bsd.c b/tests/tar_xattr_bsd.c
new file mode 100644
index 0000000..cfd7ad7
--- /dev/null
+++ b/tests/tar_xattr_bsd.c
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+#include "util.h"
+#include "tar.h"
+
+#include <unistd.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#define STR(x) #x
+#define STRVALUE(x) STR(x)
+
+#define TEST_PATH STRVALUE(TESTPATH)
+
+static int open_read(const char *path)
+{
+	int fd = open(path, O_RDONLY);
+
+	if (fd < 0) {
+		perror(path);
+		exit(EXIT_FAILURE);
+	}
+
+	return fd;
+}
+
+int main(void)
+{
+	tar_header_decoded_t hdr;
+	char buffer[6];
+	int fd;
+
+	assert(chdir(TEST_PATH) == 0);
+
+	fd = open_read("xattr/xattr-libarchive.tar");
+	assert(read_header(fd, &hdr) == 0);
+	assert(hdr.sb.st_mode == (S_IFREG | 0644));
+	assert(hdr.sb.st_uid == 01750);
+	assert(hdr.sb.st_gid == 01750);
+	assert(hdr.sb.st_size == 5);
+	assert(hdr.sb.st_mtime == 1543094477);
+	assert(hdr.sb.st_atime == 1543094642);
+	assert(hdr.sb.st_ctime == 1543094606);
+	assert(strcmp(hdr.name, "input.txt") == 0);
+	assert(!hdr.unknown_record);
+	assert(read_retry(fd, buffer, 5) == 5);
+	buffer[5] = '\0';
+	assert(strcmp(buffer, "test\n") == 0);
+
+	assert(hdr.xattr != NULL);
+	assert(strcmp(hdr.xattr->key, "user.mime_type") == 0);
+	assert(strcmp(hdr.xattr->value, "text/plain") == 0);
+	assert(hdr.xattr->next == NULL);
+
+	clear_header(&hdr);
+	close(fd);
+	return EXIT_SUCCESS;
+}
diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c
new file mode 100644
index 0000000..481e6ea
--- /dev/null
+++ b/tests/tar_xattr_schily.c
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+#include "util.h"
+#include "tar.h"
+
+#include <unistd.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#define STR(x) #x
+#define STRVALUE(x) STR(x)
+
+#define TEST_PATH STRVALUE(TESTPATH)
+
+static int open_read(const char *path)
+{
+	int fd = open(path, O_RDONLY);
+
+	if (fd < 0) {
+		perror(path);
+		exit(EXIT_FAILURE);
+	}
+
+	return fd;
+}
+
+int main(void)
+{
+	tar_header_decoded_t hdr;
+	char buffer[6];
+	int fd;
+
+	assert(chdir(TEST_PATH) == 0);
+
+	fd = open_read("xattr/xattr-schily.tar");
+	assert(read_header(fd, &hdr) == 0);
+	assert(hdr.sb.st_mode == (S_IFREG | 0644));
+	assert(hdr.sb.st_uid == 01750);
+	assert(hdr.sb.st_gid == 01750);
+	assert(hdr.sb.st_size == 5);
+	assert(hdr.sb.st_mtime == 1543094477);
+	assert(hdr.sb.st_atime == 1543094642);
+	assert(hdr.sb.st_ctime == 1543094606);
+	assert(strcmp(hdr.name, "input.txt") == 0);
+	assert(!hdr.unknown_record);
+	assert(read_retry(fd, buffer, 5) == 5);
+	buffer[5] = '\0';
+	assert(strcmp(buffer, "test\n") == 0);
+
+	assert(hdr.xattr != NULL);
+	assert(strcmp(hdr.xattr->key, "user.mime_type") == 0);
+	assert(strcmp(hdr.xattr->value, "text/plain") == 0);
+	assert(hdr.xattr->next == NULL);
+
+	clear_header(&hdr);
+	close(fd);
+	return EXIT_SUCCESS;
+}