wimextract: Rename --no-wildcards to --no-globs; update man page

diff --git a/doc/man1/imagex-extract.1.in b/doc/man1/imagex-extract.1.in
index cf60cbe6818fd30f6c138c684402b5cb27444dbe..a46e432e1920cdcf3639aca7cc2d71b07ff90f00 100644 (file)
--- a/doc/man1/imagex-extract.1.in
+++ b/doc/man1/imagex-extract.1.in
@@ -56,8 +56,8 @@ case, the default behavior may be overridden through the
 By default, each path may contain the wildcard characters '?' and '*'.  The '?'
 character matches any non-path-separator character, whereas the '*' character
 matches zero or more non-path-separator characters.  Consequently, a single
-wildcard pattern may expand to multiple actual files or directories.  Use the
-\fB--no-wildcards\fR option to disable wildcard matching and search for each
+wildcard path, or "glob", may expand to multiple actual files or directories.
+Use the \fB--no-globs\fR option to disable wildcard matching and search for each
 path literally.
 .PP
 Each \fILISTFILE\fR must be a text file (UTF-8 or UTF-16LE encoded; plain ASCII
@@ -123,18 +123,24 @@ See the documentation for this option in \fB@IMAGEX_PROGNAME@-apply\fR (1).
 \fB--include-invalid-names\fR
 See the documentation for this option in \fB@IMAGEX_PROGNAME@-apply\fR (1).
 .TP
-\fB--no-wildcards\fR
-Do not interpret wildcard characters in paths.  Each path will be searched for
-literally.
+\fB--no-globs\fR
+Do not recognize wildcard characters in paths.  Each path will be searched for
+literally.  In addition, if case insensitivity is enabled, do not allow a single
+path to match multiple files with the same case-insensitive name but different
+case-sensitive names.
+.IP
+\fB--no-wildcards\fR is also accepted as an alias for this option.
 .TP
 \fB--nullglob\fR
-If a wildcard pattern (a.k.a. a "glob") does not match any paths, ignore it and
-print a warning instead of failing with an error.  In other words, this option
-allows a wildcard pattern to successfully match zero files.  Note that this
-applies even if one of the paths does not contain wildcard characters.  Such a
-path is still treated as a "wildcard pattern", so with this option it may not
-match anything and therefore produce no error.  This option cannot be combined
-with \fB--no-wildcards\fR, as that would be meaningless.
+If a glob does not match any files, ignore it and print a warning instead of
+failing with an error.  In other words, this option allows a glob to
+successfully match zero files.
+.IP
+This option also affects paths that do not contain wildcard characters, since
+such paths are still considered globs unless \fB--no-globs\fR is enabled.  If
+case-insensitivity is enabled, such a glob could match multiple files with the
+same case-insensitive name but different case-sensitive names, whereas a
+non-glob path (with \fB--no-globs\fR) can match at most one file.
 .TP
 \fB--preserve-dir-structure\fR
 When extracting paths, preserve the archive directory structure instead of

diff --git a/programs/imagex.c b/programs/imagex.c
index 1a8407045dfaa46f30411fb43b844942b11bbbc2..79fe2b8fdcee9d7ab1154938e691a8232575a60e 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -166,7 +166,7 @@ enum {
        IMAGEX_NO_ACLS_OPTION,
        IMAGEX_NO_ATTRIBUTES_OPTION,
        IMAGEX_NO_REPLACE_OPTION,
-       IMAGEX_NO_WILDCARDS_OPTION,
+       IMAGEX_NO_GLOBS_OPTION,
        IMAGEX_NULLGLOB_OPTION,
        IMAGEX_ONE_FILE_ONLY_OPTION,
        IMAGEX_PACK_CHUNK_SIZE_OPTION,
@@ -298,7 +298,8 @@ static const struct option extract_options[] = {
        {T("dest-dir"),    required_argument, NULL, IMAGEX_DEST_DIR_OPTION},
        {T("to-stdout"),   no_argument,       NULL, IMAGEX_TO_STDOUT_OPTION},
        {T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
-       {T("no-wildcards"), no_argument,      NULL, IMAGEX_NO_WILDCARDS_OPTION},
+       {T("no-wildcards"), no_argument,      NULL, IMAGEX_NO_GLOBS_OPTION},
+       {T("no-globs"),     no_argument,      NULL, IMAGEX_NO_GLOBS_OPTION},
        {T("nullglob"),     no_argument,      NULL, IMAGEX_NULLGLOB_OPTION},
        {T("preserve-dir-structure"), no_argument, NULL, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION},
        {T("wimboot"),     no_argument,       NULL, IMAGEX_WIMBOOT_OPTION},
@@ -2915,7 +2916,7 @@ imagex_extract(int argc, tchar **argv, int cmd)
                        extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES;
                        extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
                        break;
-               case IMAGEX_NO_WILDCARDS_OPTION:
+               case IMAGEX_NO_GLOBS_OPTION:
                        extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS;
                        break;
                case IMAGEX_NULLGLOB_OPTION:
@@ -2940,7 +2941,7 @@ imagex_extract(int argc, tchar **argv, int cmd)
        if (!(extract_flags & (WIMLIB_EXTRACT_FLAG_GLOB_PATHS |
                               WIMLIB_EXTRACT_FLAG_STRICT_GLOB)))
        {
-               imagex_error(T("Can't combine --no-wildcards and --nullglob!"));
+               imagex_error(T("Can't combine --no-globs and --nullglob!"));
                goto out_err;
        }
 
@@ -4045,7 +4046,7 @@ T(
 "                    [--check] [--ref=\"GLOB\"] [--dest-dir=CMD_DIR]\n"
 "                    [--to-stdout] [--no-acls] [--strict-acls]\n"
 "                    [--no-attributes] [--include-invalid-names]\n"
-"                    [--no-wildcards] [--nullglob] [--preserve-dir-structure]\n"
+"                    [--no-globs] [--nullglob] [--preserve-dir-structure]\n"
 ),
 [CMD_INFO] =
 T(