X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=41ab646dbacb138557d63659bb5cf11dadf33e11;hp=bc16624a17e2c174a1d9ce7511c3d06a88d8db6f;hb=b5b9681794d1f5f13350e3567f6f6e74f5c779cf;hpb=0cf4f7d1cc404113224c15cc13662acf742f2bf4 diff --git a/programs/imagex.c b/programs/imagex.c index bc16624a..41ab646d 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -130,9 +130,6 @@ static void usage_all(FILE *fp); static void recommend_man_page(int cmd, FILE *fp); static const tchar *get_cmd_string(int cmd, bool nospace); -static int imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info); - static bool imagex_be_quiet = false; static FILE *imagex_info_file; @@ -157,7 +154,6 @@ enum { IMAGEX_EXTRACT_XML_OPTION, IMAGEX_FLAGS_OPTION, IMAGEX_FORCE_OPTION, - IMAGEX_HARDLINK_OPTION, IMAGEX_HEADER_OPTION, IMAGEX_INCLUDE_INVALID_NAMES_OPTION, IMAGEX_LAZY_OPTION, @@ -190,7 +186,6 @@ enum { IMAGEX_STAGING_DIR_OPTION, IMAGEX_STREAMS_INTERFACE_OPTION, IMAGEX_STRICT_ACLS_OPTION, - IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, @@ -203,8 +198,6 @@ enum { static const struct option apply_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("hardlink"), no_argument, NULL, IMAGEX_HARDLINK_OPTION}, - {T("symlink"), no_argument, NULL, IMAGEX_SYMLINK_OPTION}, {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, @@ -289,6 +282,7 @@ static const struct option export_options[] = { {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, + {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -479,7 +473,9 @@ verify_image_exists_and_is_single(int image, const tchar *image_name, static int get_compression_type(const tchar *optarg) { - if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx"))) + if (!tstrcasecmp(optarg, T("maximum")) || + !tstrcasecmp(optarg, T("lzx")) || + !tstrcasecmp(optarg, T("max"))) return WIMLIB_COMPRESSION_TYPE_LZX; else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) return WIMLIB_COMPRESSION_TYPE_XPRESS; @@ -581,8 +577,7 @@ wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) return wimlib_reference_resource_files(wim, set->strings, set->num_strings, WIMLIB_REF_FLAG_GLOB_ENABLE, - open_flags, - imagex_progress_func); + open_flags); } static void @@ -1021,18 +1016,18 @@ report_scan_progress(const struct wimlib_progress_info_scan *scan, bool done) last_scan_progress = *scan; } } - /* Progress callback function passed to various wimlib functions. */ -static int +static enum wimlib_progress_status imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info) + union wimlib_progress_info *info, + void *_ignored_context) { unsigned percent_done; unsigned unit_shift; const tchar *unit_name; if (imagex_be_quiet) - return 0; + return WIMLIB_PROGRESS_STATUS_CONTINUE; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: { @@ -1157,15 +1152,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.total_parts); } break; - case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: - imagex_printf(T("Setting timestamps on all extracted files...\n")); - break; - case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END: - if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { - imagex_printf(T("Unmounting NTFS volume \"%"TS"\"...\n"), - info->extract.target); - } - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); @@ -1216,7 +1202,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, break; } fflush(imagex_info_file); - return 0; + return WIMLIB_PROGRESS_STATUS_CONTINUE; } static unsigned @@ -1456,7 +1442,7 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars, } /* Apply one image, or all images, from a WIM file to a directory, OR apply - * one image from a WIM file to a NTFS volume. */ + * one image from a WIM file to an NTFS volume. */ static int imagex_apply(int argc, tchar **argv, int cmd) { @@ -1478,12 +1464,6 @@ imagex_apply(int argc, tchar **argv, int cmd) case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; break; - case IMAGEX_HARDLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_HARDLINK; - break; - case IMAGEX_SYMLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_SYMLINK; - break; case IMAGEX_VERBOSE_OPTION: /* No longer does anything. */ break; @@ -1542,8 +1522,8 @@ imagex_apply(int argc, tchar **argv, int cmd) } wim = NULL; } else { - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -1586,7 +1566,7 @@ imagex_apply(int argc, tchar **argv, int cmd) #ifndef __WIN32__ { - /* Interpret a regular file or block device target as a NTFS + /* Interpret a regular file or block device target as an NTFS * volume. */ struct stat stbuf; @@ -1605,14 +1585,16 @@ imagex_apply(int argc, tchar **argv, int cmd) #endif if (wim) { - ret = wimlib_extract_image(wim, image, target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image(wim, image, target, extract_flags); } else { set_fd_to_binary_mode(STDIN_FILENO); - ret = wimlib_extract_image_from_pipe(STDIN_FILENO, - image_num_or_name, - target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image_from_pipe_with_progress( + STDIN_FILENO, + image_num_or_name, + target, + extract_flags, + imagex_progress_func, + NULL); } if (ret == 0) { imagex_printf(T("Done applying WIM image.\n")); @@ -1820,9 +1802,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { + /* No compression type specified. Use the default. */ + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) { + /* With --wimboot, default to XPRESS compression. */ compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) { + /* With --pack-streams or --solid, default to LZMS + * compression. (However, this will not affect packed + * resources!) */ + compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; } else { + /* Otherwise, default to LZX compression in fast mode. + */ compression_type = WIMLIB_COMPRESSION_TYPE_LZX; if (!compress_slow && pack_ctype != WIMLIB_COMPRESSION_TYPE_LZX) { struct wimlib_lzx_compressor_params params = { @@ -1944,13 +1936,17 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } /* Open the existing WIM, or create a new one. */ - if (cmd == CMD_APPEND) - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); - else + if (cmd == CMD_APPEND) { + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); + if (ret) + goto out_free_capture_sources; + } else { ret = wimlib_create_new_wim(compression_type, &wim); - if (ret) - goto out_free_capture_sources; + if (ret) + goto out_free_capture_sources; + wimlib_register_progress_function(wim, imagex_progress_func, NULL); + } /* Set chunk size if non-default. */ if (chunk_size != UINT32_MAX) { @@ -2023,9 +2019,10 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } for (size_t i = 0; i < base_wimfiles.num_strings; i++) { - ret = wimlib_open_wim(base_wimfiles.strings[i], - open_flags, &base_wims[i], - imagex_progress_func); + ret = wimlib_open_wim_with_progress( + base_wimfiles.strings[i], + open_flags, &base_wims[i], + imagex_progress_func, NULL); if (ret) goto out_free_base_wims; @@ -2059,8 +2056,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } else if (template_wimfile == wimfile) { template_wim = wim; } else { - ret = wimlib_open_wim(template_wimfile, open_flags, - &template_wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(template_wimfile, + open_flags, + &template_wim, + imagex_progress_func, + NULL); if (ret) goto out_free_base_wims; } @@ -2096,8 +2096,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) num_sources, name, config_file, - add_image_flags, - imagex_progress_func); + add_image_flags); if (ret) goto out_free_template_wim; @@ -2134,7 +2133,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, template_wim, template_image, - 0, NULL); + 0); if (ret) goto out_free_template_wim; } @@ -2143,16 +2142,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Write the new WIM or overwrite the existing WIM with the new image * appended. */ if (cmd == CMD_APPEND) { - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); } else if (wimfile) { ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } else { ret = wimlib_write_to_fd(wim, wim_fd, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } out_free_template_wim: /* template_wim may alias base_wims[0] or wim. */ @@ -2220,8 +2216,8 @@ imagex_delete(int argc, tchar **argv, int cmd) wimfile = argv[0]; image_num_or_name = argv[1]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -2238,7 +2234,7 @@ imagex_delete(int argc, tchar **argv, int cmd) goto out_wimlib_free; } - ret = wimlib_overwrite(wim, write_flags, 0, imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, 0); if (ret) { imagex_error(T("Failed to write the file \"%"TS"\" with image " "deleted"), wimfile); @@ -2433,6 +2429,11 @@ print_dentry_detailed(const struct wimlib_dir_entry *dentry) tprintf(T("Link Group ID = 0x%016"PRIx64"\n"), dentry->hard_link_group_id); tprintf(T("Link Count = %"PRIu32"\n"), dentry->num_links); + if (dentry->unix_mode != 0) { + tprintf(T("UNIX Data = uid:%"PRIu32" gid:%"PRIu32" mode:0%"PRIo32"\n"), + dentry->unix_uid, dentry->unix_gid, dentry->unix_mode); + } + for (uint32_t i = 0; i <= dentry->num_named_streams; i++) { if (dentry->streams[i].stream_name) { tprintf(T("\tData stream \"%"TS"\":\n"), @@ -2498,7 +2499,8 @@ imagex_dir(int argc, tchar **argv, int cmd) } wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, 0, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, 0, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -2544,7 +2546,7 @@ imagex_export(int argc, tchar **argv, int cmd) { int c; int open_flags = 0; - int export_flags = 0; + int export_flags = WIMLIB_EXPORT_FLAG_GIFT; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *src_wimfile; @@ -2624,6 +2626,9 @@ imagex_export(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + case IMAGEX_WIMBOOT_OPTION: + export_flags |= WIMLIB_EXPORT_FLAG_WIMBOOT; + break; default: goto out_usage; } @@ -2637,8 +2642,8 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = argv[2]; dest_name = (argc >= 4) ? argv[3] : NULL; dest_desc = (argc >= 5) ? argv[4] : NULL; - ret = wimlib_open_wim(src_wimfile, open_flags, &src_wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(src_wimfile, open_flags, &src_wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -2678,9 +2683,12 @@ imagex_export(int argc, tchar **argv, int cmd) ret = -1; goto out_free_src_wim; } - ret = wimlib_open_wim(dest_wimfile, - open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, - &dest_wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(dest_wimfile, + open_flags | + WIMLIB_OPEN_FLAG_WRITE_ACCESS, + &dest_wim, + imagex_progress_func, + NULL); if (ret) goto out_free_src_wim; @@ -2714,18 +2722,34 @@ imagex_export(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { /* The user did not specify a compression type; default - * to that of the source WIM. */ - - compression_type = src_info.compression_type; + * to that of the source WIM, unless --pack-streams, + * --solid, or --wimboot was specified. */ + + if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) + compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; + else if (export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) + compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + else + compression_type = src_info.compression_type; } ret = wimlib_create_new_wim(compression_type, &dest_wim); if (ret) goto out_free_src_wim; - /* Use same chunk size if compression type is the same. */ - if (compression_type == src_info.compression_type && - chunk_size == UINT32_MAX) + wimlib_register_progress_function(dest_wim, + imagex_progress_func, NULL); + + if ((export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) + && compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) + { + /* For --wimboot export, use small XPRESS chunks. */ + wimlib_set_output_chunk_size(dest_wim, 4096); + } else if (compression_type == src_info.compression_type && + chunk_size == UINT32_MAX) + { + /* Use same chunk size if compression type is the same. */ wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size); + } } if (chunk_size != UINT32_MAX) { @@ -2766,7 +2790,7 @@ imagex_export(int argc, tchar **argv, int cmd) } ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, - dest_desc, export_flags, imagex_progress_func); + dest_desc, export_flags); if (ret) { if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { do_resource_not_found_warning(src_wimfile, @@ -2776,16 +2800,14 @@ imagex_export(int argc, tchar **argv, int cmd) } if (!wim_is_new) - ret = wimlib_overwrite(dest_wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(dest_wim, write_flags, num_threads); else if (dest_wimfile) ret = wimlib_write(dest_wim, dest_wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); else ret = wimlib_write_to_fd(dest_wim, dest_wim_fd, WIMLIB_ALL_IMAGES, write_flags, - num_threads, imagex_progress_func); + num_threads); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: @@ -2854,6 +2876,7 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; imagex_info_file = stderr; imagex_be_quiet = true; + set_fd_to_binary_mode(STDOUT_FILENO); break; case IMAGEX_INCLUDE_INVALID_NAMES_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; @@ -2894,7 +2917,8 @@ imagex_extract(int argc, tchar **argv, int cmd) argc -= 2; argv += 2; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -2929,15 +2953,13 @@ imagex_extract(int argc, tchar **argv, int cmd) ret = wimlib_extract_paths(wim, image, dest_dir, (const tchar **)argv, num_paths, - extract_flags | notlist_extract_flags, - imagex_progress_func); + extract_flags | notlist_extract_flags); argc -= num_paths; argv += num_paths; } else { ret = wimlib_extract_pathlist(wim, image, dest_dir, argv[0] + 1, - extract_flags, - imagex_progress_func); + extract_flags); argc--; argv++; } @@ -3048,7 +3070,8 @@ imagex_info(int argc, tchar **argv, int cmd) if (check) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -3218,8 +3241,7 @@ imagex_info(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; if (nocheck) write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; - ret = wimlib_overwrite(wim, write_flags, 1, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, 1); } else { imagex_printf(T("The file \"%"TS"\" was not modified " "because nothing needed to be done.\n"), @@ -3268,12 +3290,13 @@ imagex_join(int argc, tchar **argv, int cmd) goto out_usage; } output_path = argv[0]; - ret = wimlib_join((const tchar * const *)++argv, - --argc, - output_path, - swm_open_flags, - wim_write_flags, - imagex_progress_func); + ret = wimlib_join_with_progress((const tchar * const *)++argv, + --argc, + output_path, + swm_open_flags, + wim_write_flags, + imagex_progress_func, + NULL); out: return ret; @@ -3353,7 +3376,8 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -3487,7 +3511,8 @@ imagex_optimize(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -3522,8 +3547,7 @@ imagex_optimize(int argc, tchar **argv, int cmd) else tprintf(T("%"PRIu64" KiB\n"), old_size >> 10); - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); if (ret) { imagex_error(T("Optimization of \"%"TS"\" failed."), wimfile); goto out_wimlib_free; @@ -3591,11 +3615,12 @@ imagex_split(int argc, tchar **argv, int cmd) "floating-point number of megabytes.")); goto out_err; } - ret = wimlib_open_wim(argv[0], open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(argv[0], open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; - ret = wimlib_split(wim, argv[1], part_size, write_flags, imagex_progress_func); + ret = wimlib_split(wim, argv[1], part_size, write_flags); wimlib_free(wim); out: return ret; @@ -3651,8 +3676,8 @@ imagex_unmount(int argc, tchar **argv, int cmd) imagex_printf(T("Committing changes as new image...\n")); } - ret = wimlib_unmount_image(argv[0], unmount_flags, - imagex_progress_func); + ret = wimlib_unmount_image_with_progress(argv[0], unmount_flags, + imagex_progress_func, NULL); if (ret) imagex_error(T("Failed to unmount \"%"TS"\""), argv[0]); out: @@ -3769,7 +3794,8 @@ imagex_update(int argc, tchar **argv, int cmd) goto out_usage; wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_command_str; @@ -3845,8 +3871,7 @@ imagex_update(int argc, tchar **argv, int cmd) } /* Execute the update commands */ - ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags, - imagex_progress_func); + ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags); if (ret) goto out_free_cmds; @@ -3862,15 +3887,13 @@ imagex_update(int argc, tchar **argv, int cmd) cmd.add.config_file = NULL; cmd.add.add_flags = 0; - ret = wimlib_update_image(wim, image, &cmd, 1, - update_flags, imagex_progress_func); + ret = wimlib_update_image(wim, image, &cmd, 1, update_flags); if (ret) goto out_free_cmds; } /* Overwrite the updated WIM */ - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); out_free_cmds: free(cmds); out_free_cmd_file_contents: @@ -3932,8 +3955,8 @@ T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" " (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" " [--no-acls] [--strict-acls] [--no-attributes]\n" -" [--rpfix] [--norpfix] [--hardlink] [--symlink]\n" -" [--include-invalid-names] [--wimboot]\n" +" [--rpfix] [--norpfix] [--include-invalid-names]\n" +" [--wimboot] [--unix-data]\n" ), [CMD_CAPTURE] = T( @@ -3943,7 +3966,7 @@ T( " [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" " [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" " [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" -" [--delta-from=WIMFILE] [--wimboot]\n" +" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n" ), [CMD_DELETE] = T( @@ -3984,13 +4007,13 @@ T( T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" -" [--ref=\"GLOB\"] [--allow-other]\n" +" [--ref=\"GLOB\"] [--allow-other] [--unix-data]\n" ), [CMD_MOUNTRW] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" -" [--staging-dir=CMD_DIR] [--allow-other]\n" +" [--staging-dir=CMD_DIR] [--allow-other] [--unix-data]\n" ), #endif [CMD_OPTIMIZE] = @@ -4133,7 +4156,7 @@ usage_all(FILE *fp) /* Entry point for wimlib's ImageX implementation. On UNIX the command * arguments will just be 'char' strings (ideally UTF-8 encoded, but could be - * something else), while an Windows the command arguments will be UTF-16LE + * something else), while on Windows the command arguments will be UTF-16LE * encoded 'wchar_t' strings. */ int #ifdef __WIN32__