struct ads_entry *ads_entries;
struct ads_entry *new_entry;
+ DEBUG("Add alternate data stream `%s'", stream_name);
+
if (inode->num_ads >= 0xfffe) {
ERROR("Too many alternate data streams in one inode!");
return NULL;
#ifdef WITH_FUSE
new_entry->stream_id = inode->next_stream_id++;
#endif
+ inode->num_ads = num_ads;
return new_entry;
}
#endif
}
/* Align to 8-byte boundary */
- wimlib_assert(length >= (p - orig_p)
- && length - (p - orig_p) <= 7);
+ wimlib_assert(length >= (p - orig_p) && length - (p - orig_p) <= 7);
p = put_zeroes(p, length - (p - orig_p));
/* Write the alternate data streams, if there are any. Please see
}
p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
}
-#ifdef ENABLE_ASSERTIONS
wimlib_assert(p - orig_p == __dentry_total_length(dentry, length));
-#endif
return p;
}
/* File descriptor to a file open on the WIM filesystem. */
struct wimlib_fd {
struct inode *f_inode;
- struct lookup_table_entry *lte;
+ struct lookup_table_entry *f_lte;
int staging_fd;
u16 idx;
u32 stream_id;
if (!fd)
return -ENOMEM;
fd->f_inode = inode;
- fd->lte = lte;
+ fd->f_lte = lte;
fd->staging_fd = -1;
fd->idx = i;
fd->stream_id = stream_id;
static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
{
wimlib_assert(fd);
- wimlib_assert(fd->lte == lte);
+ wimlib_assert(fd->f_lte == lte);
if (!lte) /* Empty stream with no lookup table entry */
return 0;
DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)",
fd->f_inode->ino, fd->f_inode->num_opened_fds,
fd->f_inode->num_allocated_fds);
- ret = lte_put_fd(fd->lte, fd);
+ ret = lte_put_fd(fd->f_lte, fd);
if (ret != 0)
return ret;
struct wimlib_fd *fd = inode->fds[i];
if (fd) {
if (fd->stream_id == stream_id) {
- wimlib_assert(fd->lte == old_lte);
- fd->lte = new_lte;
+ wimlib_assert(fd->f_lte == old_lte);
+ fd->f_lte = new_lte;
new_lte->num_opened_fds++;
fd->staging_fd = open(staging_file_name, O_RDONLY);
if (fd->staging_fd == -1) {
out_revert_fd_changes:
for (u16 i = 0, j = 0; j < new_lte->num_opened_fds; i++) {
struct wimlib_fd *fd = inode->fds[i];
- if (fd && fd->stream_id == stream_id && fd->lte == new_lte) {
- fd->lte = old_lte;
+ if (fd && fd->stream_id == stream_id && fd->f_lte == new_lte) {
+ fd->f_lte = old_lte;
if (fd->staging_fd != -1) {
close(fd->staging_fd);
fd->staging_fd = -1;
struct fuse_file_info *fi)
{
struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
- return inode_to_stbuf(fd->f_inode, fd->lte, stbuf);
+ return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
}
static int wimfs_ftruncate(const char *path, off_t size,
int ret = ftruncate(fd->staging_fd, size);
if (ret != 0)
return ret;
- if (fd->lte && size < fd->lte->resource_entry.original_size)
- fd->lte->resource_entry.original_size = size;
+ if (fd->f_lte && size < fd->f_lte->resource_entry.original_size)
+ fd->f_lte->resource_entry.original_size = size;
return 0;
}
return 0;
}
-
/* Creates a regular file. */
static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
{
if (!fd)
return -EBADF;
- if (!fd->lte) /* Empty stream with no lookup table entry */
+ if (!fd->f_lte) /* Empty stream with no lookup table entry */
return 0;
- if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) {
/* Read from staging file */
- wimlib_assert(fd->lte->staging_file_name);
+ wimlib_assert(fd->f_lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
ssize_t ret;
} else {
/* Read from WIM */
- u64 res_size = wim_resource_size(fd->lte);
+ u64 res_size = wim_resource_size(fd->f_lte);
if (offset > res_size)
return -EOVERFLOW;
size = min(size, res_size - offset);
- if (read_wim_resource(fd->lte, (u8*)buf,
+ if (read_wim_resource(fd->f_lte, (u8*)buf,
size, offset, false) != 0)
return -EIO;
return size;
if (!fd)
return -EBADF;
- wimlib_assert(fd->lte);
- wimlib_assert(fd->lte->staging_file_name);
+ wimlib_assert(fd->f_lte);
+ wimlib_assert(fd->f_lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
wimlib_assert(fd->f_inode);