*/
/*
- * Copyright (C) 2012-2017 Eric Biggers
+ * Copyright (C) 2012-2018 Eric Biggers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static inline void set_fd_to_binary_mode(int fd)
{
}
+/* NetBSD is missing getopt_long_only() but has getopt_long() */
+#ifndef HAVE_GETOPT_LONG_ONLY
+# define getopt_long_only getopt_long
+#endif
#endif /* !__WIN32 */
/* Don't confuse the user by presenting the mounting commands on Windows when
static void recommend_man_page(int cmd, FILE *fp);
static const tchar *get_cmd_string(int cmd, bool only_short_form);
-static bool imagex_be_quiet = false;
static FILE *imagex_info_file;
-#define imagex_printf(format, ...) \
+#define imagex_printf(format, ...) \
+ if (imagex_info_file) \
tfprintf(imagex_info_file, format, ##__VA_ARGS__)
+static void imagex_suppress_output(void)
+{
+ imagex_info_file = NULL;
+}
+
+static void imagex_output_to_stderr(void)
+{
+ if (imagex_info_file)
+ imagex_info_file = stderr;
+}
+
+static void imagex_flush_output(void)
+{
+ if (imagex_info_file)
+ fflush(imagex_info_file);
+}
+
enum {
IMAGEX_ALLOW_OTHER_OPTION,
IMAGEX_BLOBS_OPTION,
IMAGEX_COMPACT_OPTION,
IMAGEX_COMPRESS_OPTION,
IMAGEX_CONFIG_OPTION,
+ IMAGEX_CREATE_OPTION,
IMAGEX_DEBUG_OPTION,
IMAGEX_DELTA_FROM_OPTION,
IMAGEX_DEREFERENCE_OPTION,
IMAGEX_FORCE_OPTION,
IMAGEX_HEADER_OPTION,
IMAGEX_IMAGE_PROPERTY_OPTION,
+ IMAGEX_INCLUDE_INTEGRITY_OPTION,
IMAGEX_INCLUDE_INVALID_NAMES_OPTION,
IMAGEX_LAZY_OPTION,
IMAGEX_METADATA_OPTION,
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION},
{T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
{T("snapshot"), no_argument, NULL, IMAGEX_SNAPSHOT_OPTION},
+ {T("create"), no_argument, NULL, IMAGEX_CREATE_OPTION},
{NULL, 0, NULL, 0},
};
static const struct option delete_options[] = {
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("soft"), no_argument, NULL, IMAGEX_SOFT_OPTION},
{T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
{NULL, 0, NULL, 0},
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION},
{T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("extract-xml"), required_argument, NULL, IMAGEX_EXTRACT_XML_OPTION},
{T("header"), no_argument, NULL, IMAGEX_HEADER_OPTION},
{T("lookup-table"), no_argument, NULL, IMAGEX_BLOBS_OPTION},
static const struct option join_options[] = {
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{NULL, 0, NULL, 0},
};
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION},
{T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
static const struct option split_options[] = {
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{NULL, 0, NULL, 0},
};
* update_command_add_option(). */
{T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION},
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
+ {T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_OPTION},
{T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION},
{T("command"), required_argument, NULL, IMAGEX_COMMAND_OPTION},
{T("wimboot-config"), required_argument, NULL, IMAGEX_WIMBOOT_CONFIG_OPTION},
unsigned unit_shift;
const tchar *unit_name;
- if (imagex_be_quiet)
- return WIMLIB_PROGRESS_STATUS_CONTINUE;
switch (msg) {
case WIMLIB_PROGRESS_MSG_WRITE_STREAMS:
{
default:
break;
}
- fflush(imagex_info_file);
+ imagex_flush_output();
return WIMLIB_PROGRESS_STATUS_CONTINUE;
}
goto out_free_refglobs;
}
-/* Create a WIM image from a directory tree, NTFS volume, or multiple files or
- * directory trees. 'wimlib-imagex capture': create a new WIM file containing
- * the desired image. 'wimlib-imagex append': add a new image to an existing
- * WIM file. */
+/*
+ * Create a WIM image from a directory tree, NTFS volume, or multiple files or
+ * directory trees. 'wimcapture': create a new WIM file containing the desired
+ * image. 'wimappend': add a new image to an existing WIM file; or, with
+ * '--create' behave like 'wimcapture' if the WIM file doesn't exist.
+ */
static int
imagex_capture_or_append(int argc, tchar **argv, int cmd)
{
int c;
+ bool create = false;
+ bool appending = (cmd == CMD_APPEND);
int open_flags = 0;
int add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE |
WIMLIB_ADD_FLAG_WINCONFIG |
STRING_LIST(base_wimfiles);
WIMStruct **base_wims;
- WIMStruct *template_wim;
+ WIMStruct *template_wim = NULL;
const tchar *template_wimfile = NULL;
const tchar *template_image_name_or_num = NULL;
int template_image = WIMLIB_NO_IMAGE;
break;
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_NOCHECK_OPTION:
template_image_name_or_num = optarg;
}
}
+ #ifdef __WIN32__
+ imagex_printf(T("[WARNING] '--update-of' is unreliable on Windows!\n"));
+ #endif
break;
case IMAGEX_DELTA_FROM_OPTION:
- if (cmd != CMD_CAPTURE) {
- imagex_error(T("'--delta-from' is only "
- "valid for capture!"));
- goto out_usage;
- }
ret = string_list_append(&base_wimfiles, optarg);
if (ret)
goto out;
add_flags |= WIMLIB_ADD_FLAG_WIMBOOT;
break;
case IMAGEX_UNSAFE_COMPACT_OPTION:
- if (cmd != CMD_APPEND) {
- imagex_error(T("'--unsafe-compact' is only "
- "valid for append!"));
- goto out_err;
- }
write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
break;
case IMAGEX_SNAPSHOT_OPTION:
add_flags |= WIMLIB_ADD_FLAG_SNAPSHOT;
break;
+ case IMAGEX_CREATE_OPTION:
+ if (cmd == CMD_CAPTURE) {
+ imagex_error(T("'--create' is only valid for 'wimappend', not 'wimcapture'"));
+ goto out_err;
+ }
+ create = true;
+ break;
default:
goto out_usage;
}
if (!tstrcmp(wimfile, T("-"))) {
/* Writing captured WIM to standard output. */
+ if (create)
+ appending = false;
#if 0
if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) {
imagex_error("Can't write a non-pipable WIM to "
#else
write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
#endif
- if (cmd == CMD_APPEND) {
+ if (appending) {
imagex_error(T("Using standard output for append does "
"not make sense."));
goto out_err;
}
wim_fd = STDOUT_FILENO;
wimfile = NULL;
- imagex_info_file = stderr;
+ imagex_output_to_stderr();
set_fd_to_binary_mode(wim_fd);
+ } else {
+ struct stat stbuf;
+
+ /* Check for 'wimappend --create' acting as wimcapture */
+ if (create && tstat(wimfile, &stbuf) != 0 && errno == ENOENT) {
+
+ appending = false;
+
+ /* Ignore '--update-of' for the target WIMFILE */
+ if (template_image_name_or_num &&
+ (!template_wimfile ||
+ !tstrcmp(template_wimfile, wimfile)))
+ {
+ template_image_name_or_num = NULL;
+ template_wimfile = NULL;
+ }
+ }
+ }
+
+ if ((write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT) && !appending) {
+ imagex_error(T("'--unsafe-compact' is only valid for append!"));
+ goto out_err;
}
/* If template image was specified using --update-of=IMAGE rather
/* Capturing delta WIM based on single WIM: default to
* base WIM. */
template_wimfile = base_wimfiles.strings[0];
- } else if (cmd == CMD_APPEND) {
+ } else if (appending) {
/* Appending to WIM: default to WIM being appended to.
*/
template_wimfile = wimfile;
}
/* Open the existing WIM, or create a new one. */
- if (cmd == CMD_APPEND) {
+ if (appending) {
ret = wimlib_open_wim_with_progress(wimfile,
open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
&wim,
int ctype = compression_type;
- if (cmd == CMD_APPEND) {
+ if (appending) {
struct wimlib_wim_info info;
wimlib_get_wim_info(wim, &info);
ctype = info.compression_type;
/* If the user did not specify an image name, and the basename of the
* source already exists as an image name in the WIM file, append a
* suffix to make it unique. */
- if (cmd == CMD_APPEND && name_defaulted) {
+ if (appending && name_defaulted) {
unsigned long conflict_idx;
tchar *name_end = tstrchr(name, T('\0'));
for (conflict_idx = 1;
* open the WIM if needed and parse the image index. */
if (template_image_name_or_num) {
-
- if (base_wimfiles.num_strings == 1 &&
- template_wimfile == base_wimfiles.strings[0]) {
- template_wim = base_wims[0];
- } else if (template_wimfile == wimfile) {
+ if (appending && !tstrcmp(template_wimfile, wimfile)) {
template_wim = wim;
} else {
+ for (size_t i = 0; i < base_wimfiles.num_strings; i++) {
+ if (!tstrcmp(template_wimfile,
+ base_wimfiles.strings[i])) {
+ template_wim = base_wims[i];
+ break;
+ }
+ }
+ }
+
+ if (!template_wim) {
ret = wimlib_open_wim_with_progress(template_wimfile,
open_flags,
&template_wim,
template_wimfile);
if (ret)
goto out_free_template_wim;
- } else {
- template_wim = NULL;
}
ret = wimlib_add_image_multisource(wim,
/* Write the new WIM or overwrite the existing WIM with the new image
* appended. */
- if (cmd == CMD_APPEND) {
+ if (appending) {
ret = wimlib_overwrite(wim, write_flags, num_threads);
} else if (wimfile) {
ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES,
write_flags, num_threads);
}
out_free_template_wim:
- /* template_wim may alias base_wims[0] or wim. */
- if ((base_wimfiles.num_strings != 1 || template_wim != base_wims[0]) &&
- template_wim != wim)
- wimlib_free(template_wim);
+ /* 'template_wim' may alias 'wim' or any of the 'base_wims' */
+ if (template_wim == wim)
+ goto out_free_base_wims;
+ for (size_t i = 0; i < base_wimfiles.num_strings; i++)
+ if (template_wim == base_wims[i])
+ goto out_free_base_wims;
+ wimlib_free(template_wim);
out_free_base_wims:
for (size_t i = 0; i < base_wimfiles.num_strings; i++)
wimlib_free(base_wims[i]);
switch (c) {
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_SOFT_OPTION:
#define TIMESTR_MAX 100
static void
-timespec_to_string(const struct timespec *spec, tchar *buf)
+print_time(const tchar *type, const struct wimlib_timespec *wts,
+ int32_t high_part)
{
- time_t t = spec->tv_sec;
+ tchar timestr[TIMESTR_MAX];
+ time_t t;
struct tm tm;
- gmtime_r(&t, &tm);
- tstrftime(buf, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm);
- buf[TIMESTR_MAX - 1] = '\0';
-}
-static void
-print_time(const tchar *type, const struct timespec *spec)
-{
- tchar timestr[TIMESTR_MAX];
+ if (sizeof(wts->tv_sec) == 4 && sizeof(t) > sizeof(wts->tv_sec))
+ t = (uint32_t)wts->tv_sec | ((uint64_t)high_part << 32);
+ else
+ t = wts->tv_sec;
- timespec_to_string(spec, timestr);
+ gmtime_r(&t, &tm);
+ tstrftime(timestr, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm);
+ timestr[TIMESTR_MAX - 1] = '\0';
tprintf(T("%-20"TS"= %"TS"\n"), type, timestr);
}
dentry->security_descriptor_size);
}
- print_time(T("Creation Time"), &dentry->creation_time);
- print_time(T("Last Write Time"), &dentry->last_write_time);
- print_time(T("Last Access Time"), &dentry->last_access_time);
+ print_time(T("Creation Time"),
+ &dentry->creation_time, dentry->creation_time_high);
+ print_time(T("Last Write Time"),
+ &dentry->last_write_time, dentry->last_write_time_high);
+ print_time(T("Last Access Time"),
+ &dentry->last_access_time, dentry->last_access_time_high);
if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT)
break;
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_NOCHECK_OPTION:
#endif
dest_wimfile = NULL;
dest_wim_fd = STDOUT_FILENO;
- imagex_info_file = stderr;
+ imagex_output_to_stderr();
set_fd_to_binary_mode(dest_wim_fd);
}
errno = ENOENT;
break;
case IMAGEX_TO_STDOUT_OPTION:
extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT;
- imagex_info_file = stderr;
- imagex_be_quiet = true;
+ imagex_suppress_output();
set_fd_to_binary_mode(STDOUT_FILENO);
break;
case IMAGEX_INCLUDE_INVALID_NAMES_OPTION:
argc -= num_paths;
argv += num_paths;
} else {
+ const tchar *listfile = argv[0] + 1;
+
+ if (!tstrcmp(listfile, T("-"))) {
+ tputs(T("Reading pathlist file from standard input..."));
+ listfile = NULL;
+ }
+
ret = wimlib_extract_pathlist(wim, image, dest_dir,
- argv[0] + 1,
- extract_flags);
+ listfile, extract_flags);
argc--;
argv++;
}
}
if (ret == 0) {
- if (!imagex_be_quiet)
- imagex_printf(T("Done extracting files.\n"));
+ imagex_printf(T("Done extracting files.\n"));
} else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) {
if ((extract_flags & (WIMLIB_EXTRACT_FLAG_STRICT_GLOB |
WIMLIB_EXTRACT_FLAG_GLOB_PATHS))
{
int c;
bool boot = false;
- bool check = false;
- bool nocheck = false;
bool header = false;
bool blobs = false;
bool xml = false;
int image;
int ret;
int open_flags = 0;
+ int write_flags = 0;
struct wimlib_wim_info info;
for_opt(c, info_options) {
boot = true;
break;
case IMAGEX_CHECK_OPTION:
- check = true;
+ open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_NOCHECK_OPTION:
- nocheck = true;
+ write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY;
break;
case IMAGEX_HEADER_OPTION:
header = true;
goto out;
}
- if (check && nocheck) {
- imagex_error(T("Can't specify both --check and --nocheck"));
- goto out_err;
- }
-
- if (check)
- open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
-
ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim,
imagex_progress_func, NULL);
if (ret)
/* Only call wimlib_overwrite() if something actually needs to
* be changed. */
if (boot || any_property_changes ||
- (check && !info.has_integrity_table) ||
- (nocheck && info.has_integrity_table))
+ ((write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) &&
+ !info.has_integrity_table) ||
+ ((write_flags & WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY) &&
+ info.has_integrity_table))
{
- int write_flags = 0;
-
- if (check)
- write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
- if (nocheck)
- write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY;
ret = wimlib_overwrite(wim, write_flags, 1);
} else {
imagex_printf(T("The file \"%"TS"\" was not modified "
out_usage:
usage(CMD_INFO, stderr);
-out_err:
ret = -1;
goto out;
}
switch (c) {
case IMAGEX_CHECK_OPTION:
swm_open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
default:
switch (c) {
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_NOCHECK_OPTION:
switch (c) {
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
default:
break;
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ /* fall-through */
+ case IMAGEX_INCLUDE_INTEGRITY_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_REBUILD_OPTION:
" [--boot] [--check] [--nocheck] [--config=FILE]\n"
" [--threads=NUM_THREADS] [--no-acls] [--strict-acls]\n"
" [--rpfix] [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n"
-" [--wimboot] [--unix-data] [--dereference] [--snapshot]\n"
+" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n"
+" [--dereference] [--snapshot] [--create]\n"
),
[CMD_APPLY] =
T(
),
[CMD_DIR] =
T(
-" %"TS" WIMFILE IMAGE [--path=PATH] [--detailed]\n"
+" %"TS" WIMFILE [IMAGE] [--path=PATH] [--detailed]\n"
),
[CMD_EXPORT] =
T(
static void
version(void)
{
- static const tchar * const s =
+ static const tchar * const fmt =
T(
-"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
-"Copyright (C) 2012-2017 Eric Biggers\n"
+"wimlib-imagex " PACKAGE_VERSION " (using wimlib %"TS")\n"
+"Copyright (C) 2012-2018 Eric Biggers\n"
"License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\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"
);
- tfputs(s, stdout);
+ tfprintf(stdout, fmt, wimlib_get_version_string());
}
-
static void
-help_or_version(int argc, tchar **argv, int cmd)
+do_common_options(int *argc_p, tchar **argv, int cmd)
{
+ int argc = *argc_p;
int i;
const tchar *p;
} else if (!tstrcmp(p, T("version"))) {
version();
exit(0);
- }
+ } else if (!tstrcmp(p, T("quiet"))) {
+ imagex_suppress_output();
+ memmove(&argv[i], &argv[i + 1],
+ (argc - i) * sizeof(argv[i]));
+ argc--;
+ i--;
+ } else if (!*p) /* reached "--", no more options */
+ break;
}
}
+
+ *argc_p = argc;
}
static void
}
}
- /* Handle --help and --version. --help can be either for the program as
- * a whole (cmd == CMD_NONE) or just for a specific command (cmd !=
- * CMD_NONE). Note: help_or_version() will not return if a --help or
- * --version argument was found. */
- help_or_version(argc, argv, cmd);
+ /* Handle common options. May exit early (for --help or --version). */
+ do_common_options(&argc, argv, cmd);
/* Bail if a valid command was not specified. */
if (cmd == CMD_NONE) {
git://wimlib.net / wimlib / blobdiff