X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fhardlink.c;h=f6752ff4603ef37d8d07f388d383f0b6dd22cffd;hb=985a3a9191a07b8def58315afa5a88e71cf9f1d4;hp=c7c5a2f28ecb6437cd1eab1f7acafac3f6ed278b;hpb=062465170ddb4520ca6fbc64a0f6e27e786de101;p=wimlib diff --git a/src/hardlink.c b/src/hardlink.c index c7c5a2f2..f6752ff4 100644 --- a/src/hardlink.c +++ b/src/hardlink.c @@ -159,11 +159,6 @@ inode_ref_streams(struct wim_inode *inode) } } -void -inode_add_link(struct wim_inode *inode, struct wim_dentry *dentry) -{ -} - /* Given a directory entry with the name @name for the file with the inode * number @ino and device number @devno, create a new WIM dentry with an * associated inode, where the inode is shared if an inode with the same @ino @@ -173,25 +168,32 @@ inode_add_link(struct wim_inode *inode, struct wim_dentry *dentry) */ int inode_table_new_dentry(struct wim_inode_table *table, const tchar *name, - u64 ino, u64 devno, struct wim_dentry **dentry_ret) + u64 ino, u64 devno, bool noshare, + struct wim_dentry **dentry_ret) { struct wim_dentry *dentry; struct wim_inode *inode; int ret; - ret = new_dentry(name, &dentry); - if (ret) - return ret; - - inode = inode_table_get_inode(table, ino, devno); - if (!inode) { - free_dentry(dentry); - return WIMLIB_ERR_NOMEM; + if (noshare) { + ret = new_dentry_with_timeless_inode(name, &dentry); + if (ret) + return ret; + list_add_tail(&dentry->d_inode->i_list, &table->extra_inodes); + } else { + ret = new_dentry(name, &dentry); + if (ret) + return ret; + inode = inode_table_get_inode(table, ino, devno); + if (!inode) { + free_dentry(dentry); + return WIMLIB_ERR_NOMEM; + } + if (inode->i_nlink > 1) + inode_ref_streams(inode); + dentry->d_inode = inode; + inode_add_dentry(dentry, inode); } - if (inode->i_nlink > 1) - inode_ref_streams(inode); - dentry->d_inode = inode; - inode_add_dentry(dentry, inode); *dentry_ret = dentry; return 0; } @@ -202,7 +204,7 @@ print_inode_dentries(const struct wim_inode *inode) { struct wim_dentry *dentry; inode_for_each_dentry(dentry, inode) - print_dentry_full_path(dentry, NULL); + tfprintf(stderr, T("%"TS"\n"), dentry_full_path(dentry)); } #endif @@ -556,5 +558,6 @@ inode_table_prepare_inode_list(struct wim_inode_table *table, } INIT_HLIST_HEAD(&table->array[i]); } + list_splice_tail(&table->extra_inodes, head); table->num_entries = 0; }