X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fiterate_dir.c;h=c9de38cf1f118591400c4d0ebed669f6e4aa74fe;hb=8df639463ae0c754d2b1af3d6c1d22e59ee3ccf8;hp=5bf138cc49e33c1da83ec9fbf9c922b29d2e474f;hpb=681faad85f738a5ef1fc81c1dbe93c9b7d57ece4;p=wimlib diff --git a/src/iterate_dir.c b/src/iterate_dir.c index 5bf138cc..c9de38cf 100644 --- a/src/iterate_dir.c +++ b/src/iterate_dir.c @@ -91,12 +91,12 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry, const struct wim_inode_stream *strm; struct wimlib_unix_data unix_data; - ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes, + ret = utf16le_get_tstr(dentry->d_name, dentry->d_name_nbytes, &wdentry->filename, &dummy); if (ret) return ret; - ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes, + ret = utf16le_get_tstr(dentry->d_short_name, dentry->d_short_name_nbytes, &wdentry->dos_name, &dummy); if (ret) return ret; @@ -109,7 +109,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry, for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->d_parent) wdentry->depth++; - if (inode->i_security_id >= 0) { + if (inode_has_security_descriptor(inode)) { struct wim_security_data *sd; sd = wim_get_current_security_data(wim);