X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=5c5d42bc0733e444f8095059afca97c5a257bebb;hp=9bd0ecc685fd402239478bb2d32a3ed92157b608;hb=3b293f2984ccd95cf58363ae448deda14224d310;hpb=e2bc2608477392685affc2d8e0a46088a8e1ef1c diff --git a/programs/imagex.c b/programs/imagex.c index 9bd0ecc6..5c5d42bc 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -31,11 +31,6 @@ #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); \ @@ -80,26 +75,27 @@ static const char *path_basename(const char *path) 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", +" 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]\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" -" [--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]\n", [INFO] = " imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" " [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n" @@ -108,12 +104,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", }; @@ -127,10 +123,10 @@ static const struct option common_options[] = { static const struct option append_options[] = { {"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'}, - {"dereference", no_argument, NULL, 'L'}, - {"config", required_argument, NULL, 'C'}, {NULL, 0, NULL, 0}, }; static const struct option apply_options[] = { @@ -143,11 +139,11 @@ static const struct option apply_options[] = { static const struct option capture_options[] = { {"boot", no_argument, NULL, 'b'}, {"check", no_argument, NULL, 'c'}, - {"compress", optional_argument, NULL, 'x'}, + {"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'}, - {"dereference", no_argument, NULL, 'L'}, - {"config", required_argument, NULL, 'C'}, {NULL, 0, NULL, 0}, }; static const struct option delete_options[] = { @@ -156,20 +152,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}, }; @@ -181,7 +177,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}, }; @@ -283,8 +279,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) @@ -419,7 +413,7 @@ static int imagex_append(int argc, const char **argv) goto out_write; } } else { - if (errno != -ENOENT) + if (errno != ENOENT) imagex_error_with_errno("Failed to stat `%s'", dir); } #endif @@ -528,7 +522,7 @@ static int imagex_apply(int argc, const char **argv) goto out; } } else { - if (errno != -ENOENT) + if (errno != ENOENT) imagex_error_with_errno("Failed to stat `%s'", dir); } #endif @@ -629,7 +623,7 @@ static int imagex_capture(int argc, const char **argv) goto out_write; } } else { - if (errno != -ENOENT) + if (errno != ENOENT) imagex_error_with_errno("Failed to stat `%s'", dir); } #endif