imagex_info(): Do not call wimlib_print_wim_information()

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index 15f68d1aa9fb1c330836f25975e176796efb3f3d..34eefedf36fa45f8d14f1bebe01499227d109de4 100644 (file)
--- 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_wim_dentry *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
@@ -2369,6 +2399,38 @@ 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, WIMStruct *wim)
+{
+       struct wimlib_wim_info info;
+
+       wimlib_get_wim_info((WIMStruct*)wim, &info);
+
+       tputs(T("WIM Information:"));
+       tputs(T("----------------"));
+       tprintf(T("Path:           %"TS"\n"), wimfile);
+       tfputs(T("GUID:           0x"), stdout);
+       print_byte_field(info.guid, WIMLIB_GUID_LEN);
+       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'));
+}
+
 /* 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
@@ -2512,7 +2574,7 @@ imagex_info(int argc, tchar **argv)
                }
 
                if (image == WIMLIB_ALL_IMAGES && short_header)
-                       wimlib_print_wim_information(w);
+                       print_wim_information(wimfile, w);
 
                if (header)
                        wimlib_print_header(w);