/*
* Copyright (C) 2014 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
/* Unique identifier for this item. */
le32 tag;
- /* Size of the data of this tagged item, in bytes. This includes this
- * header and should be a multiple of 8.
- *
- * (Actually, the MS implementation seems to round this up to an 8 byte
- * boundary when calculating the offset to the next tagged item, but
- * uses this length unmodified when validating the item. We might as
- * well do the same.) */
+ /* Size of the data of this tagged item, in bytes. This excludes this
+ * header and should be a multiple of 8. */
le32 length;
/* Variable length data */
le32 uid;
le32 gid;
le32 mode;
- le32 reserved;
+ le32 rdev;
};
/* Retrieves the first tagged item with the specified tag and minimum length
u32 desired_tag, u32 min_data_len)
{
size_t minlen_with_hdr = sizeof(struct tagged_item_header) + min_data_len;
- size_t len_remaining = inode->i_extra_size;
- u8 *p = inode->i_extra;
+ size_t len_remaining;
+ u8 *p;
+
+ if (!inode->i_extra)
+ return NULL;
+
+ len_remaining = inode->i_extra->size;
+ p = inode->i_extra->data;
/* Iterate through the tagged items. */
while (len_remaining >= minlen_with_hdr) {
hdr = (struct tagged_item_header *)p;
tag = le32_to_cpu(hdr->tag);
- len = le32_to_cpu(hdr->length);
+ len = ALIGN(le32_to_cpu(hdr->length), 8);
+ /* Length overflow? */
+ if (unlikely(len > len_remaining - sizeof(struct tagged_item_header)))
+ return NULL;
+
+ /* Matches the item we wanted? */
if (tag == desired_tag && len >= min_data_len)
return hdr->data;
- len = (len + 7) & ~7;
- if (len >= len_remaining)
- 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;
}
{
size_t itemsize;
size_t newsize;
- u8 *buf;
+ struct wim_inode_extra *extra;
struct tagged_item_header *hdr;
/* We prepend the item instead of appending it because it's easier. */
- itemsize = sizeof(struct tagged_item_header) + len;
- newsize = itemsize + inode->i_extra_size;
+ itemsize = sizeof(struct tagged_item_header) + ALIGN(len, 8);
+ newsize = itemsize;
+ if (inode->i_extra)
+ newsize += inode->i_extra->size;
- buf = MALLOC(newsize);
- if (!buf)
+ extra = MALLOC(sizeof(struct wim_inode_extra) + newsize);
+ if (!extra)
return NULL;
-
- if (inode->i_extra_size) {
- memcpy(buf + itemsize, inode->i_extra, inode->i_extra_size);
+ if (inode->i_extra) {
+ memcpy(&extra->data[itemsize], inode->i_extra->data,
+ inode->i_extra->size);
FREE(inode->i_extra);
}
- inode->i_extra = buf;
- inode->i_extra_size = newsize;
+ extra->size = newsize;
+ inode->i_extra = extra;
- hdr = (struct tagged_item_header *)buf;
+ hdr = (struct tagged_item_header *)extra->data;
hdr->tag = cpu_to_le32(tag);
hdr->length = cpu_to_le32(len);
- return hdr->data;
+ return memset(hdr->data, 0, ALIGN(len, 8));
}
static inline struct wimlib_unix_data_disk *
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;
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;
}
git://wimlib.net / wimlib / blobdiff