/*
* Copyright (C) 2013 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#include "wimlib/paths.h"
#include "wimlib/security.h"
#include "wimlib/timestamp.h"
+#include "wimlib/unix_data.h"
#include "wimlib/util.h"
#include "wimlib/wim.h"
static int
-init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
- struct wim_dentry *dentry,
- const WIMStruct *wim,
- int flags)
+init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
+ WIMStruct *wim, int flags)
{
int ret;
size_t dummy;
const struct wim_inode *inode = dentry->d_inode;
struct wim_lookup_table_entry *lte;
const u8 *hash;
+ struct wimlib_unix_data unix_data;
+
+ ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes,
+ &wdentry->filename, &dummy);
+ if (ret)
+ return ret;
+
+ ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes,
+ &wdentry->dos_name, &dummy);
+ if (ret)
+ return ret;
-#if TCHAR_IS_UTF16LE
- wdentry->filename = dentry->file_name;
- wdentry->dos_name = dentry->short_name;
-#else
- if (dentry_has_long_name(dentry)) {
- ret = utf16le_to_tstr(dentry->file_name,
- dentry->file_name_nbytes,
- (tchar**)&wdentry->filename,
- &dummy);
- if (ret)
- return ret;
- }
- if (dentry_has_short_name(dentry)) {
- ret = utf16le_to_tstr(dentry->short_name,
- dentry->short_name_nbytes,
- (tchar**)&wdentry->dos_name,
- &dummy);
- if (ret)
- return ret;
- }
-#endif
ret = calculate_dentry_full_path(dentry);
if (ret)
return ret;
wdentry->full_path = dentry->_full_path;
- for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->parent)
+ for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->d_parent)
wdentry->depth++;
if (inode->i_security_id >= 0) {
- const struct wim_security_data *sd = wim_const_security_data(wim);
+ struct wim_security_data *sd;
+
+ sd = wim_get_current_security_data(wim);
wdentry->security_descriptor = sd->descriptors[inode->i_security_id];
wdentry->security_descriptor_size = sd->sizes[inode->i_security_id];
}
wdentry->creation_time = wim_timestamp_to_timespec(inode->i_creation_time);
wdentry->last_write_time = wim_timestamp_to_timespec(inode->i_last_write_time);
wdentry->last_access_time = wim_timestamp_to_timespec(inode->i_last_access_time);
+ if (inode_get_unix_data(inode, &unix_data)) {
+ wdentry->unix_uid = unix_data.uid;
+ wdentry->unix_gid = unix_data.gid;
+ wdentry->unix_mode = unix_data.mode;
+ wdentry->unix_rdev = unix_data.rdev;
+ }
lte = inode_unnamed_lte(inode, wim->lookup_table);
if (lte) {
}
for (unsigned i = 0; i < inode->i_num_ads; i++) {
- if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+ if (!inode->i_ads_entries[i].stream_name_nbytes)
continue;
lte = inode_stream_lte(inode, i + 1, wim->lookup_table);
wdentry->num_named_streams++;
wdentry->streams[
wdentry->num_named_streams].resource.is_missing = 1;
}
- #if TCHAR_IS_UTF16LE
- wdentry->streams[wdentry->num_named_streams].stream_name =
- inode->i_ads_entries[i].stream_name;
- #else
+
size_t dummy;
- ret = utf16le_to_tstr(inode->i_ads_entries[i].stream_name,
- inode->i_ads_entries[i].stream_name_nbytes,
- (tchar**)&wdentry->streams[
- wdentry->num_named_streams].stream_name,
- &dummy);
+ ret = utf16le_get_tstr(inode->i_ads_entries[i].stream_name,
+ inode->i_ads_entries[i].stream_name_nbytes,
+ &wdentry->streams[
+ wdentry->num_named_streams].stream_name,
+ &dummy);
if (ret)
return ret;
- #endif
}
return 0;
}
static void
free_wimlib_dentry(struct wimlib_dir_entry *wdentry)
{
-#if !TCHAR_IS_UTF16LE
- FREE((tchar*)wdentry->filename);
- FREE((tchar*)wdentry->dos_name);
+ utf16le_put_tstr(wdentry->filename);
+ utf16le_put_tstr(wdentry->dos_name);
for (unsigned i = 1; i <= wdentry->num_named_streams; i++)
- FREE((tchar*)wdentry->streams[i].stream_name);
-#endif
+ utf16le_put_tstr(wdentry->streams[i].stream_name);
FREE(wdentry);
}