X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Ftagged_items.c;h=0eee81d91409432f081305ef1395f6dec0e0f9e6;hb=2915014b741493083571954e10c8add9dc09a522;hp=3a12974ae5b6b8ad3ae95efe375c91160ae8db37;hpb=27b30056e4520e9b5b9d0846f438311746345f83;p=wimlib

diff --git a/src/tagged_items.c b/src/tagged_items.c
index 3a12974a..0eee81d9 100644
--- a/src/tagged_items.c
+++ b/src/tagged_items.c
@@ -45,7 +45,7 @@ struct tagged_item_header {
 	/* Unique identifier for this item.  */
 	le32 tag;
 
-	/* Size of the data of this tagged item, in bytes.  This includes this
+	/* Size of the data of this tagged item, in bytes.  This excludes this
 	 * header and should be a multiple of 8.
 	 *
 	 * (Actually, the MS implementation seems to round this up to an 8 byte
@@ -69,7 +69,7 @@ struct wimlib_unix_data_disk {
 	le32 uid;
 	le32 gid;
 	le32 mode;
-	le32 reserved;
+	le32 rdev;
 };
 
 /* Retrieves the first tagged item with the specified tag and minimum length
@@ -98,10 +98,10 @@ inode_get_tagged_item(const struct wim_inode *inode,
 			return hdr->data;
 
 		len = (len + 7) & ~7;
-		if (len >= len_remaining)
+		if (len_remaining <= sizeof(struct tagged_item_header) + len)
 			return NULL;
-		len_remaining -= len;
-		p = hdr->data + len;
+		len_remaining -= sizeof(struct tagged_item_header) + len;
+		p += sizeof(struct tagged_item_header) + len;
 	}
 	return NULL;
 }
@@ -178,19 +178,20 @@ inode_get_unix_data(const struct wim_inode *inode,
 	unix_data->uid = le32_to_cpu(p->uid);
 	unix_data->gid = le32_to_cpu(p->gid);
 	unix_data->mode = le32_to_cpu(p->mode);
+	unix_data->rdev = le32_to_cpu(p->rdev);
 	return true;
 }
 
 /* Sets UNIX data on the specified WIM inode.
  * This is a wimlib extension.
  *
- * Callers must specify all of @uid, @gid, and @mode.  If the inode does not yet
+ * Callers must specify all members in @unix_data.  If the inode does not yet
  * have UNIX data, it is given these values.  Otherwise, only the values that
  * also have the corresponding flags in @which set are changed.
  *
  * Returns %true if successful, %false if failed (out of memory).  */
 bool
-inode_set_unix_data(struct wim_inode *inode, u32 uid, u32 gid, u32 mode,
+inode_set_unix_data(struct wim_inode *inode, struct wimlib_unix_data *unix_data,
 		    int which)
 {
 	struct wimlib_unix_data_disk *p;
@@ -200,14 +201,15 @@ inode_set_unix_data(struct wim_inode *inode, u32 uid, u32 gid, u32 mode,
 		p = inode_add_unix_data_disk(inode);
 		if (!p)
 			return false;
-		p->reserved = cpu_to_le32(0);
-		which = UNIX_DATA_UID | UNIX_DATA_GID | UNIX_DATA_MODE;
+		which = UNIX_DATA_ALL;
 	}
 	if (which & UNIX_DATA_UID)
-		p->uid = cpu_to_le32(uid);
+		p->uid = cpu_to_le32(unix_data->uid);
 	if (which & UNIX_DATA_GID)
-		p->gid = cpu_to_le32(gid);
+		p->gid = cpu_to_le32(unix_data->gid);
 	if (which & UNIX_DATA_MODE)
-		p->mode = cpu_to_le32(mode);
+		p->mode = cpu_to_le32(unix_data->mode);
+	if (which & UNIX_DATA_RDEV)
+		p->rdev = cpu_to_le32(unix_data->rdev);
 	return true;
 }