X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=280f7f541f46f8e3ceae71693a2711b07afec938;hb=90fea9104d865060051c81b3fbaa0281281f43b7;hp=421db26b0d9a6e6f3321d8ccccd19711dacb5ffa;hpb=f62ed8ae0312228f797398e462a132a7cfa319d7;p=wimlib

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 421db26b..280f7f54 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -21,6 +21,8 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#ifdef __WIN32__
+
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
@@ -357,7 +359,7 @@ dentry_extraction_path_length(const struct wim_dentry *dentry)
 	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  */
@@ -426,8 +428,8 @@ build_extraction_path(const struct wim_dentry *dentry,
 	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);
@@ -1342,7 +1344,9 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream,
 					    &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;
@@ -1357,7 +1361,7 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream,
 
 	/* 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;
 	}
 
@@ -1467,7 +1471,13 @@ skip_nt_toplevel_component(const wchar_t *path, size_t path_nchars)
 
 /* 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)
 {
@@ -1480,7 +1490,7 @@ 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'\\');
@@ -1529,14 +1539,18 @@ try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, struct win32_apply_ctx *ctx)
 
 	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
@@ -2077,3 +2091,5 @@ const struct apply_operations win32_apply_ops = {
 	.extract                = win32_extract,
 	.context_size           = sizeof(struct win32_apply_ctx),
 };
+
+#endif /* __WIN32__ */