X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=fc89cdfe036aec38146f5dee6464b1d3f54a82d8;hp=5a068528b83e889334a5868ceabb7e145a599555;hb=e03410487e77ea4aa8af8ebcf279f4ccbcd9ccba;hpb=3efd3c749f6cef737951769ace2fc802d8d8e61c diff --git a/programs/imagex.c b/programs/imagex.c index 5a068528..fc89cdfe 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -27,15 +27,12 @@ #include #include #include +#include #include #include +#include #include -#ifdef WITH_NTFS_3G -#include -#include -#endif - #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0])) #define swap(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \ @@ -60,43 +57,32 @@ enum imagex_op_type { UNMOUNT, }; -static const char *path_basename(const char *path) -{ - const char *p = path; - while (*p) - p++; - p--; - - /* Trailing slashes. */ - while ((p != path - 1) && *p == '/') - p--; - - while ((p != path - 1) && *p != '/') - p--; - - return p + 1; -} - +static void usage(int cmd_type); +static void usage_all(); static const char *usage_strings[] = { [APPEND] = -" imagex append DIRECTORY WIMFILE [\"IMAGE_NAME\"] [\"DESCRIPTION\"] [--boot]\n" -" [--check] [--flags EDITIONID] [--dereference]\n", +" imagex append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" +" [DESCRIPTION] [--boot] [--check] [--flags EDITION_ID]\n" +" [--verbose] [--dereference] [--config=FILE]\n", [APPLY] = -" imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all] DIRECTORY [--check]\n" -" [--hardlink] [--symlink] [--verbose]\n", +" imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n" +" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" +" [--symlink] [--verbose] [--ref=\"GLOB\"]\n", [CAPTURE] = -" imagex capture DIRECTORY WIMFILE [\"IMAGE_NAME\"] [\"DESCRIPTION\"]\n" -" l [--boot] [--check] [--compress[=TYPE]]\n" -" [--flags \"EditionID\"] [--verbose] [--dereference]\n", +" imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" +" [DESCRIPTION] [--boot] [--check] [--compress=TYPE]\n" +" [--flags EDITION_ID] [--verbose] [--dereference]\n" +" [--config=FILE]\n", [DELETE] = " imagex delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n", [DIR] = -" imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | \"all\")\n", +" 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] [--ref=\"GLOB\"]\n", [INFO] = " imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" " [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n" @@ -105,12 +91,13 @@ 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" +" [--ref=\"GLOB\"]\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", }; @@ -121,27 +108,22 @@ static const struct option common_options[] = { {NULL, 0, NULL, 0}, }; -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'}, - {NULL, 0, NULL, 0}, -}; static const struct option apply_options[] = { {"check", no_argument, NULL, 'c'}, {"hardlink", no_argument, NULL, 'h'}, {"symlink", no_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, + {"ref", required_argument, NULL, 'r'}, {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'}, +static const struct option capture_or_append_options[] = { + {"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[] = { @@ -150,20 +132,21 @@ 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'}, + {"ref", required_argument, NULL, 'r'}, {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}, }; @@ -175,7 +158,8 @@ 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'}, + {"ref", required_argument, NULL, 'r'}, {NULL, 0, NULL, 0}, }; @@ -191,6 +175,7 @@ static const struct option unmount_options[] = { }; + /* Print formatted error message to stderr. */ static void imagex_error(const char *format, ...) { @@ -214,40 +199,24 @@ static void imagex_error_with_errno(const char *format, ...) va_end(va); } - -static inline void version() +static const char *path_basename(const char *path) { - static const char *s = - "imagex (" PACKAGE ") " PACKAGE_VERSION "\n" - "Copyright (C) 2012 Eric Biggers\n" - "License GPLv3+; GNU GPL version 3 or later .\n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n" - "\n" - "Report bugs to "PACKAGE_BUGREPORT".\n"; - fputs(s, stdout); -} + const char *p = path; + while (*p) + p++; + p--; -static inline void usage(int cmd) -{ - puts("IMAGEX: Usage:"); - fputs(usage_strings[cmd], stdout); -} + /* Trailing slashes. */ + while ((p != path - 1) && *p == '/') + p--; -static void usage_all() -{ - puts("IMAGEX: Usage:"); - for (int i = 0; i < ARRAY_LEN(usage_strings); i++) - fputs(usage_strings[i], stdout); - static const char *extra = -" imagex --help\n" -" imagex --version\n" -"\n" -" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n" - ; - fputs(extra, stdout); + while ((p != path - 1) && *p != '/') + p--; + + return p + 1; } + static int verify_image_exists(int image) { if (image == WIM_NO_IMAGE) { @@ -277,8 +246,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_LZX; if (strcasecmp(optarg, "maximum") == 0 || strcasecmp(optarg, "lzx") == 0) return WIM_COMPRESSION_TYPE_LZX; else if (strcasecmp(optarg, "fast") == 0 || strcasecmp(optarg, "xpress") == 0) @@ -292,70 +259,108 @@ static int get_compression_type(const char *optarg) } } -static int imagex_append(int argc, const char **argv) +static char *file_get_contents(const char *filename, size_t *len_ret) { - int c; - const char *flags_element = NULL; - int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS; - int add_image_flags = 0; - int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS; - const char *dir; - const char *wimfile; - const char *name; - const char *desc; - WIMStruct *w; - int ret; + struct stat stbuf; + char *buf; + size_t len; + FILE *fp; - for_opt(c, append_options) { - switch (c) { - case 'b': - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT; - break; - case 'c': - open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; - write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; - break; - case 'f': - flags_element = optarg; - break; - case 'L': - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; - break; - default: - usage(APPEND); - return -1; - } + if (stat(filename, &stbuf) != 0) { + imagex_error_with_errno("Failed to stat the file `%s'", filename); + return NULL; } - argc -= optind; - argv += optind; - if (argc < 2 || argc > 4) { - usage(APPEND); - return -1; + len = stbuf.st_size; + + fp = fopen(filename, "rb"); + if (!fp) { + imagex_error_with_errno("Failed to open the file `%s'", filename); + return NULL; } - dir = argv[0]; - wimfile = argv[1]; - name = (argc >= 3) ? argv[2] : path_basename(dir); - desc = (argc >= 4) ? argv[3] : NULL; - ret = wimlib_open_wim(wimfile, open_flags, &w); - if (ret != 0) - return ret; + buf = malloc(len); + if (!buf) { + imagex_error("Failed to allocate buffer of %zu bytes to hold " + "contents of file `%s'", len, filename); + goto out_fclose; + } + if (fread(buf, 1, len, fp) != len) { + imagex_error_with_errno("Failed to read %lu bytes from the " + "file `%s'", len, filename); + goto out_free_buf; + } + *len_ret = len; + return buf; +out_free_buf: + free(buf); +out_fclose: + fclose(fp); + return NULL; +} - ret = wimlib_add_image(w, dir, name, desc, - flags_element, add_image_flags); - if (ret != 0) - goto done; - ret = wimlib_overwrite(w, write_flags); -done: - wimlib_free(w); +static int open_swms_from_glob(const char *swm_glob, + const char *first_part, + int open_flags, + WIMStruct ***additional_swms_ret, + unsigned *num_additional_swms_ret) +{ + unsigned num_additional_swms = 0; + WIMStruct **additional_swms = NULL; + glob_t globbuf; + int ret; + + ret = glob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf); + if (ret != 0) { + if (ret == GLOB_NOMATCH) { + imagex_error("Found no files for glob \"%s\"", + swm_glob); + } else { + imagex_error_with_errno("Failed to process glob " + "\"%s\"", swm_glob); + } + ret = -1; + goto out; + } + num_additional_swms = globbuf.gl_pathc; + additional_swms = calloc(num_additional_swms, sizeof(additional_swms[0])); + if (!additional_swms) { + imagex_error("Out of memory"); + ret = -1; + goto out_globfree; + } + size_t offset = 0; + for (size_t i = 0; i < num_additional_swms; i++) { + if (strcmp(globbuf.gl_pathv[i], first_part) == 0) { + offset++; + continue; + } + ret = wimlib_open_wim(globbuf.gl_pathv[i], + open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, + &additional_swms[i - offset]); + if (ret != 0) + goto out_close_swms; + } + *additional_swms_ret = additional_swms; + *num_additional_swms_ret = num_additional_swms - offset; + ret = 0; + goto out_globfree; +out_close_swms: + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); +out_globfree: + globfree(&globbuf); +out: return ret; } + /* Extract one image, or all images, from a WIM file into a directory. */ static int imagex_apply(int argc, const char **argv) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS; + int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS | + WIMLIB_OPEN_FLAG_SPLIT_OK; int image; int num_images; WIMStruct *w; @@ -365,6 +370,10 @@ static int imagex_apply(int argc, const char **argv) const char *image_num_or_name; int extract_flags = 0; + const char *swm_glob = NULL; + WIMStruct **additional_swms = NULL; + unsigned num_additional_swms = 0; + for_opt(c, apply_options) { switch (c) { case 'c': @@ -379,6 +388,9 @@ static int imagex_apply(int argc, const char **argv) case 'v': extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; + case 'r': + swm_glob = optarg; + break; default: usage(APPLY); return -1; @@ -402,7 +414,7 @@ static int imagex_apply(int argc, const char **argv) ret = wimlib_open_wim(wimfile, open_flags, &w); if (ret != 0) - goto out; + return ret; image = wimlib_resolve_image(w, image_num_or_name); ret = verify_image_exists(image); @@ -418,6 +430,14 @@ static int imagex_apply(int argc, const char **argv) goto out; } + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret != 0) + goto out; + } + #ifdef WITH_NTFS_3G struct stat stbuf; @@ -429,45 +449,60 @@ static int imagex_apply(int argc, const char **argv) image, wimfile, ntfs_device); ret = wimlib_apply_image_to_ntfs_volume(w, image, ntfs_device, - extract_flags); + extract_flags, + additional_swms, + num_additional_swms); goto out; } } else { - if (errno != -ENOENT) + if (errno != ENOENT) imagex_error_with_errno("Failed to stat `%s'", dir); } #endif - ret = wimlib_extract_image(w, image, dir, extract_flags); + ret = wimlib_extract_image(w, image, dir, extract_flags, + additional_swms, num_additional_swms); out: wimlib_free(w); + if (additional_swms) + for (size_t i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); return ret; } - -/* Create a WIM file from a directory. */ -static int imagex_capture(int argc, const char **argv) +static int imagex_capture_or_append(int argc, const char **argv) { int c; + int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS; int add_image_flags = 0; int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS; - int compression_type = WIM_COMPRESSION_TYPE_NONE; - const char *flags_element = NULL; + int compression_type = WIM_COMPRESSION_TYPE_XPRESS; const char *dir; const char *wimfile; const char *name; const char *desc; - WIMStruct *w; + const char *flags_element = NULL; + const char *config_file = NULL; + char *config_str = NULL; + size_t config_len = 0; + WIMStruct *w = NULL; int ret; + int cur_image; + char *default_name; + int cmd = strcmp(argv[0], "append") ? CAPTURE : APPEND; - for_opt(c, capture_options) { + for_opt(c, capture_or_append_options) { switch (c) { case 'b': add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT; break; case 'c': + open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; + case 'C': + config_file = optarg; + break; case 'x': compression_type = get_compression_type(optarg); if (compression_type == WIM_COMPRESSION_TYPE_INVALID) @@ -476,49 +511,96 @@ static int imagex_capture(int argc, const char **argv) case 'f': flags_element = optarg; break; - case 'v': - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; - write_flags |= WIMLIB_WRITE_FLAG_VERBOSE; - break; - case 'N': - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS; - break; case 'L': add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; break; + case 'v': + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + break; default: - usage(CAPTURE); + usage(cmd); return -1; } } - argc -= optind; argv += optind; if (argc < 2 || argc > 4) { - usage(CAPTURE); + usage(cmd); return -1; } dir = argv[0]; wimfile = argv[1]; - name = (argc >= 3) ? argv[2] : dir; + + char dir_copy[strlen(dir) + 1]; + memcpy(dir_copy, dir, strlen(dir) + 1); + default_name = basename(dir_copy); + + name = (argc >= 3) ? argv[2] : default_name; desc = (argc >= 4) ? argv[3] : NULL; - ret = wimlib_create_new_wim(compression_type, &w); + if (config_file) { + config_str = file_get_contents(config_file, &config_len); + if (!config_str) + return -1; + } + + if (cmd == APPEND) + ret = wimlib_open_wim(wimfile, open_flags, &w); + else + ret = wimlib_create_new_wim(compression_type, &w); if (ret != 0) - return ret; + goto out; - ret = wimlib_add_image(w, dir, name, desc, flags_element, - add_image_flags); - if (ret != 0) { - imagex_error("Failed to add the image `%s'", dir); - goto done; +#ifdef WITH_NTFS_3G + struct stat stbuf; + + ret = stat(dir, &stbuf); + if (ret == 0) { + if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) { + const char *ntfs_device = dir; + printf("Capturing WIM image NTFS filesystem on `%s'\n", + ntfs_device); + ret = wimlib_add_image_from_ntfs_volume(w, ntfs_device, + name, + config_str, + config_len, + add_image_flags); + goto out_write; + } + } else { + if (errno != ENOENT) { + imagex_error_with_errno("Failed to stat `%s'", dir); + ret = -1; + goto out; + } } +#endif + ret = wimlib_add_image(w, dir, name, config_str, config_len, + add_image_flags); - ret = wimlib_write(w, wimfile, WIM_ALL_IMAGES, write_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; + } + if (cmd == APPEND) + ret = wimlib_overwrite(w, write_flags); + else + ret = wimlib_write(w, wimfile, WIM_ALL_IMAGES, write_flags); if (ret != 0) imagex_error("Failed to write the WIM file `%s'", wimfile); -done: +out: wimlib_free(w); + free(config_str); return ret; } @@ -653,7 +735,7 @@ static int imagex_export(int argc, const char **argv) int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS; int export_flags = 0; int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS; - int compression_type = WIM_COMPRESSION_TYPE_NONE; + int compression_type = WIM_COMPRESSION_TYPE_XPRESS; bool compression_type_specified = false; const char *src_wimfile; const char *src_image_num_or_name; @@ -666,6 +748,9 @@ static int imagex_export(int argc, const char **argv) int image; struct stat stbuf; bool wim_is_new; + const char *swm_glob = NULL; + WIMStruct **additional_swms = NULL; + unsigned num_additional_swms = 0; for_opt(c, export_options) { switch (c) { @@ -682,6 +767,9 @@ static int imagex_export(int argc, const char **argv) return -1; compression_type_specified = true; break; + case 'r': + swm_glob = optarg; + break; default: usage(EXPORT); return -1; @@ -698,7 +786,8 @@ static int imagex_export(int argc, const char **argv) dest_wimfile = argv[2]; dest_name = (argc >= 4) ? argv[3] : NULL; dest_desc = (argc >= 5) ? argv[4] : NULL; - ret = wimlib_open_wim(src_wimfile, open_flags, &src_w); + ret = wimlib_open_wim(src_wimfile, + open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_w); if (ret != 0) return ret; @@ -708,14 +797,14 @@ static int imagex_export(int argc, const char **argv) if (stat(dest_wimfile, &stbuf) == 0) { wim_is_new = false; /* Destination file exists. */ - if (!S_ISREG(stbuf.st_mode)) { + if (!S_ISREG(stbuf.st_mode) && !S_ISLNK(stbuf.st_mode)) { imagex_error("`%s' is not a regular file", dest_wimfile); - goto done; + goto out; } ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w); if (ret != 0) - goto done; + goto out; if (compression_type_specified && compression_type != wimlib_get_compression_type(dest_w)) { @@ -723,7 +812,7 @@ static int imagex_export(int argc, const char **argv) "not the same as that used in the " "destination WIM"); ret = -1; - goto done; + goto out; } compression_type = wimlib_get_compression_type(dest_w); } else { @@ -732,23 +821,32 @@ static int imagex_export(int argc, const char **argv) if (errno == ENOENT) { ret = wimlib_create_new_wim(compression_type, &dest_w); if (ret != 0) - goto done; + goto out; } else { imagex_error_with_errno("Cannot stat file `%s'", dest_wimfile); - goto done; + goto out; } } image = wimlib_resolve_image(src_w, src_image_num_or_name); ret = verify_image_exists(image); if (ret != 0) - goto done; + goto out; + + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret != 0) + goto out; + } ret = wimlib_export_image(src_w, image, dest_w, dest_name, dest_desc, - export_flags); + export_flags, additional_swms, + num_additional_swms); if (ret != 0) - goto done; + goto out; if (wim_is_new) @@ -756,9 +854,12 @@ static int imagex_export(int argc, const char **argv) write_flags); else ret = wimlib_overwrite(dest_w, write_flags); -done: +out: wimlib_free(src_w); wimlib_free(dest_w); + if (additional_swms) + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); return ret; } @@ -940,12 +1041,6 @@ static int imagex_info(int argc, const char **argv) wimlib_print_available_images(w, image); if (metadata) { - if (total_parts != 1 && part_number != 1) { - imagex_error("Select part 1 of this %d-part WIM " - "to see the image metadata", - total_parts); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; - } ret = wimlib_print_metadata(w, image); if (ret != 0) goto done; @@ -1062,13 +1157,17 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv) { int c; int mount_flags = 0; - int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS; + int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS | + WIMLIB_OPEN_FLAG_SPLIT_OK; const char *wimfile; const char *dir; WIMStruct *w; int image; int num_images; int ret; + const char *swm_glob = NULL; + WIMStruct **additional_swms = NULL; + unsigned num_additional_swms = 0; if (strcmp(argv[0], "mountrw") == 0) mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -1092,6 +1191,9 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv) goto mount_usage; } break; + case 'r': + swm_glob = optarg; + break; default: goto mount_usage; } @@ -1107,6 +1209,14 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv) if (ret != 0) return ret; + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret != 0) + goto out; + } + if (argc == 2) { image = 1; num_images = wimlib_get_num_images(w); @@ -1116,7 +1226,7 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv) usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) ? MOUNTRW : MOUNT); ret = WIMLIB_ERR_INVALID_IMAGE; - goto done; + goto out; } dir = argv[1]; } else { @@ -1126,16 +1236,20 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv) ret = verify_image_exists_and_is_single(image); if (ret != 0) - goto done; + goto out; - ret = wimlib_mount(w, image, dir, mount_flags); + ret = wimlib_mount(w, image, dir, mount_flags, additional_swms, + num_additional_swms); if (ret != 0) { imagex_error("Failed to mount image %d from `%s' on `%s'", image, wimfile, dir); } -done: +out: wimlib_free(w); + if (additional_swms) + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); return ret; mount_usage: usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) @@ -1210,10 +1324,14 @@ struct imagex_command { int cmd; }; + +#define for_imagex_command(p) for (p = &imagex_commands[0]; \ + p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++) + static struct imagex_command imagex_commands[] = { - {"append", imagex_append, APPEND}, + {"append", imagex_capture_or_append, APPEND}, {"apply", imagex_apply, APPLY}, - {"capture", imagex_capture, CAPTURE}, + {"capture", imagex_capture_or_append, CAPTURE}, {"delete", imagex_delete, DELETE}, {"dir", imagex_dir, DIR}, {"export", imagex_export, EXPORT}, @@ -1225,8 +1343,19 @@ static struct imagex_command imagex_commands[] = { {"unmount", imagex_unmount, UNMOUNT}, }; -#define for_imagex_command(p) for (p = &imagex_commands[0]; \ - p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++) +static void version() +{ + static const char *s = + "imagex (" PACKAGE ") " PACKAGE_VERSION "\n" + "Copyright (C) 2012 Eric Biggers\n" + "License GPLv3+; GNU GPL version 3 or later .\n" + "This is free software: you are free to change and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n" + "\n" + "Report bugs to "PACKAGE_BUGREPORT".\n"; + fputs(s, stdout); +} + static void help_or_version(int argc, const char **argv) { @@ -1260,6 +1389,34 @@ static void help_or_version(int argc, const char **argv) } +static void usage(int cmd_type) +{ + struct imagex_command *cmd; + puts("IMAGEX: Usage:"); + fputs(usage_strings[cmd_type], stdout); + for_imagex_command(cmd) + if (cmd->cmd == cmd_type) + printf("\nTry `man imagex-%s' for more details.\n", + cmd->name); +} + +static void usage_all() +{ + puts("IMAGEX: Usage:"); + for (int i = 0; i < ARRAY_LEN(usage_strings); i++) + fputs(usage_strings[i], stdout); + static const char *extra = +" imagex --help\n" +" imagex --version\n" +"\n" +" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n" +"\n" +" Try `man imagex' for more information.\n" + ; + fputs(extra, stdout); +} + + int main(int argc, const char **argv) { struct imagex_command *cmd;