ret = -1;
goto out_globfree;
}
- size_t offset = 0;
- for (size_t i = 0; i < num_additional_swms; i++) {
+ unsigned offset = 0;
+ for (unsigned i = 0; i < num_additional_swms; i++) {
if (strcmp(globbuf.gl_pathv[i], first_part) == 0) {
offset++;
continue;
wimfile = argv[0];
if (argc == 2) {
- image_num_or_name = "1";
+ image_num_or_name = "1";
dir = argv[1];
} else {
image_num_or_name = argv[1];
goto out;
}
} else {
- if (errno != ENOENT)
+ if (errno != ENOENT) {
imagex_error_with_errno("Failed to stat `%s'", dir);
+ ret = -1;
+ goto out;
+ }
}
#endif
out:
wimlib_free(w);
if (additional_swms)
- for (size_t i = 0; i < num_additional_swms; i++)
+ for (unsigned i = 0; i < num_additional_swms; i++)
wimlib_free(additional_swms[i]);
return ret;
}
usage(cmd);
return -1;
}
- dir = argv[0];
+ dir = argv[0];
wimfile = argv[1];
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;
+ name = (argc >= 3) ? argv[2] : default_name;
+ desc = (argc >= 4) ? argv[3] : NULL;
if (config_file) {
config_str = file_get_contents(config_file, &config_len);
ret = verify_image_exists(image);
if (ret != 0)
- goto done;
+ goto out;
ret = wimlib_delete_image(w, image);
if (ret != 0) {
imagex_error("Failed to delete image from `%s'", wimfile);
- goto done;
+ goto out;
}
ret = wimlib_overwrite(w, write_flags);
imagex_error("Failed to write the file `%s' with image "
"deleted", wimfile);
}
-done:
+out:
wimlib_free(w);
return ret;
}
int image;
int ret;
int num_images;
- int part_number;
if (argc < 2) {
imagex_error("Must specify a WIM file");
if (ret != 0)
return ret;
- part_number = wimlib_get_part_number(w, NULL);
- if (part_number != 1) {
- imagex_error("`%s' is part %d of a split WIM! Specify the "
- "first part to see the files",
- wimfile, part_number);
- ret = WIMLIB_ERR_SPLIT_UNSUPPORTED;
- goto done;
- }
-
if (argc == 3) {
image = wimlib_resolve_image(w, argv[2]);
ret = verify_image_exists(image);
if (ret != 0)
- goto done;
+ goto out;
} else {
/* Image was not specified. If the WIM only contains one image,
* choose that one; otherwise, print an error. */
"select one.", wimfile, num_images);
usage(DIR);
ret = -1;
- goto done;
+ goto out;
}
image = 1;
}
ret = wimlib_print_files(w, image);
-done:
+out:
wimlib_free(w);
return ret;
}
* If so, we try to append the exported image(s) to it; otherwise, we
* create a new WIM containing the exported image(s). */
if (stat(dest_wimfile, &stbuf) == 0) {
+ int dest_ctype;
+
wim_is_new = false;
/* Destination file exists. */
if (!S_ISREG(stbuf.st_mode) && !S_ISLNK(stbuf.st_mode)) {
imagex_error("`%s' is not a regular file",
dest_wimfile);
+ ret = -1;
goto out;
}
ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w);
if (ret != 0)
goto out;
- if (compression_type_specified && compression_type !=
- wimlib_get_compression_type(dest_w)) {
+ dest_ctype = wimlib_get_compression_type(dest_w);
+ if (compression_type_specified
+ && compression_type != dest_ctype)
+ {
imagex_error("Cannot specify a compression type that is "
"not the same as that used in the "
"destination WIM");
ret = -1;
goto out;
}
- compression_type = wimlib_get_compression_type(dest_w);
+ compression_type = dest_ctype;
} else {
wim_is_new = true;
/* dest_wimfile is not an existing file, so create a new WIM. */
} else {
imagex_error_with_errno("Cannot stat file `%s'",
dest_wimfile);
+ ret = -1;
goto out;
}
}
part_number = wimlib_get_part_number(w, &total_parts);
- /*if (total_parts > 1 && part_number > 1) {*/
- /*printf("Warning: this is part %d of a %d-part split WIM.\n"*/
- /*" Select the first part if you want to see information\n"*/
- /*" about images in the WIM.\n", */
- /*part_number, total_parts);*/
- /*}*/
-
image = wimlib_resolve_image(w, image_num_or_name);
if (image == WIM_NO_IMAGE && strcmp(image_num_or_name, "0") != 0) {
imagex_error("The image `%s' does not exist",
"index to 0, specify image \"0\" with "
"the --boot flag.");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
if (image == WIM_ALL_IMAGES && wimlib_get_num_images(w) > 1) {
"without specifying a specific "
"image in a multi-image WIM");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
if (new_name) {
imagex_error("Cannot specify the NEW_NAME "
"without specifying a specific "
"image in a multi-image WIM");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
}
* recreate the WIM file. */
if (!new_name && !boot) {
+ /* Read-only operations */
+
if (image == WIM_NO_IMAGE) {
imagex_error("`%s' is not a valid image",
image_num_or_name);
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
if (image == WIM_ALL_IMAGES && short_header)
if (xml) {
ret = wimlib_extract_xml_data(w, stdout);
if (ret != 0)
- goto done;
+ goto out;
}
if (xml_out_file) {
"file `%s' for "
"writing ",
xml_out_file);
- goto done;
+ goto out;
}
ret = wimlib_extract_xml_data(w, fp);
if (fclose(fp) != 0) {
imagex_error("Failed to close the file `%s'",
xml_out_file);
- goto done;
+ goto out;
}
if (ret != 0)
- goto done;
+ goto out;
}
if (short_header)
if (metadata) {
ret = wimlib_print_metadata(w, image);
if (ret != 0)
- goto done;
+ goto out;
}
} else {
+
+ /* Modification operations */
+
if (total_parts != 1) {
imagex_error("Modifying a split WIM is not supported.");
return -1;
"\"%s\".\n", image, new_name);
ret = wimlib_set_image_name(w, image, new_name);
if (ret != 0)
- goto done;
+ goto out;
}
}
if (new_desc) {
ret = wimlib_set_image_descripton(w, image,
new_desc);
if (ret != 0)
- goto done;
+ goto out;
}
}
ret = 0;
}
}
-
-done:
+out:
wimlib_free(w);
return ret;
}
if (strcmp(argv[0], "mountrw") == 0)
mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
+
for_opt(c, mount_options) {
switch (c) {
case 'c':
int c;
int flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
unsigned long part_size;
+ char *tmp;
for_opt(c, split_options) {
switch (c) {
usage(SPLIT);
return -1;
}
- part_size = strtoul(argv[2], NULL, 10) * (1 << 20);
+ part_size = strtod(argv[2], &tmp) * (1 << 20);
+ if (tmp == argv[2] || *tmp) {
+ imagex_error("Invalid part size \"%s\"", argv[2]);
+ imagex_error("The part size must be an integer or floating-point number of megabytes.");
+ return -1;
+ }
return wimlib_split(argv[0], argv[1], part_size, flags);
}
#define for_imagex_command(p) for (p = &imagex_commands[0]; \
p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++)
-static struct imagex_command imagex_commands[] = {
+static const struct imagex_command imagex_commands[] = {
{"append", imagex_capture_or_append, APPEND},
- {"apply", imagex_apply, APPLY},
+ {"apply", imagex_apply, APPLY},
{"capture", imagex_capture_or_append, CAPTURE},
- {"delete", imagex_delete, DELETE},
- {"dir", imagex_dir, DIR},
- {"export", imagex_export, EXPORT},
- {"info", imagex_info, INFO},
- {"join", imagex_join, JOIN},
- {"mount", imagex_mount_rw_or_ro, MOUNT},
- {"mountrw", imagex_mount_rw_or_ro, MOUNTRW},
- {"split", imagex_split, SPLIT},
- {"unmount", imagex_unmount, UNMOUNT},
+ {"delete", imagex_delete, DELETE},
+ {"dir", imagex_dir, DIR},
+ {"export", imagex_export, EXPORT},
+ {"info", imagex_info, INFO},
+ {"join", imagex_join, JOIN},
+ {"mount", imagex_mount_rw_or_ro, MOUNT},
+ {"mountrw", imagex_mount_rw_or_ro, MOUNTRW},
+ {"split", imagex_split, SPLIT},
+ {"unmount", imagex_unmount, UNMOUNT},
};
static void version()
{
int i;
const char *p;
- struct imagex_command *cmd;
+ const struct imagex_command *cmd;
for (i = 1; i < argc; i++) {
p = argv[i];
continue;
if (*p == '-')
p++;
- if (strcmp(p, "help") == 0 || (*p == '?' && *(p + 1) == '\0')) {
+ if (strcmp(p, "help") == 0) {
for_imagex_command(cmd) {
if (strcmp(cmd->name, argv[1]) == 0) {
usage(cmd->cmd);
static void usage(int cmd_type)
{
- struct imagex_command *cmd;
+ const struct imagex_command *cmd;
puts("IMAGEX: Usage:");
fputs(usage_strings[cmd_type], stdout);
for_imagex_command(cmd)
int main(int argc, const char **argv)
{
- struct imagex_command *cmd;
+ const struct imagex_command *cmd;
int ret;
if (argc < 2) {
git://wimlib.net / wimlib / blobdiff