]> wimlib.net Git - wimlib/blobdiff - programs/imagex.c
git://wimlib.net / wimlib / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
imagex options
[wimlib] / programs / imagex.c
diff --git a/programs/imagex.c b/programs/imagex.c
index 8afccd1da8c6c6dd29d447e7bddcdb7259d8a965..d41964a22ba384b9bd514b3c7209c8eae8546df9 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -82,14 +82,14 @@ static const char *usage_strings[] = {
 [APPEND] = 
 "    imagex append (DIRECTORY | NTFS_VOLUME) WIMFILE [\"IMAGE_NAME\"]\n"
 "                  [\"DESCRIPTION\"] [--boot] [--check] [--flags EDITIONID]\n"
-"                  [--dereference] [--config=FILE]\n",
+"                  [--verbose] [--dereference] [--config=FILE]\n",
 [APPLY] = 
 "    imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n"
 "                 (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
 "                 [--symlink] [--verbose]\n",
 [CAPTURE] = 
 "    imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [\"IMAGE_NAME\"]\n"
-"                   [\"DESCRIPTION\"] [--boot] [--check] [--compress[=TYPE]]\n"
+"                   [\"DESCRIPTION\"] [--boot] [--check] [--compress=TYPE]\n"
 "                   [--flags \"EditionID\"] [--verbose] [--dereference]\n"
 "                   [--config=FILE]\n",
 [DELETE] = 
@@ -98,8 +98,9 @@ static const char *usage_strings[] = {
 "    imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | \"all\")\n",
 [EXPORT] = 
 "    imagex export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
-"        DEST_WIMFILE [\"DEST_IMAGE_NAME\"] [\"DEST_IMAGE_DESCRIPTION\"]\n"
-"                  [--boot] [--check] [--compress[=TYPE]]\n",
+"                  DEST_WIMFILE [\"DEST_IMAGE_NAME\"]\n"
+"                  [\"DEST_IMAGE_DESCRIPTION\"] [--boot] [--check]\n"
+"                  [--compress=TYPE]\n",
 [INFO] = 
 "    imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n"
 "                [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n"
@@ -108,12 +109,12 @@ static const char *usage_strings[] = {
 "    imagex join [--check] WIMFILE SPLIT_WIM...\n",
 [MOUNT] = 
 "    imagex mount WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n"
-"                 [--check] [--debug] [--stream-interface=INTERFACE]\n",
+"                 [--check] [--debug] [--streams-interface=INTERFACE]\n",
 [MOUNTRW] = 
 "    imagex mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n"
-"                   [--check] [--debug] [--stream-interface=INTERFACE]\n",
+"                   [--check] [--debug] [--streams-interface=INTERFACE]\n",
 [SPLIT] = 
-"    imagex split WIMFILE SPLIT_WIMFILE PART_SIZE [--check]\n",
+"    imagex split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n",
 [UNMOUNT] = 
 "    imagex unmount DIRECTORY [--commit] [--check]\n",
 };
@@ -125,11 +126,12 @@ static const struct option common_options[] = {
 };
 
 static const struct option append_options[] = {
-       {"boot",   no_argument,       NULL, 'b'},
-       {"check",  no_argument,       NULL, 'c'},
-       {"flags",    required_argument, NULL, 'f'},
-       {"dereference", no_argument, NULL, 'L'},
-       {"config", required_argument, NULL, 'C'},
+       {"boot",        no_argument,       NULL, 'b'},
+       {"check",       no_argument,       NULL, 'c'},
+       {"config",      required_argument, NULL, 'C'},
+       {"dereference", no_argument,       NULL, 'L'},
+       {"flags",       required_argument, NULL, 'f'},
+       {"verbose",     no_argument,       NULL, 'v'},
        {NULL, 0, NULL, 0},
 };
 static const struct option apply_options[] = {
@@ -140,13 +142,13 @@ static const struct option apply_options[] = {
        {NULL, 0, NULL, 0},
 };
 static const struct option capture_options[] = {
-       {"boot",     no_argument,       NULL, 'b'},
-       {"check",    no_argument,       NULL, 'c'},
-       {"compress", optional_argument, NULL, 'x'},
-       {"flags",    required_argument, NULL, 'f'},
-       {"verbose",  no_argument,       NULL,'v'},
-       {"dereference", no_argument, NULL, 'L'},
-       {"config", required_argument, NULL, 'C'},
+       {"boot",        no_argument,       NULL, 'b'},
+       {"check",       no_argument,       NULL, 'c'},
+       {"compress",    required_argument, NULL, 'x'},
+       {"config",      required_argument, NULL, 'C'},
+       {"dereference", no_argument,       NULL, 'L'},
+       {"flags",       required_argument, NULL, 'f'},
+       {"verbose",     no_argument,       NULL, 'v'},
        {NULL, 0, NULL, 0},
 };
 static const struct option delete_options[] = {
@@ -155,20 +157,20 @@ static const struct option delete_options[] = {
 };
 
 static const struct option export_options[] = {
-       {"boot",       no_argument, NULL, 'b'},
-       {"check",      no_argument , NULL, 'c'},
-       {"compress",   optional_argument, NULL, 'x'},
+       {"boot",       no_argument,       NULL, 'b'},
+       {"check",      no_argument,       NULL, 'c'},
+       {"compress",   required_argument, NULL, 'x'},
        {NULL, 0, NULL, 0},
 };
 
 static const struct option info_options[] = {
        {"boot",         no_argument, NULL, 'b'},
        {"check",        no_argument, NULL, 'c'},
+       {"extract-xml",  required_argument, NULL, 'X'},
        {"header",       no_argument, NULL, 'h'},
        {"lookup-table", no_argument, NULL, 'l'},
-       {"xml",          no_argument, NULL, 'x'},
-       {"extract-xml",  required_argument, NULL, 'X'},
        {"metadata",     no_argument, NULL, 'm'},
+       {"xml",          no_argument, NULL, 'x'},
        {NULL, 0, NULL, 0},
 };
 
@@ -180,7 +182,7 @@ static const struct option join_options[] = {
 static const struct option mount_options[] = {
        {"check", no_argument, NULL, 'c'},
        {"debug", no_argument, NULL, 'd'},
-       {"stream-interface", required_argument, NULL, 's'},
+       {"streams-interface", required_argument, NULL, 's'},
        {NULL, 0, NULL, 0},
 };
 
@@ -282,8 +284,6 @@ static int verify_image_exists_and_is_single(int image)
 
 static int get_compression_type(const char *optarg)
 {
-       if (!optarg)
-               return WIM_COMPRESSION_TYPE_XPRESS;
        if (strcasecmp(optarg, "maximum") == 0 || strcasecmp(optarg, "lzx") == 0)
                return WIM_COMPRESSION_TYPE_LZX;
        else if (strcasecmp(optarg, "fast") == 0 || strcasecmp(optarg, "xpress") == 0)
@@ -352,6 +352,7 @@ static int imagex_append(int argc, const char **argv)
        size_t config_len = 0;
        WIMStruct *w;
        int ret;
+       int cur_image;
 
        for_opt(c, append_options) {
                switch (c) {
@@ -371,6 +372,9 @@ static int imagex_append(int argc, const char **argv)
                case 'L':
                        add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
                        break;
+               case 'v':
+                       add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+                       break;
                default:
                        usage(APPEND);
                        return -1;
@@ -407,8 +411,7 @@ static int imagex_append(int argc, const char **argv)
                        printf("Capturing WIM image NTFS filesystem on `%s'\n",
                               ntfs_device);
                        ret = wimlib_add_image_from_ntfs_volume(w, ntfs_device,
-                                                               name, desc,
-                                                               flags_element,
+                                                               name,
                                                                config_str,
                                                                config_len,
                                                                add_image_flags);
@@ -419,13 +422,23 @@ static int imagex_append(int argc, const char **argv)
                        imagex_error_with_errno("Failed to stat `%s'", dir);
        }
 #endif
-       ret = wimlib_add_image(w, dir, name, desc, 
-                              flags_element, config_str, config_len,
+       ret = wimlib_add_image(w, dir, name, config_str, config_len,
                               add_image_flags);
 
 out_write:
        if (ret != 0)
                goto out;
+       cur_image = wimlib_get_num_images(w);
+       if (desc) {
+               ret = wimlib_set_image_descripton(w, cur_image, desc);
+               if (ret != 0)
+                       goto out;
+       }
+       if (flags_element) {
+               ret = wimlib_set_image_flags(w, cur_image, flags_element);
+               if (ret != 0)
+                       goto out;
+       }
        ret = wimlib_overwrite(w, write_flags);
 out:
        wimlib_free(w);
@@ -542,6 +555,7 @@ static int imagex_capture(int argc, const char **argv)
        const char *config_str = NULL;
        size_t config_len = 0;
        WIMStruct *w;
+       int cur_image;
        int ret;
 
        for_opt(c, capture_options) {
@@ -607,8 +621,7 @@ static int imagex_capture(int argc, const char **argv)
                        printf("Capturing WIM image NTFS filesystem on `%s'\n",
                               ntfs_device);
                        ret = wimlib_add_image_from_ntfs_volume(w, ntfs_device,
-                                                               name, desc,
-                                                               flags_element,
+                                                               name,
                                                                config_str,
                                                                config_len,
                                                                add_image_flags);
@@ -619,7 +632,7 @@ static int imagex_capture(int argc, const char **argv)
                        imagex_error_with_errno("Failed to stat `%s'", dir);
        }
 #endif
-       ret = wimlib_add_image(w, dir, name, desc, flags_element, config_str,
+       ret = wimlib_add_image(w, dir, name, config_str,
                               config_len, add_image_flags);
 
 out_write:
@@ -627,6 +640,17 @@ out_write:
                imagex_error("Failed to add the image `%s'", dir);
                goto out;
        }
+       cur_image = wimlib_get_num_images(w);
+       if (desc) {
+               ret = wimlib_set_image_descripton(w, cur_image, desc);
+               if (ret != 0)
+                       goto out;
+       }
+       if (flags_element) {
+               ret = wimlib_set_image_flags(w, cur_image, flags_element);
+               if (ret != 0)
+                       goto out;
+       }
 
        ret = wimlib_write(w, wimfile, WIM_ALL_IMAGES, write_flags);
        if (ret != 0)
wimlib repository