* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
+#ifdef __WIN32__
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
d = dentry;
do {
len += d->d_extraction_name_nchars + 1;
- d = d->parent;
+ d = d->d_parent;
} while (!dentry_is_root(d) && will_extract_dentry(d));
return --len; /* No leading slash */
ctx->pathbuf.Length = len * sizeof(wchar_t);
p = ctx->pathbuf.Buffer + len;
for (d = dentry;
- !dentry_is_root(d->parent) && will_extract_dentry(d->parent);
- d = d->parent)
+ !dentry_is_root(d->d_parent) && will_extract_dentry(d->d_parent);
+ d = d->d_parent)
{
p -= d->d_extraction_name_nchars;
wmemcpy(p, d->d_extraction_name, d->d_extraction_name_nchars);
&info, ctx->common.progctx);
FREE(dentry->_full_path);
dentry->_full_path = NULL;
- return ret;
+ if (ret)
+ return ret;
+ /* Go on and open the file for normal extraction. */
} else {
FREE(dentry->_full_path);
dentry->_full_path = NULL;
/* Too many open handles? */
if (ctx->num_open_handles == MAX_OPEN_HANDLES) {
- ERROR("Too many open handles!");
+ ERROR("Can't extract data: too many open files!");
return WIMLIB_ERR_UNSUPPORTED;
}
/* Given a Windows NT namespace path, such as \??\e:\Windows\System32, return a
* pointer to the suffix of the path that is device-relative, such as
- * Windows\System32. */
+ * Windows\System32.
+ *
+ * The path has an explicit length and is not necessarily null terminated.
+ *
+ * If the path just something like \??\e: then the returned pointer will point
+ * just past the colon; in this case the length of the result will be 0
+ * characters. */
static const wchar_t *
get_device_relative_path(const wchar_t *path, size_t path_nchars)
{
path = wmemchr(path, L'\\', (end - path));
if (!path)
- return orig_path;
+ return end;
do {
path++;
} while (path != end && *path == L'\\');
target_ntpath_nchars = ctx->target_ntpath.Length / sizeof(wchar_t);
- fixed_subst_name_nchars = target_ntpath_nchars + 1 + relpath_nchars;
+ fixed_subst_name_nchars = target_ntpath_nchars;
+ if (relpath_nchars)
+ fixed_subst_name_nchars += 1 + relpath_nchars;
wchar_t fixed_subst_name[fixed_subst_name_nchars];
wmemcpy(fixed_subst_name, ctx->target_ntpath.Buffer,
target_ntpath_nchars);
- fixed_subst_name[target_ntpath_nchars] = L'\\';
- wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1],
- relpath, relpath_nchars);
+ if (relpath_nchars) {
+ fixed_subst_name[target_ntpath_nchars] = L'\\';
+ wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1],
+ relpath, relpath_nchars);
+ }
/* Doesn't need to be null-terminated. */
/* Print name should be Win32, but not all NT names can even be
.extract = win32_extract,
.context_size = sizeof(struct win32_apply_ctx),
};
+
+#endif /* __WIN32__ */