From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 25 Sep 2012 11:17:29 +0000 (+0900)
Subject: Fix bugs introdueced by f87e3db94c.
X-Git-Tag: v3.1.0~46^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfa8b0fc7b1f3bc07587cef40773a90291642a1b;p=thirdparty%2Flibarchive.git

Fix bugs introdueced by f87e3db94c.
---

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 453198b29..c08d22941 100644
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -233,7 +233,7 @@ static struct attr_counter * attr_counter_new(struct mtree_entry *,
 static int attr_counter_set_collect(struct mtree_writer *,
 	struct mtree_entry *);
 static void attr_counter_set_free(struct mtree_writer *);
-static int get_keys(struct mtree_writer *, struct mtree_entry *);
+static int get_global_set_keys(struct mtree_writer *, struct mtree_entry *);
 static int mtree_entry_add_child_tail(struct mtree_entry *,
 	struct mtree_entry *);
 static int mtree_entry_create_virtual_dir(struct archive_write *, const char *,
@@ -488,6 +488,15 @@ write_global(struct mtree_writer *mtree)
 				mtree->set.fflags_clear))
 				effkeys &= ~F_FLAGS;
 		}
+	} else {
+		if (acs->uid_list == NULL)
+			keys &= ~(F_UNAME | F_UID);
+		if (acs->gid_list == NULL)
+			keys &= ~(F_GNAME | F_GID);
+		if (acs->mode_list == NULL)
+			keys &= ~F_MODE;
+		if (acs->flags_list == NULL)
+			keys &= ~F_FLAGS;
 	}
 	if ((keys & effkeys & F_TYPE) != 0) {
 		if (mtree->dironly) {
@@ -720,7 +729,7 @@ attr_counter_set_free(struct mtree_writer *mtree)
 }
 
 static int
-get_keys(struct mtree_writer *mtree, struct mtree_entry *me)
+get_global_set_keys(struct mtree_writer *mtree, struct mtree_entry *me)
 {
 	int keys;
 
@@ -813,7 +822,7 @@ mtree_entry_new(struct archive_write *a, struct archive_entry *entry,
 	me->rdevminor = archive_entry_rdevminor(entry);
 	me->size = archive_entry_size(entry);
 	if (me->filetype == AE_IFDIR) {
-		me->dir_info = malloc(sizeof(*me->dir_info));
+		me->dir_info = calloc(1, sizeof(*me->dir_info));
 		if (me->dir_info == NULL) {
 			mtree_entry_free(me);
 			archive_set_error(&a->archive, ENOMEM,
@@ -937,7 +946,7 @@ write_mtree_entry(struct archive_write *a, struct mtree_entry *me)
 	}
 	mtree_quote(str, me->basename.s);
 
-	keys = get_keys(mtree, me);
+	keys = get_global_set_keys(mtree, me);
 	if ((keys & F_NLINK) != 0 &&
 	    me->nlink != 1 && me->filetype != AE_IFDIR)
 		archive_string_sprintf(str, " nlink=%u", me->nlink);
@@ -1100,6 +1109,14 @@ write_mtree_entry_tree(struct archive_write *a)
 			ret = write_mtree_entry(a, np);
 			if (ret != ARCHIVE_OK)
 				return (ARCHIVE_FATAL);
+		} else {
+			/* Whenever output_global_set is enabled
+			 * output global value(/set keywords)
+			 * even if the directory entry is not allowd
+			 * to be written because the global values
+			 * can be used for the children. */
+			if (mtree->output_global_set)
+				write_global(mtree);
 		}
 		/*
 		 * Output the attribute of all files except directory files.
diff --git a/libarchive/test/test_write_format_mtree_classic.c b/libarchive/test/test_write_format_mtree_classic.c
index 5176e9c01..9a75fdd71 100644
--- a/libarchive/test/test_write_format_mtree_classic.c
+++ b/libarchive/test/test_write_format_mtree_classic.c
@@ -53,9 +53,9 @@ static struct {
 
 static const char image [] = {
 "#mtree\n"
-"/set type=file uid=1001 gid=1001 mode=644\n"
 "\n"
 "# .\n"
+"/set type=file uid=1001 gid=1001 mode=644\n"
 ".               time=1231975636.0 mode=755 type=dir\n"
 "    COPYING     time=1231975636.0 size=8\n"
 "    Makefile    time=1233041050.0 size=8\n"
@@ -89,8 +89,8 @@ static const char image [] = {
 
 static const char image_dironly [] = {
 "#mtree\n"
-"/set type=dir uid=1001 gid=1001 mode=755\n"
 "# .\n"
+"/set type=dir uid=1001 gid=1001 mode=755\n"
 ".               time=1231975636.0\n"
 "# ./subdir\n"
 "subdir          time=1233504586.0\n"
diff --git a/libarchive/test/test_write_format_mtree_classic_indent.c b/libarchive/test/test_write_format_mtree_classic_indent.c
index 29247fda6..6d1c54911 100644
--- a/libarchive/test/test_write_format_mtree_classic_indent.c
+++ b/libarchive/test/test_write_format_mtree_classic_indent.c
@@ -53,9 +53,9 @@ static struct {
 
 static const char image [] = {
 "#mtree\n"
-"/set type=file uid=1001 gid=1001 mode=644\n"
 "\n"
 "# .\n"
+"/set type=file uid=1001 gid=1001 mode=644\n"
 ".               time=1231975636.0 mode=755 type=dir\n"
 "    COPYING         time=1231975636.0 size=8\n"
 "    Makefile        time=1233041050.0 size=8\n"
@@ -89,8 +89,8 @@ static const char image [] = {
 
 static const char image_dironly [] = {
 "#mtree\n"
-"/set type=dir uid=1001 gid=1001 mode=755\n"
 "# .\n"
+"/set type=dir uid=1001 gid=1001 mode=755\n"
 ".               time=1231975636.0\n"
 "# ./subdir\n"
 "    subdir          time=1233504586.0\n"