X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=c1a5adb62aa095417b3b74874385c96456dfa86e;hp=e80bbe94a4d2e65f0b23cc0b8ce4ee96c94d53fb;hb=6a84b7d59aa7cc0509ac870e5cbf122c5d755781;hpb=8b709192cd2811b83c248fbe61ca4f11ee9de797

diff --git a/src/extract.c b/src/extract.c
index e80bbe94..c1a5adb6 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1073,12 +1073,14 @@ static void
 inode_tally_features(const struct wim_inode *inode,
 		     struct wim_features *features)
 {
-	if (inode->i_attributes & FILE_ATTRIBUTE_ARCHIVE)
-		features->archive_files++;
+	if (inode->i_attributes & FILE_ATTRIBUTE_READONLY)
+		features->readonly_files++;
 	if (inode->i_attributes & FILE_ATTRIBUTE_HIDDEN)
 		features->hidden_files++;
 	if (inode->i_attributes & FILE_ATTRIBUTE_SYSTEM)
 		features->system_files++;
+	if (inode->i_attributes & FILE_ATTRIBUTE_ARCHIVE)
+		features->archive_files++;
 	if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED)
 		features->compressed_files++;
 	if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) {
@@ -1156,9 +1158,11 @@ do_feature_check(const struct wim_features *required_features,
 
 	/* File attributes.  */
 	if (!(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ATTRIBUTES)) {
-		/* Note: Don't bother the user about FILE_ATTRIBUTE_ARCHIVE.
-		 * We're an archive program, so theoretically we can do what we
-		 * want with it.  */
+
+		if (required_features->readonly_files &&
+		    !supported_features->readonly_files)
+			WARNING("Ignoring FILE_ATTRIBUTE_READONLY of %lu files",
+				required_features->readonly_files);
 
 		if (required_features->hidden_files &&
 		    !supported_features->hidden_files)
@@ -1170,6 +1174,10 @@ do_feature_check(const struct wim_features *required_features,
 			WARNING("Ignoring FILE_ATTRIBUTE_SYSTEM of %lu files",
 				required_features->system_files);
 
+		/* Note: Don't bother the user about FILE_ATTRIBUTE_ARCHIVE.
+		 * We're an archive program, so theoretically we can do what we
+		 * want with it.  */
+
 		if (required_features->compressed_files &&
 		    !supported_features->compressed_files)
 			WARNING("Ignoring FILE_ATTRIBUTE_COMPRESSED of %lu files",
@@ -1386,12 +1394,12 @@ extract_trees(WIMStruct *wim, struct wim_dentry **trees, size_t num_trees,
 		 * subtract <HARDLINKBYTES> from this if hard links are
 		 * supported by the extraction mode.)  */
 		ctx->progress.extract.total_bytes =
-			wim_info_get_image_total_bytes(wim->wim_info,
-						       wim->current_image);
+			xml_get_image_total_bytes(wim->xml_info,
+						  wim->current_image);
 		if (ctx->supported_features.hard_links) {
 			ctx->progress.extract.total_bytes -=
-				wim_info_get_image_hard_link_bytes(wim->wim_info,
-								   wim->current_image);
+				xml_get_image_hard_link_bytes(wim->xml_info,
+							      wim->current_image);
 		}
 	}
 
@@ -1699,7 +1707,8 @@ image_name_ok_as_dir(const tchar *image_name)
 	return image_name && *image_name &&
 		!tstrpbrk(image_name, filename_forbidden_chars) &&
 		tstrcmp(image_name, T(".")) &&
-		tstrcmp(image_name, T(".."));
+		tstrcmp(image_name, T("..")) &&
+		tstrlen(image_name) <= 128;
 }
 
 /* Extracts all images from the WIM to the directory @target, with the images
@@ -1707,9 +1716,8 @@ image_name_ok_as_dir(const tchar *image_name)
 static int
 extract_all_images(WIMStruct *wim, const tchar *target, int extract_flags)
 {
-	size_t image_name_max_len = max(xml_get_max_image_name_len(wim), 20);
 	size_t output_path_len = tstrlen(target);
-	tchar buf[output_path_len + 1 + image_name_max_len + 1];
+	tchar buf[output_path_len + 1 + 128 + 1];
 	int ret;
 	int image;
 	const tchar *image_name;
@@ -1865,7 +1873,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 		if (ret)
 			goto out_wimlib_free;
 
-		if (wim_info_get_num_images(pwm->wim_info) != pwm->hdr.image_count) {
+		if (xml_get_image_count(pwm->xml_info) != pwm->hdr.image_count) {
 			ERROR("Image count in XML data is not the same as in WIM header.");
 			ret = WIMLIB_ERR_IMAGE_COUNT;
 			goto out_wimlib_free;
@@ -1929,6 +1937,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 			goto out_wimlib_free;
 		wim_reshdr_to_desc_and_blob(&reshdr, pwm, metadata_rdesc,
 					    imd->metadata_blob);
+		pwm->refcnt++;
 
 		if (i == image) {
 			/* Metadata resource is for the image being extracted.
@@ -1936,7 +1945,6 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 			ret = read_metadata_resource(imd);
 			if (ret)
 				goto out_wimlib_free;
-			imd->modified = 1;
 		} else {
 			/* Metadata resource is not for the image being
 			 * extracted.  Skip over it.  */