From: Jean-Yves Migeon <jeanyves.migeon@free.fr>
Date: Thu, 5 Sep 2013 14:42:17 +0000 (+0200)
Subject: st_dev field corresponds to dev{major,minor} and not rdev{major,minor}.
X-Git-Tag: v3.1.900a~353^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ba6dff66d176a7ee299258eef1489d0b9ffd225;p=thirdparty%2Flibarchive.git

st_dev field corresponds to dev{major,minor} and not rdev{major,minor}.
---

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 40db2ffc6..4d343eaf2 100644
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -997,8 +997,8 @@ write_mtree_entry(struct archive_write *a, struct mtree_entry *me)
 	if ((keys & F_RESDEV) != 0) {
 		archive_string_sprintf(str,
 		    " resdevice=native,%ju,%ju",
-		    (uintmax_t)me->rdevmajor,
-		    (uintmax_t)me->rdevminor);
+		    (uintmax_t)me->devmajor,
+		    (uintmax_t)me->devminor);
 	}
 
 	switch (me->filetype) {