X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=8022423c98c52dc2796ed5244ef1f616ffc7b82f;hp=a25758110d80bf25d29ca9f07ef6602bbb710194;hb=8f2b2ae78181c9ba6b107df623c514cadce602bb;hpb=50ae56edcc3938f5183ddfc8910de2df5774eaf6

diff --git a/src/wim.c b/src/wim.c
index a2575811..8022423c 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -65,15 +65,11 @@ static WIMStruct *
 new_wim_struct()
 {
 	WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
-	if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) {
-		ERROR_WITH_ERRNO("Failed to initialize mutex");
-		FREE(w);
-		w = NULL;
+	if (w) {
+		w->in_fd = -1;
+		w->out_fd = -1;
 	}
-#endif
 	return w;
-
 }
 
 /*
@@ -201,7 +197,7 @@ select_wim_image(WIMStruct *w, int image)
 	}
 	w->current_image = image;
 	imd = wim_get_current_image_metadata(w);
-	if (imd->root_dentry) {
+	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
 		#ifdef ENABLE_DEBUG
@@ -294,6 +290,8 @@ wimlib_print_wim_information(const WIMStruct *w)
 		wim_info_get_total_bytes(w->wim_info));
 	tprintf(T("Integrity Info: %"TS"\n"),
 		(w->hdr.integrity.offset != 0) ? T("yes") : T("no"));
+	tprintf(T("Relative path junction: %"TS"\n"),
+		(hdr->flags & WIM_HDR_FLAG_RP_FIX) ? T("yes") : T("no"));
 	tputchar(T('\n'));
 }
 
@@ -386,6 +384,37 @@ wimlib_get_boot_idx(const WIMStruct *w)
 	return w->hdr.boot_idx;
 }
 
+static int
+do_open_wim(const tchar *filename, int *fd_ret)
+{
+	int fd;
+
+	fd = topen(filename, O_RDONLY | O_BINARY);
+	if (fd == -1) {
+		ERROR_WITH_ERRNO("Can't open \"%"TS"\" read-only", filename);
+		return WIMLIB_ERR_OPEN;
+	}
+	*fd_ret = fd;
+	return 0;
+}
+
+int
+reopen_wim(WIMStruct *w)
+{
+	wimlib_assert(w->in_fd == -1);
+	return do_open_wim(w->filename, &w->in_fd);
+}
+
+int
+close_wim(WIMStruct *w)
+{
+	if (w->in_fd != -1) {
+		close(w->in_fd);
+		w->in_fd = -1;
+	}
+	return 0;
+}
+
 /*
  * Begins the reading of a WIM file; opens the file and reads its header and
  * lookup table, and optionally checks the integrity.
@@ -399,12 +428,9 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 
 	DEBUG("Reading the WIM file `%"TS"'", in_wim_path);
 
-	w->fp = tfopen(in_wim_path, T("rb"));
-	if (!w->fp) {
-		ERROR_WITH_ERRNO("Failed to open `%"TS"' for reading",
-				 in_wim_path);
-		return WIMLIB_ERR_OPEN;
-	}
+	ret = do_open_wim(in_wim_path, &w->in_fd);
+	if (ret)
+		return ret;
 
 	/* The absolute path to the WIM is requested so that wimlib_overwrite()
 	 * still works even if the process changes its working directory.  This
@@ -427,7 +453,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 			return WIMLIB_ERR_OPEN;
 	}
 
-	ret = read_header(w->fp, &w->hdr, open_flags);
+	ret = read_header(w->filename, w->in_fd, &w->hdr, open_flags);
 	if (ret)
 		return ret;
 
@@ -470,7 +496,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 	if (ret)
 		return ret;
 
-	ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, &w->wim_info);
+	ret = read_xml_data(w->in_fd, &w->hdr.xml_res_entry, &w->wim_info);
 	if (ret)
 		return ret;
 
@@ -645,20 +671,10 @@ wimlib_free(WIMStruct *w)
 
 	if (!w)
 		return;
-	if (w->fp)
-		fclose(w->fp);
-	if (w->out_fp)
-		fclose(w->out_fp);
-
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
-	if (w->fp_tab) {
-		for (size_t i = 0; i < w->num_allocated_fps; i++)
-			if (w->fp_tab[i])
-				fclose(w->fp_tab[i]);
-		FREE(w->fp_tab);
-	}
-	pthread_mutex_destroy(&w->fp_tab_mutex);
-#endif
+	if (w->in_fd != -1)
+		close(w->in_fd);
+	if (w->out_fd != -1)
+		close(w->out_fd);
 
 	free_lookup_table(w->lookup_table);