X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fextract.c;h=0029aa88016097b161ac515f61ffbbacf3c27cff;hb=3519f882f1b44ef45d9f9c5762b53d0c8f8da55a;hp=40e3296484a18fcbef0d0e624bfcd6117d8f24e0;hpb=bb980160a4e612af0e46b4b69f06acd7b4adffe2;p=wimlib

diff --git a/src/extract.c b/src/extract.c
index 40e32964..0029aa88 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -95,10 +95,49 @@
 int
 do_file_extract_progress(struct apply_ctx *ctx, enum wimlib_progress_msg msg)
 {
-	ctx->count_until_file_progress = 512;  /* Arbitrary value to limit calls  */
+	ctx->count_until_file_progress = 500;  /* Arbitrary value to limit calls  */
 	return extract_progress(ctx, msg);
 }
 
+static int
+start_file_phase(struct apply_ctx *ctx, uint64_t end_file_count, enum wimlib_progress_msg msg)
+{
+	ctx->progress.extract.current_file_count = 0;
+	ctx->progress.extract.end_file_count = end_file_count;
+	return do_file_extract_progress(ctx, msg);
+}
+
+int
+start_file_structure_phase(struct apply_ctx *ctx, uint64_t end_file_count)
+{
+	return start_file_phase(ctx, end_file_count, WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE);
+}
+
+int
+start_file_metadata_phase(struct apply_ctx *ctx, uint64_t end_file_count)
+{
+	return start_file_phase(ctx, end_file_count, WIMLIB_PROGRESS_MSG_EXTRACT_METADATA);
+}
+
+static int
+end_file_phase(struct apply_ctx *ctx, enum wimlib_progress_msg msg)
+{
+	ctx->progress.extract.current_file_count = ctx->progress.extract.end_file_count;
+	return do_file_extract_progress(ctx, msg);
+}
+
+int
+end_file_structure_phase(struct apply_ctx *ctx)
+{
+	return end_file_phase(ctx, WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE);
+}
+
+int
+end_file_metadata_phase(struct apply_ctx *ctx)
+{
+	return end_file_phase(ctx, WIMLIB_PROGRESS_MSG_EXTRACT_METADATA);
+}
+
 /* Check whether the extraction of a dentry should be skipped completely.  */
 static bool
 dentry_is_supported(struct wim_dentry *dentry,
@@ -269,7 +308,7 @@ load_streams_from_pipe(struct apply_ctx *ctx,
 	}
 	ret = 0;
 out:
-	if (found_lte->resource_location != RESOURCE_IN_WIM)
+	if (found_lte && found_lte->resource_location != RESOURCE_IN_WIM)
 		FREE(rspec);
 	free_lookup_table_entry(found_lte);
 	return ret;
@@ -1041,23 +1080,43 @@ ref_stream(struct wim_lookup_table_entry *lte, u32 stream_idx,
 }
 
 static int
-dentry_ref_streams(struct wim_dentry *dentry, struct apply_ctx *ctx)
+ref_unnamed_stream(struct wim_dentry *dentry, struct apply_ctx *ctx)
 {
 	struct wim_inode *inode = dentry->d_inode;
 	int ret;
+	u16 stream_idx;
+	struct wim_lookup_table_entry *stream;
 
-	/* The unnamed data stream will always be extracted, except in an
-	 * unlikely case.  */
-	if (!inode_is_encrypted_directory(inode)) {
-		u16 stream_idx;
-		struct wim_lookup_table_entry *stream;
+	if (unlikely(inode_is_encrypted_directory(inode)))
+		return 0;
 
-		stream = inode_unnamed_stream_resolved(inode, &stream_idx);
-		ret = ref_stream(stream, stream_idx, dentry, ctx);
-		if (ret)
-			return ret;
+	if (unlikely(ctx->apply_ops->will_externally_back)) {
+		ret = (*ctx->apply_ops->will_externally_back)(dentry, ctx);
+		if (ret >= 0) {
+			if (ret) /* Error */
+				return ret;
+			/* Will externally back */
+			return 0;
+		}
+		/* Won't externally back */
 	}
 
+	stream = inode_unnamed_stream_resolved(inode, &stream_idx);
+	return ref_stream(stream, stream_idx, dentry, ctx);
+}
+
+static int
+dentry_ref_streams(struct wim_dentry *dentry, struct apply_ctx *ctx)
+{
+	struct wim_inode *inode = dentry->d_inode;
+	int ret;
+
+	/* The unnamed data stream will almost always be extracted, but there
+	 * exist cases in which it won't be.  */
+	ret = ref_unnamed_stream(dentry, ctx);
+	if (ret)
+		return ret;
+
 	/* Named data streams will be extracted only if supported in the current
 	 * extraction mode and volume, and to avoid complications, if not doing
 	 * a linked extraction.  */
@@ -1394,6 +1453,7 @@ extract_trees(WIMStruct *wim, struct wim_dentry **trees, size_t num_trees,
 	}
 	INIT_LIST_HEAD(&ctx->stream_list);
 	filedes_invalidate(&ctx->tmpfile_fd);
+	ctx->apply_ops = ops;
 
 	ret = (*ops->get_supported_features)(target, &ctx->supported_features);
 	if (ret)
@@ -1481,23 +1541,20 @@ out:
 static int
 mkdir_if_needed(const tchar *target)
 {
-	struct stat stbuf;
-	if (tstat(target, &stbuf)) {
-		if (errno == ENOENT) {
-			if (tmkdir(target, 0755)) {
-				ERROR_WITH_ERRNO("Failed to create directory "
-						 "\"%"TS"\"", target);
-				return WIMLIB_ERR_MKDIR;
-			}
-		} else {
-			ERROR_WITH_ERRNO("Failed to stat \"%"TS"\"", target);
-			return WIMLIB_ERR_STAT;
-		}
-	} else if (!S_ISDIR(stbuf.st_mode)) {
-		ERROR("\"%"TS"\" is not a directory", target);
-		return WIMLIB_ERR_NOTDIR;
-	}
-	return 0;
+	if (!tmkdir(target, 0755))
+		return 0;
+
+	if (errno == EEXIST)
+		return 0;
+
+#ifdef __WIN32__
+	/* _wmkdir() fails with EACCES if called on a drive root directory.  */
+	if (errno == EACCES)
+		return 0;
+#endif
+
+	ERROR_WITH_ERRNO("Failed to create directory \"%"TS"\"", target);
+	return WIMLIB_ERR_MKDIR;
 }
 
 /* Make sure the extraction flags make sense, and update them if needed.  */