X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=9385b5298975f41bf6b60d797cd92ac36a7338b7;hp=68909618596997c14b5c10cb0277b48e25c7d809;hb=68b023ab834029db11ce9bf150dadd9c80e59404;hpb=038eaccece575d04de8d647bb93773b7f3e38ce4 diff --git a/src/mount.c b/src/mount.c index 68909618..9385b529 100644 --- a/src/mount.c +++ b/src/mount.c @@ -44,6 +44,7 @@ #include #include #include +#include struct wimlib_fd { u16 idx; @@ -143,14 +144,17 @@ static int close_wimlib_fd(struct wimlib_fd *fd) wimlib_assert(lte); wimlib_assert(lte->num_opened_fds); - if (lte->staging_file_name) { + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + wimlib_assert(lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); if (close(fd->staging_fd) != 0) return -errno; } if (--lte->num_opened_fds == 0 && lte->refcnt == 0) { - if (lte->staging_file_name) + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + wimlib_assert(lte->staging_file_name); unlink(lte->staging_file_name); + } free_lookup_table_entry(lte); } wimlib_assert(lte->fds[fd->idx] == fd); @@ -184,6 +188,20 @@ static void remove_dentry(struct dentry *dentry, put_dentry(dentry); } +static void remove_ads(struct dentry *dentry, + struct ads_entry *ads_entry, + struct lookup_table *lookup_table) +{ + struct lookup_table_entry *lte; + + wimlib_assert(dentry->resolved); + + lte = lte_decrement_refcnt(lte, lookup_table); + if (lte) + list_del(&ads_entry->lte_group_list.list); + dentry_remove_ads(dentry, ads_entry); +} + /* Transfers file attributes from a struct dentry to a `stat' buffer. */ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) { @@ -203,11 +221,16 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) stbuf->st_gid = getgid(); /* Use the size of the unnamed (default) file stream. */ - if ((lte = dentry_lte(dentry))) { - if (lte->staging_file_name) { + lte = dentry_unnamed_lte_resolved(dentry); + if (lte) { + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + wimlib_assert(lte->staging_file_name); struct stat native_stat; - if (stat(lte->staging_file_name, &native_stat) != 0) + if (stat(lte->staging_file_name, &native_stat) != 0) { + DEBUG("Failed to stat `%s': %m", + lte->staging_file_name); return -errno; + } stbuf->st_size = native_stat.st_size; } else { stbuf->st_size = lte->resource_entry.original_size; @@ -216,9 +239,9 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) stbuf->st_size = 0; } - stbuf->st_atime = ms_timestamp_to_unix(dentry->last_access_time); - stbuf->st_mtime = ms_timestamp_to_unix(dentry->last_write_time); - stbuf->st_ctime = ms_timestamp_to_unix(dentry->creation_time); + stbuf->st_atime = wim_timestamp_to_unix(dentry->last_access_time); + stbuf->st_mtime = wim_timestamp_to_unix(dentry->last_write_time); + stbuf->st_ctime = wim_timestamp_to_unix(dentry->creation_time); stbuf->st_blocks = (stbuf->st_size + 511) / 512; return 0; } @@ -239,7 +262,7 @@ static int create_staging_file(char **name_ret, int open_flags) int fd; int errno_save; - name_len = staging_dir_name_len + 1 + WIM_HASH_SIZE; + name_len = staging_dir_name_len + 1 + SHA1_HASH_SIZE; name = MALLOC(name_len + 1); if (!name) { errno = ENOMEM; @@ -251,7 +274,7 @@ static int create_staging_file(char **name_ret, int open_flags) memcpy(name, staging_dir_name, staging_dir_name_len); name[staging_dir_name_len] = '/'; randomize_char_array_with_alnum(name + staging_dir_name_len + 1, - WIM_HASH_SIZE); + SHA1_HASH_SIZE); name[name_len] = '\0'; @@ -420,8 +443,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, return -errno; if (old_lte) - ret = extract_resource_to_fd(w, &old_lte->resource_entry, fd, - size); + ret = extract_wim_resource_to_fd(old_lte, fd, size); else ret = 0; if (ret != 0 || close(fd) != 0) { @@ -482,8 +504,11 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, } new_lte->resource_entry.original_size = size; new_lte->refcnt = link_group_size; - randomize_byte_array(new_lte->hash, WIM_HASH_SIZE); + random_hash(new_lte->hash); + if (new_lte->staging_file_name) + FREE(new_lte->staging_file_name); new_lte->staging_file_name = staging_file_name; + new_lte->resource_location = RESOURCE_IN_STAGING_FILE; lookup_table_insert(w->lookup_table, new_lte); list_add(&new_lte->staging_list, &staging_list); @@ -733,6 +758,8 @@ static int close_lte_fds(struct lookup_table_entry *lte) { for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) { if (lte->fds[i] && lte->fds[i]->staging_fd != -1) { + wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE); + wimlib_assert(lte->staging_file_name); if (close(lte->fds[i]->staging_fd) != 0) { ERROR_WITH_ERRNO("Failed close file `%s'", lte->staging_file_name); @@ -768,19 +795,22 @@ static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, } -static int calculate_sha1sum_of_staging_file(struct lookup_table_entry *lte, - struct lookup_table *table) +static int update_lte_of_staging_file(struct lookup_table_entry *lte, + struct lookup_table *table) { struct lookup_table_entry *duplicate_lte; int ret; - u8 hash[WIM_HASH_SIZE]; + u8 hash[SHA1_HASH_SIZE]; + struct stat stbuf; + + wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE); + wimlib_assert(lte->staging_file_name); ret = sha1sum(lte->staging_file_name, hash); if (ret != 0) return ret; lookup_table_unlink(table, lte); - memcpy(lte->hash, hash, WIM_HASH_SIZE); duplicate_lte = __lookup_resource(table, hash); @@ -789,11 +819,20 @@ static int calculate_sha1sum_of_staging_file(struct lookup_table_entry *lte, lte_list_change_lte_ptr(lte, duplicate_lte); duplicate_lte->refcnt += lte->refcnt; - list_splice(&duplicate_lte->lte_group_list, - <e->lte_group_list); + list_splice(<e->lte_group_list, + &duplicate_lte->lte_group_list); free_lookup_table_entry(lte); } else { + if (stat(lte->staging_file_name, &stbuf) != 0) { + ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name); + return WIMLIB_ERR_STAT; + } + wimlib_assert(<e->file_on_disk == <e->staging_file_name); + lte->resource_location = RESOURCE_IN_FILE_ON_DISK; + copy_hash(lte->hash, hash); + lte->resource_entry.original_size = stbuf.st_size; + lte->resource_entry.size = stbuf.st_size; lookup_table_insert(table, lte); } @@ -818,7 +857,7 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity) * lookup table entries. */ DEBUG("Calculating SHA1 checksums for all new staging files."); list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) { - ret = calculate_sha1sum_of_staging_file(lte, w->lookup_table); + ret = update_lte_of_staging_file(lte, w->lookup_table); if (ret != 0) return ret; } @@ -944,17 +983,54 @@ static int wimfs_ftruncate(const char *path, off_t size, */ static int wimfs_getattr(const char *path, struct stat *stbuf) { - struct dentry *dentry = get_dentry(w, path); - if (!dentry) - return -ENOENT; + const char *stream_name; + char *p = NULL; + struct dentry *dentry; + int ret; + + ret = lookup_resource(w, path, + get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); + if (ret != 0) + return ret; return dentry_to_stbuf(dentry, stbuf); } +/* Read an alternate data stream through the XATTR interface, or get its size */ static int wimfs_getxattr(const char *path, const char *name, char *value, size_t size) { - /* XXX */ - return -ENOTSUP; + int ret; + struct dentry *dentry; + struct ads_entry *ads_entry; + size_t res_size; + struct lookup_table_entry *lte; + + if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + return -ENOTSUP; + + if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) + return -ENOATTR; + name += 5; + + dentry = get_dentry(w, path); + if (!dentry) + return -ENOENT; + ads_entry = dentry_get_ads_entry(dentry, name); + if (!ads_entry) + return -ENOATTR; + + lte = ads_entry->lte; + res_size = wim_resource_size(lte); + + if (size == 0) + return res_size; + if (res_size > size) + return -ERANGE; + ret = read_full_wim_resource(lte, value); + if (ret != 0) + return -EIO; + return res_size; } /* Create a hard link */ @@ -1011,8 +1087,35 @@ static int wimfs_link(const char *to, const char *from) static int wimfs_listxattr(const char *path, char *list, size_t size) { - /* XXX */ - return -ENOTSUP; + struct dentry *dentry; + int ret; + char *p = list; + size_t needed_size; + unsigned i; + if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + return -ENOTSUP; + + /* List alternate data streams, or get the list size */ + + ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL); + if (ret != 0) + return ret; + if (size == 0) { + needed_size = 0; + for (i = 0; i < dentry->num_ads; i++) + needed_size += dentry->ads_entries[i].stream_name_utf8_len + 6; + return needed_size; + } else { + for (i = 0; i < dentry->num_ads; i++) { + needed_size = dentry->ads_entries[i].stream_name_utf8_len + 6; + if (needed_size > size) + return -ERANGE; + p += sprintf(p, "user.%s", + dentry->ads_entries[i].stream_name_utf8) + 1; + size -= needed_size; + } + return p - list; + } } /* @@ -1039,6 +1142,7 @@ static int wimfs_mkdir(const char *path, mode_t mode) newdir = new_dentry(basename); newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY; newdir->resolved = true; + newdir->hard_link = next_link_group_id++; link_dentry(newdir, parent); return 0; } @@ -1048,12 +1152,17 @@ static int wimfs_mkdir(const char *path, mode_t mode) static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) { const char *stream_name; + const char *file_name; if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS) && (stream_name = path_stream_name(path))) { /* Make an alternate data stream */ struct ads_entry *new_entry; struct dentry *dentry; + char *p = (char*)stream_name - 1; + wimlib_assert(*p == ':'); + *p = '\0'; + dentry = get_dentry(w, path); if (!dentry || !dentry_is_regular_file(dentry)) return -ENOENT; @@ -1138,13 +1247,14 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) * directly from the WIM file if we are opening it read-only, * but we need to extract the resource to the staging directory * if we are opening it writable. */ - if (flags_writable(fi->flags) && !lte->staging_file_name) { + if (flags_writable(fi->flags) && + lte->resource_location != RESOURCE_IN_STAGING_FILE) { ret = extract_resource_to_staging_dir(dentry, stream_idx, <e, lte->resource_entry.original_size); if (ret != 0) return ret; } - if (lte->staging_file_name) { + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { fd->staging_fd = open(lte->staging_file_name, fi->flags); if (fd->staging_fd == -1) { close_wimlib_fd(fd); @@ -1188,9 +1298,10 @@ static int wimfs_read(const char *path, char *buf, size_t size, wimlib_assert(fd->lte); - if (fd->lte->staging_file_name) { + if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) { /* Read from staging file */ + wimlib_assert(fd->lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); ssize_t ret; @@ -1205,22 +1316,16 @@ static int wimfs_read(const char *path, char *buf, size_t size, } else { /* Read from WIM */ - struct resource_entry *res_entry; - int ctype; + const struct resource_entry *res_entry; res_entry = &fd->lte->resource_entry; - ctype = wim_resource_compression_type(w, res_entry); - if (offset > res_entry->original_size) return -EOVERFLOW; size = min(size, res_entry->original_size - offset); - if (read_resource(w->fp, res_entry->size, - res_entry->original_size, - res_entry->offset, ctype, size, - offset, buf) != 0) + if (read_wim_resource(fd->lte, buf, size, offset, false) != 0) return -EIO; return size; } @@ -1281,7 +1386,7 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi) } if (flags_writable(fi->flags) && fd->dentry) { - u64 now = get_timestamp(); + u64 now = get_wim_timestamp(); fd->dentry->last_access_time = now; fd->dentry->last_write_time = now; } @@ -1300,10 +1405,28 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi) return 0; } +/* Remove an alternate data stream through the XATTR interface */ static int wimfs_removexattr(const char *path, const char *name) { - /* XXX */ - return -ENOTSUP; + struct dentry *dentry; + struct ads_entry *ads_entry; + int ret; + if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + return -ENOTSUP; + + if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) + return -ENOATTR; + name += 5; + + dentry = get_dentry(w, path); + if (!dentry) + return -ENOENT; + + ads_entry = dentry_get_ads_entry(dentry, name); + if (!ads_entry) + return -ENOATTR; + remove_ads(dentry, ads_entry, w->lookup_table); + return 0; } /* Renames a file or directory. See rename (3) */ @@ -1392,11 +1515,70 @@ static int wimfs_rmdir(const char *path) return 0; } +/* Write an alternate data stream through the XATTR interface */ static int wimfs_setxattr(const char *path, const char *name, const char *value, size_t size, int flags) { - /* XXX */ - return -ENOTSUP; + struct dentry *dentry; + struct ads_entry *existing_ads_entry; + struct ads_entry *new_ads_entry; + struct lookup_table_entry *existing_lte; + struct lookup_table_entry *lte; + u8 value_hash[SHA1_HASH_SIZE]; + int ret; + int fd; + + if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + return -ENOTSUP; + + if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) + return -ENOATTR; + name += 5; + + dentry = get_dentry(w, path); + if (!dentry) + return -ENOENT; + existing_ads_entry = dentry_get_ads_entry(dentry, name); + if (existing_ads_entry) { + if (flags & XATTR_CREATE) + return -EEXIST; + remove_ads(dentry, existing_ads_entry, w->lookup_table); + } else { + if (flags & XATTR_REPLACE) + return -ENOATTR; + } + new_ads_entry = dentry_add_ads(dentry, name); + if (!new_ads_entry) + return -ENOMEM; + + sha1_buffer(value, size, value_hash); + + existing_lte = __lookup_resource(w->lookup_table, value_hash); + + if (existing_lte) { + lte = existing_lte; + lte->refcnt++; + } else { + char *value_copy; + lte = new_lookup_table_entry(); + if (!lte) + return -ENOMEM; + value_copy = MALLOC(size); + if (!value_copy) { + FREE(lte); + return -ENOMEM; + } + memcpy(value_copy, value, size); + lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER; + lte->attached_buffer = value_copy; + lte->resource_entry.original_size = size; + lte->resource_entry.size = size; + lte->resource_entry.flags = 0; + copy_hash(lte->hash, value_hash); + lookup_table_insert(w->lookup_table, lte); + } + new_ads_entry->lte = lte; + return 0; } static int wimfs_symlink(const char *to, const char *from) @@ -1421,15 +1603,17 @@ static int wimfs_symlink(const char *to, const char *from) dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + dentry->hard_link = next_link_group_id++; if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0) goto out_free_dentry; + wimlib_assert(lte); + dentry->ads_entries[1].lte_group_list.type = STREAM_TYPE_ADS; list_add(&dentry->ads_entries[1].lte_group_list.list, <e->lte_group_list); - dentry->ads_entries[1].lte = lte; - dentry->resolved = true; + wimlib_assert(dentry->resolved); link_dentry(dentry, dentry_parent); return 0; @@ -1492,13 +1676,8 @@ static int wimfs_unlink(const char *path) remove_dentry(dentry, w->lookup_table); } else { /* We are removing an alternate data stream. */ - struct ads_entry *ads_entry; - - ads_entry = &dentry->ads_entries[stream_idx - 1]; - lte = lte_decrement_refcnt(lte, w->lookup_table); - if (lte) - list_del(&ads_entry->lte_group_list.list); - dentry_remove_ads(dentry, ads_entry); + remove_ads(dentry, &dentry->ads_entries[stream_idx - 1], + w->lookup_table); } /* Beware: The lookup table entry(s) may still be referenced by users * that have opened the corresponding streams. They are freed later in @@ -1506,20 +1685,28 @@ static int wimfs_unlink(const char *path) return 0; } -/* Change the timestamp on a file dentry. +/* + * Change the timestamp on a file dentry. * - * There is no distinction between a file and its alternate data streams here. */ + * Note that alternate data streams do not have their own timestamps. + */ static int wimfs_utimens(const char *path, const struct timespec tv[2]) { struct dentry *dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - time_t last_access_t = (tv[0].tv_nsec == UTIME_NOW) ? - time(NULL) : tv[0].tv_sec; - dentry->last_access_time = unix_timestamp_to_ms(last_access_t); - time_t last_mod_t = (tv[1].tv_nsec == UTIME_NOW) ? - time(NULL) : tv[1].tv_sec; - dentry->last_write_time = unix_timestamp_to_ms(last_mod_t); + if (tv[0].tv_nsec != UTIME_OMIT) { + if (tv[0].tv_nsec == UTIME_NOW) + dentry->last_access_time = get_wim_timestamp(); + else + dentry->last_access_time = timespec_to_wim_timestamp(&tv[0]); + } + if (tv[1].tv_nsec != UTIME_OMIT) { + if (tv[1].tv_nsec == UTIME_NOW) + dentry->last_write_time = get_wim_timestamp(); + else + dentry->last_write_time = timespec_to_wim_timestamp(&tv[1]); + } return 0; } @@ -1580,6 +1767,46 @@ static struct fuse_operations wimfs_operations = { }; +static int check_lte_refcnt(struct lookup_table_entry *lte, void *ignore) +{ + size_t lte_group_size = 0; + struct list_head *cur; + list_for_each(cur, <e->lte_group_list) + lte_group_size++; + if (lte_group_size > lte->refcnt) { +#ifdef ENABLE_ERROR_MESSAGES + struct dentry *example_dentry; + struct list_head *next; + struct stream_list_head *head; + WARNING("The following lookup table entry has a reference count " + "of %u, but", lte->refcnt); + WARNING("We found %u references to it", lte_group_size); + next = lte->lte_group_list.next; + head = container_of(next, struct stream_list_head, list); + if (head->type == STREAM_TYPE_NORMAL) { + example_dentry = container_of(head, struct dentry, + lte_group_list); + WARNING("(One dentry referencing it is at `%s')", + example_dentry->full_path_utf8); + } + print_lookup_table_entry(lte); +#endif + /* Guess what! install.wim for Windows 8 contains a stream with + * 2 dentries referencing it, but the lookup table entry has + * reference count of 1. So we will need to handle this case + * and not just make it be an error... I'm just setting the + * reference count to the number of references we found. */ + + #if 1 + lte->refcnt = lte_group_size; + WARNING("Fixing reference count"); + #else + return WIMLIB_ERR_INVALID_DENTRY; + #endif + } + return 0; +} + /* Mounts a WIM file. */ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, int flags) @@ -1602,12 +1829,16 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, DEBUG("Selected image %d", image); - next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt); + next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt); /* Resolve all the lookup table entries of the dentry tree */ for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes, wim->lookup_table); + ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL); + if (ret != 0) + return ret; + if (flags & WIMLIB_MOUNT_FLAG_READWRITE) wim_get_current_image_metadata(wim)->modified = true; @@ -1627,7 +1858,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, if (!p) return WIMLIB_ERR_NOMEM; - argv[argc++] = "mount"; + argv[argc++] = "imagex"; argv[argc++] = p; argv[argc++] = "-s"; /* disable multi-threaded operation */ @@ -1762,7 +1993,10 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) * filesystem daemon has crashed or failed for some reason. * * XXX come up with some method to determine if the filesystem - * daemon has really crashed or not. */ + * daemon has really crashed or not. + * + * XXX Idea: have mount daemon write its PID into the WIM file header? + * */ gettimeofday(&now, NULL); timeout.tv_sec = now.tv_sec + 600;