X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmodify.c;h=3180c507a71116f88a23a1b7682673d6dbec281f;hb=0541069de2f74283d44ebb02372b60fb608795f2;hp=775312c6b92b714dcd58729fca4dc32e4dab0e4a;hpb=26fdf3f709adf52521e1cf962095987a3e0e2e00;p=wimlib diff --git a/src/modify.c b/src/modify.c index 775312c6..3180c507 100644 --- a/src/modify.c +++ b/src/modify.c @@ -32,6 +32,7 @@ #include "dentry.h" #include "xml.h" #include "lookup_table.h" +#include "timestamp.h" #include #include #include @@ -44,15 +45,18 @@ * the WIM image. */ #define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 -void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt) +void destroy_image_metadata(struct image_metadata *imd, + struct lookup_table *table) { - free_dentry_tree(imd->root_dentry, lt); + free_dentry_tree(imd->root_dentry, table); free_security_data(imd->security_data); /* Get rid of the lookup table entry for this image's metadata resource * */ - if (lt) - lookup_table_remove(lt, imd->metadata_lte); + if (table) { + lookup_table_unlink(table, imd->metadata_lte); + free_lookup_table_entry(imd->metadata_lte); + } } /* @@ -100,6 +104,7 @@ static int build_dentry_tree(struct dentry **root_ret, int (*stat_fn)(const char *restrict, struct stat *restrict); struct dentry *root; const char *filename; + struct inode *inode; if (exclude_path(root_disk_path, config, true)) { if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) { @@ -149,11 +154,70 @@ static int build_dentry_tree(struct dentry **root_ret, if (!root) return WIMLIB_ERR_NOMEM; - stbuf_to_inode(&root_stbuf, root->d_inode); + inode = root->d_inode; + + inode->creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim); + inode->last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim); + inode->last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim); + if (sizeof(ino_t) >= 8) + inode->ino = (u64)root_stbuf.st_ino; + else + inode->ino = (u64)root_stbuf.st_ino | + ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63)); + add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - root->d_inode->resolved = true; + inode->resolved = true; + + if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */ + + struct lookup_table_entry *lte; + u8 hash[SHA1_HASH_SIZE]; + + inode->attributes = FILE_ATTRIBUTE_NORMAL; + + /* Empty files do not have to have a lookup table entry. */ + if (root_stbuf.st_size == 0) + goto out; + + /* For each regular file, we must check to see if the file is in + * the lookup table already; if it is, we increment its refcnt; + * otherwise, we create a new lookup table entry and insert it. + * */ + + ret = sha1sum(root_disk_path, hash); + if (ret != 0) + goto out; + + lte = __lookup_resource(lookup_table, hash); + if (lte) { + lte->refcnt++; + DEBUG("Add lte reference %u for `%s'", lte->refcnt, + root_disk_path); + } else { + char *file_on_disk = STRDUP(root_disk_path); + if (!file_on_disk) { + ERROR("Failed to allocate memory for file path"); + ret = WIMLIB_ERR_NOMEM; + goto out; + } + lte = new_lookup_table_entry(); + if (!lte) { + FREE(file_on_disk); + ret = WIMLIB_ERR_NOMEM; + goto out; + } + lte->file_on_disk = file_on_disk; + lte->resource_location = RESOURCE_IN_FILE_ON_DISK; + lte->resource_entry.original_size = root_stbuf.st_size; + lte->resource_entry.size = root_stbuf.st_size; + copy_hash(lte->hash, hash); + lookup_table_insert(lookup_table, lte); + } + root->d_inode->lte = lte; + } else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */ + + inode->attributes = FILE_ATTRIBUTE_DIRECTORY; - if (dentry_is_directory(root)) { /* Archiving a directory */ DIR *dir; struct dirent *p; struct dentry *child; @@ -196,13 +260,23 @@ static int build_dentry_tree(struct dentry **root_ret, if (ret != 0) break; if (child) - link_dentry(child, root); + dentry_add_child(root, child); } closedir(dir); - } else if (dentry_is_symlink(root)) { /* Archiving a symbolic link */ + } else { /* Archiving a symbolic link */ + inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT; + inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + + /* The idea here is to call readlink() to get the UNIX target of + * the symbolic link, then turn the target into a reparse point + * data buffer that contains a relative or absolute symbolic + * link (NOT a junction point or *full* path symbolic link with + * drive letter). + */ + char deref_name_buf[4096]; ssize_t deref_name_len; - + deref_name_len = readlink(root_disk_path, deref_name_buf, sizeof(deref_name_buf) - 1); if (deref_name_len >= 0) { @@ -210,55 +284,27 @@ static int build_dentry_tree(struct dentry **root_ret, DEBUG("Read symlink `%s'", deref_name_buf); ret = inode_set_symlink(root->d_inode, deref_name_buf, lookup_table, NULL); + if (ret == 0) { + /* + * Unfortunately, Windows seems to have the + * concept of "file" symbolic links as being + * different from "directory" symbolic links... + * so FILE_ATTRIBUTE_DIRECTORY needs to be set + * on the symbolic link if the *target* of the + * symbolic link is a directory. + */ + struct stat stbuf; + if (stat(root_disk_path, &stbuf) == 0 && + S_ISDIR(stbuf.st_mode)) + { + inode->attributes |= FILE_ATTRIBUTE_DIRECTORY; + } + } } else { ERROR_WITH_ERRNO("Failed to read target of " "symbolic link `%s'", root_disk_path); ret = WIMLIB_ERR_READLINK; } - } else { /* Archiving a regular file */ - - struct lookup_table_entry *lte; - u8 hash[SHA1_HASH_SIZE]; - - /* Empty files do not have to have a lookup table entry. */ - if (root_stbuf.st_size == 0) - goto out; - - /* For each regular file, we must check to see if the file is in - * the lookup table already; if it is, we increment its refcnt; - * otherwise, we create a new lookup table entry and insert it. - * */ - - ret = sha1sum(root_disk_path, hash); - if (ret != 0) - goto out; - - lte = __lookup_resource(lookup_table, hash); - if (lte) { - lte->refcnt++; - DEBUG("Add lte reference %u for `%s'", lte->refcnt, - root_disk_path); - } else { - char *file_on_disk = STRDUP(root_disk_path); - if (!file_on_disk) { - ERROR("Failed to allocate memory for file path"); - ret = WIMLIB_ERR_NOMEM; - goto out; - } - lte = new_lookup_table_entry(); - if (!lte) { - FREE(file_on_disk); - ret = WIMLIB_ERR_NOMEM; - goto out; - } - lte->file_on_disk = file_on_disk; - lte->resource_location = RESOURCE_IN_FILE_ON_DISK; - lte->resource_entry.original_size = root_stbuf.st_size; - lte->resource_entry.size = root_stbuf.st_size; - copy_hash(lte->hash, hash); - lookup_table_insert(lookup_table, lte); - } - root->d_inode->lte = lte; } out: if (ret == 0) @@ -300,7 +346,7 @@ static int allocate_lte_if_needed(struct dentry *dentry, void *arg) dest_lte = clone_lookup_table_entry(src_lte); if (!dest_lte) return WIMLIB_ERR_NOMEM; - list_add_tail(&dest_lte->list, lte_list_head); + list_add_tail(&dest_lte->staging_list, lte_list_head); } } } @@ -348,7 +394,8 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg) next = lte_list_head->next; list_del(next); - dest_lte = container_of(next, struct lookup_table_entry, list); + dest_lte = container_of(next, struct lookup_table_entry, + staging_list); dest_lte->part_number = 1; dest_lte->refcnt = 1; wimlib_assert(hashes_equal(dest_lte->hash, src_lte->hash)); @@ -389,7 +436,7 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, if (!imd) { ERROR("Failed to allocate memory for new image metadata array"); - return WIMLIB_ERR_NOMEM; + goto err; } memcpy(imd, w->image_metadata, @@ -397,7 +444,7 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, metadata_lte = new_lookup_table_entry(); if (!metadata_lte) - goto out_free_imd; + goto err_free_imd; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; random_hash(metadata_lte->hash); @@ -420,10 +467,9 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, ret = select_wim_image(w, w->hdr.image_count); wimlib_assert(ret == 0); return ret; -out_free_metadata_lte: - FREE(metadata_lte); -out_free_imd: +err_free_imd: FREE(imd); +err: return WIMLIB_ERR_NOMEM; } @@ -590,7 +636,7 @@ out_xml_delete_image: out_free_ltes: { struct lookup_table_entry *lte, *tmp; - list_for_each_entry_safe(lte, tmp, &wims.lte_list_head, list) + list_for_each_entry_safe(lte, tmp, &wims.lte_list_head, staging_list) free_lookup_table_entry(lte); } @@ -657,6 +703,8 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) /* Remove the image from the XML information. */ xml_delete_image(&w->wim_info, image); + + w->deletion_occurred = true; return 0; } @@ -760,7 +808,7 @@ static int init_capture_config(const char *_config_str, size_t config_len, ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; goto out_destroy; } - + next_p = eol + 1; bytes_remaining -= (next_p - p); if (eol == p) @@ -969,6 +1017,9 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, sd->refcnt = 1; DEBUG("Building dentry tree."); + if (flags & WIMLIB_ADD_IMAGE_FLAG_SHOW_PROGRESS) { + printf("Scanning `%s'...\n", dir); + } ret = (*capture_tree)(&root_dentry, dir, w->lookup_table, sd, &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT, extra_arg);