enum {
IMAGEX_ALLOW_OTHER_OPTION,
- IMAGEX_AS_DELTA_FROM_OPTION,
- IMAGEX_AS_UPDATE_OF_OPTION,
IMAGEX_BOOT_OPTION,
IMAGEX_CHECK_OPTION,
IMAGEX_COMMAND_OPTION,
IMAGEX_COMPRESS_OPTION,
IMAGEX_CONFIG_OPTION,
IMAGEX_DEBUG_OPTION,
+ IMAGEX_DELTA_FROM_OPTION,
IMAGEX_DEREFERENCE_OPTION,
IMAGEX_DEST_DIR_OPTION,
IMAGEX_EXTRACT_XML_OPTION,
IMAGEX_THREADS_OPTION,
IMAGEX_TO_STDOUT_OPTION,
IMAGEX_UNIX_DATA_OPTION,
+ IMAGEX_UPDATE_OF_OPTION,
IMAGEX_VERBOSE_OPTION,
IMAGEX_XML_OPTION,
};
{T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION},
{T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION},
{T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION},
- {T("as-update-of"), required_argument, NULL, IMAGEX_AS_UPDATE_OF_OPTION},
- {T("as-update-from"), required_argument, NULL, IMAGEX_AS_UPDATE_OF_OPTION},
- {T("as-delta-from"), required_argument, NULL, IMAGEX_AS_DELTA_FROM_OPTION},
+ {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION},
+ {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION},
{NULL, 0, NULL, 0},
};
if (image == WIMLIB_NO_IMAGE) {
imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\"!\n"
" Please specify a 1-based image index or "
- "image name.\n"
- " You may use `%"TS"' to list the images "
- "contained in a WIM."),
- image_name, wim_name, get_cmd_string(CMD_INFO, false));
- return -1;
+ "image name. To list the images\n"
+ " contained in the WIM archive, run\n"
+ "\n"
+ " %"TS" \"%"TS"\"\n"),
+ image_name, wim_name,
+ get_cmd_string(CMD_INFO, false), wim_name);
+ return WIMLIB_ERR_INVALID_IMAGE;
}
return 0;
}
{
if (image == WIMLIB_ALL_IMAGES) {
imagex_error(T("Cannot specify all images for this action!"));
- return -1;
+ return WIMLIB_ERR_INVALID_IMAGE;
}
return 0;
}
size_t num_wchars;
if (num_bytes >= 2 &&
- ((text[0] == 0xff && text[1] == 0xfe) ||
- (text[0] <= 0x7f && text[1] == 0x00)))
+ (((unsigned char)text[0] == 0xff && (unsigned char)text[1] == 0xfe) ||
+ ((unsigned char)text[0] <= 0x7f && (unsigned char)text[1] == 0x00)))
{
/* File begins with 0xfeff, the BOM for UTF-16LE, or it begins
* with something that looks like an ASCII character encoded as
case WIMLIB_UPDATE_OP_DELETE:
imagex_printf(T("Deleted WIM path "
"\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
- info->update.command->delete.wim_path);
+ info->update.command->delete_.wim_path);
break;
case WIMLIB_UPDATE_OP_RENAME:
imagex_printf(T("Renamed WIM path "
break;
case WIMLIB_UPDATE_OP_DELETE:
if (!tstrcmp(option, T("--force")))
- cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
+ cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
else if (!tstrcmp(option, T("--recursive")))
- cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE;
+ cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE;
else
recognized = false;
break;
cmd->add.wim_target_path = (tchar*)nonoption;
break;
case WIMLIB_UPDATE_OP_DELETE:
- cmd->delete.wim_path = (tchar*)nonoption;
+ cmd->delete_.wim_path = (tchar*)nonoption;
break;
case WIMLIB_UPDATE_OP_RENAME:
if (num_nonoptions == 0)
case IMAGEX_NOT_PIPABLE_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE;
break;
- case IMAGEX_AS_UPDATE_OF_OPTION:
+ case IMAGEX_UPDATE_OF_OPTION:
if (template_image_name_or_num) {
- imagex_error(T("'--as-update-of' can only be "
+ imagex_error(T("'--update-of' can only be "
"specified one time!"));
goto out_err;
} else {
}
}
break;
- case IMAGEX_AS_DELTA_FROM_OPTION:
+ case IMAGEX_DELTA_FROM_OPTION:
if (cmd != CMD_CAPTURE) {
- imagex_error(T("'--as-delta-from' is only "
+ imagex_error(T("'--delta-from' is only "
"valid for capture!"));
goto out_usage;
}
if (base_wimfile) {
- imagex_error(T("'--as-delta-from' can only be "
+ imagex_error(T("'--delta-from' can only be "
"specified one time!"));
goto out_err;
}
set_fd_to_binary_mode(wim_fd);
}
- /* If template image was specified using --as-update-of=IMAGE rather
- * than --as-update-of=WIMFILE:IMAGE, set the default WIMFILE. */
+ /* If template image was specified using --update-of=IMAGE rather
+ * than --update-of=WIMFILE:IMAGE, set the default WIMFILE. */
if (template_image_name_or_num && !template_wimfile) {
if (base_wimfile) {
/* Capturing delta WIM: default to base WIM. */
/* Capturing a normal (non-delta) WIM, so the WIM file
* *must* be explicitly specified. */
imagex_error(T("For capture of non-delta WIM, "
- "'--as-update-of' must specify "
+ "'--update-of' must specify "
"WIMFILE:IMAGE!"));
goto out_usage;
}
if (desc || flags_element || template_image_name_or_num) {
/* User provided <DESCRIPTION> or <FLAGS> element, or an image
* on which the added one is to be based has been specified with
- * --as-update-of. Get the index of the image we just
+ * --update-of. Get the index of the image we just
* added, then use it to call the appropriate functions. */
struct wimlib_wim_info info;
image = wimlib_resolve_image(wim, image_num_or_name);
ret = WIMLIB_ERR_INVALID_IMAGE;
if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) {
- imagex_error(T("The image \"%"TS"\" does not exist in \"%"TS"\""),
- image_num_or_name, wimfile);
+ verify_image_exists(image, image_num_or_name, wimfile);
if (boot) {
imagex_error(T("If you would like to set the boot "
"index to 0, specify image \"0\" with "
cmds[i].add.config = config;
break;
case WIMLIB_UPDATE_OP_DELETE:
- cmds[i].delete.delete_flags |= default_delete_flags;
+ cmds[i].delete_.delete_flags |= default_delete_flags;
break;
default:
break;
" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n"
" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n"
-" [--not-pipable] [--as-update-of=[WIMFILE:]IMAGE]\n"
+" [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n"
),
[CMD_APPLY] =
T(
" [--verbose] [--dereference] [--config=FILE]\n"
" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n"
" [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n"
-" [--as-update-of=[WIMFILE:]IMAGE] [--as-delta-from=WIMFILE]\n"
+" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n"
),
[CMD_DELETE] =
T(
git://wimlib.net / wimlib / blobdiff