X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=eeb7093cb806e4e2a5927ddf28eabc044bb36cfa;hp=15f68d1aa9fb1c330836f25975e176796efb3f3d;hb=c78bad31163cdefdf3f97e199c4f19bd8a9ad0a2;hpb=d7e9b0e74f324400a4bbbe5e66d25b1d6d75625c

diff --git a/programs/imagex.c b/programs/imagex.c
index 15f68d1a..eeb7093c 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -125,7 +125,7 @@ IMAGEX_PROGNAME" delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check] [--soft
 ),
 [DIR] =
 T(
-IMAGEX_PROGNAME" dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n"
+IMAGEX_PROGNAME" dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH]\n"
 ),
 [EXPORT] =
 T(
@@ -221,6 +221,7 @@ enum {
 	IMAGEX_METADATA_OPTION,
 	IMAGEX_NORPFIX_OPTION,
 	IMAGEX_NO_ACLS_OPTION,
+	IMAGEX_PATH_OPTION,
 	IMAGEX_REBUILD_OPTION,
 	IMAGEX_RECOMPRESS_OPTION,
 	IMAGEX_RECURSIVE_OPTION,
@@ -279,6 +280,11 @@ static const struct option delete_options[] = {
 	{NULL, 0, NULL, 0},
 };
 
+static const struct option dir_options[] = {
+	{T("path"), required_argument, NULL, IMAGEX_PATH_OPTION},
+	{NULL, 0, NULL, 0},
+};
+
 static const struct option export_options[] = {
 	{T("boot"),       no_argument,       NULL, IMAGEX_BOOT_OPTION},
 	{T("check"),      no_argument,       NULL, IMAGEX_CHECK_OPTION},
@@ -1968,56 +1974,80 @@ out:
 	return ret;
 }
 
+static int
+print_full_path(const struct wimlib_dir_entry *wdentry, void *_ignore)
+{
+	int ret = tprintf(T("%"TS"\n"), wdentry->full_path);
+	return (ret >= 0) ? 0 : -1;
+}
+
 /* Print the files contained in an image(s) in a WIM file. */
 static int
 imagex_dir(int argc, tchar **argv)
 {
 	const tchar *wimfile;
-	WIMStruct *w;
+	WIMStruct *wim = NULL;
 	int image;
 	int ret;
-	int num_images;
+	const tchar *path = T("");
+	int c;
 
-	if (argc < 2) {
+	for_opt(c, dir_options) {
+		switch (c) {
+		case IMAGEX_PATH_OPTION:
+			path = optarg;
+			break;
+		default:
+			goto out_usage;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1) {
 		imagex_error(T("Must specify a WIM file"));
-		usage(DIR);
-		return -1;
+		goto out_usage;
 	}
-	if (argc > 3) {
+	if (argc > 2) {
 		imagex_error(T("Too many arguments"));
-		usage(DIR);
-		return -1;
+		goto out_usage;
 	}
 
-	wimfile = argv[1];
-	ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &w,
+	wimfile = argv[0];
+	ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &wim,
 			      imagex_progress_func);
-	if (ret != 0)
-		return ret;
+	if (ret)
+		goto out;
 
-	if (argc == 3) {
-		image = wimlib_resolve_image(w, argv[2]);
-		ret = verify_image_exists(image, argv[2], wimfile);
-		if (ret != 0)
-			goto out;
+	if (argc == 2) {
+		image = wimlib_resolve_image(wim, argv[1]);
+		ret = verify_image_exists(image, argv[1], wimfile);
+		if (ret)
+			goto out_wimlib_free;
 	} else {
 		/* Image was not specified.  If the WIM only contains one image,
 		 * choose that one; otherwise, print an error. */
-		num_images = wimlib_get_num_images(w);
+		int num_images = wimlib_get_num_images(wim);
 		if (num_images != 1) {
 			imagex_error(T("\"%"TS"\" contains %d images; Please "
 				       "select one."), wimfile, num_images);
-			usage(DIR);
-			ret = -1;
-			goto out;
+			wimlib_free(wim);
+			goto out_usage;
 		}
 		image = 1;
 	}
 
-	ret = wimlib_print_files(w, image);
+	ret = wimlib_iterate_dir_tree(wim, image, path,
+				      WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE,
+				      print_full_path, NULL);
+out_wimlib_free:
+	wimlib_free(wim);
 out:
-	wimlib_free(w);
 	return ret;
+out_usage:
+	usage(DIR);
+	ret = -1;
+	goto out;
 }
 
 /* Exports one, or all, images from a WIM file to a new WIM file or an existing
@@ -2126,11 +2156,11 @@ imagex_export(int argc, tchar **argv)
 			goto out;
 		}
 	} else {
-		wim_is_new = true;
 		/* dest_wimfile is not an existing file, so create a new WIM. */
-		if (!compression_type_specified)
-			compression_type = wimlib_get_compression_type(src_w);
 		if (errno == ENOENT) {
+			wim_is_new = true;
+			if (!compression_type_specified)
+				compression_type = wimlib_get_compression_type(src_w);
 			ret = wimlib_create_new_wim(compression_type, &dest_w);
 			if (ret != 0)
 				goto out;
@@ -2369,6 +2399,76 @@ out_usage:
 	goto out;
 }
 
+static void print_byte_field(const uint8_t field[], size_t len)
+{
+	while (len--)
+		tprintf(T("%02hhx"), *field++);
+}
+
+static void
+print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info)
+{
+	tputs(T("WIM Information:"));
+	tputs(T("----------------"));
+	tprintf(T("Path:           %"TS"\n"), wimfile);
+	tprintf(T("GUID:           0x"));
+	print_byte_field(info->guid, sizeof(info->guid));
+	tputchar(T('\n'));
+	tprintf(T("Image Count:    %d\n"), info->image_count);
+	tprintf(T("Compression:    %"TS"\n"),
+		wimlib_get_compression_type_string(info->compression_type));
+	tprintf(T("Part Number:    %d/%d\n"), info->part_number, info->total_parts);
+	tprintf(T("Boot Index:     %d\n"), info->boot_index);
+	tprintf(T("Size:           %"PRIu64" bytes\n"), info->total_bytes);
+	tprintf(T("Integrity Info: %"TS"\n"),
+		info->has_integrity_table ? T("yes") : T("no"));
+	tprintf(T("Relative path junction: %"TS"\n"),
+		info->has_rpfix ? T("yes") : T("no"));
+	tputchar(T('\n'));
+}
+
+static int
+print_resource(const struct wimlib_resource_entry *resource,
+	       void *_ignore)
+{
+
+	tprintf(T("Uncompressed size   = %"PRIu64" bytes\n"),
+		resource->uncompressed_size);
+
+	tprintf(T("Compressed size     = %"PRIu64" bytes\n"),
+		resource->compressed_size);
+
+	tprintf(T("Offset              = %"PRIu64" bytes\n"),
+		resource->offset);
+
+
+	tprintf(T("Part Number         = %u\n"), resource->part_number);
+	tprintf(T("Reference Count     = %u\n"), resource->reference_count);
+
+	tprintf(T("Hash                = 0x"));
+	print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash));
+	tputchar(T('\n'));
+
+	tprintf(T("Flags               = "));
+	if (resource->is_compressed)
+		tprintf(T("WIM_RESHDR_FLAG_COMPRESSED  "));
+	if (resource->is_metadata)
+		tprintf(T("WIM_RESHDR_FLAG_METADATA  "));
+	if (resource->is_free)
+		tprintf(T("WIM_RESHDR_FLAG_FREE  "));
+	if (resource->is_spanned)
+		tprintf(T("WIM_RESHDR_FLAG_SPANNED  "));
+	tputchar(T('\n'));
+	tputchar(T('\n'));
+	return 0;
+}
+
+static void
+print_lookup_table(WIMStruct *wim)
+{
+	wimlib_iterate_lookup_table(wim, 0, print_resource, NULL);
+}
+
 /* Prints information about a WIM file; also can mark an image as bootable,
  * change the name of an image, or change the description of an image. */
 static int
@@ -2392,9 +2492,7 @@ imagex_info(int argc, tchar **argv)
 	int image;
 	int ret;
 	int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
-	int part_number;
-	int total_parts;
-	int num_images;
+	struct wimlib_wim_info info;
 
 	for_opt(c, info_options) {
 		switch (c) {
@@ -2455,7 +2553,7 @@ imagex_info(int argc, tchar **argv)
 	if (ret != 0)
 		return ret;
 
-	part_number = wimlib_get_part_number(w, &total_parts);
+	wimlib_get_wim_info(w, &info);
 
 	image = wimlib_resolve_image(w, image_num_or_name);
 	if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) {
@@ -2470,9 +2568,7 @@ imagex_info(int argc, tchar **argv)
 		goto out;
 	}
 
-	num_images = wimlib_get_num_images(w);
-
-	if (num_images == 0) {
+	if (info.image_count == 0) {
 		if (boot) {
 			imagex_error(T("--boot is meaningless on a WIM with no "
 				       "images"));
@@ -2481,7 +2577,7 @@ imagex_info(int argc, tchar **argv)
 		}
 	}
 
-	if (image == WIMLIB_ALL_IMAGES && num_images > 1) {
+	if (image == WIMLIB_ALL_IMAGES && info.image_count > 1) {
 		if (boot) {
 			imagex_error(T("Cannot specify the --boot flag "
 				       "without specifying a specific "
@@ -2512,18 +2608,18 @@ imagex_info(int argc, tchar **argv)
 		}
 
 		if (image == WIMLIB_ALL_IMAGES && short_header)
-			wimlib_print_wim_information(w);
+			print_wim_information(wimfile, &info);
 
 		if (header)
 			wimlib_print_header(w);
 
 		if (lookup_table) {
-			if (total_parts != 1) {
-				tprintf(T("Warning: Only showing the lookup table "
-					  "for part %d of a %d-part WIM.\n"),
-					part_number, total_parts);
+			if (info.total_parts != 1) {
+				tfprintf(stderr, T("Warning: Only showing the lookup table "
+						   "for part %d of a %d-part WIM.\n"),
+					 info.part_number, info.total_parts);
 			}
-			wimlib_print_lookup_table(w);
+			print_lookup_table(w);
 		}
 
 		if (xml) {
@@ -2584,7 +2680,8 @@ imagex_info(int argc, tchar **argv)
 			} else {
 				tprintf(T("Marking image %d as bootable.\n"),
 					image);
-				ret = wimlib_set_boot_idx(w, image);
+				info.boot_index = image;
+				ret = wimlib_set_wim_info(w, &info, WIMLIB_CHANGE_BOOT_INDEX);
 				if (ret)
 					goto out;
 			}