Switched to usage of libjte-2.0.0. New -jigdo parameters "checksum_algorithm", "demand_checksum", "checksum_path". New -as mkisofs options-jigdo-checksum-algorithm, "-checksum-list", "-jigdo-force-checksum".

This commit is contained in:
2019-11-24 13:34:30 +01:00
parent c4894d8ae3
commit 1557304c96
12 changed files with 326 additions and 182 deletions

View File

@ -657,8 +657,10 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-alpha-boot", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
"-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot",
"-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size",
"-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list",
"-jigdo-template-compress",
"-jigdo-force-md5", "-jigdo-force-checksum",
"-md5-list", "-checksum-list",
"-jigdo-exclude", "-jigdo-map",
"-jigdo-template-compress", "-jigdo-checksum-algorithm",
"-checksum_algorithm_iso", "-checksum_algorithm_template",
"--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot",
"-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl",
@ -852,11 +854,16 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -jigdo-jigdo FILE Produce a jigdo .jigdo file as well as the .iso",
" -jigdo-template FILE Produce a jigdo .template file as well as the .iso",
" -jigdo-min-file-size SIZE Minimum size for a file to be listed in the jigdo file",
" -jigdo-force-md5 PATTERN Pattern(s) where files MUST match an externally-supplied MD5sum",
" -jigdo-force-checksum PTRN Pattern(s) where files MUST match an externally-supplied checksum",
" -jigdo-force-md5 PATTERN Outdated alias of -jigdo-force-checksum",
" -jigdo-exclude PATTERN Pattern(s) to exclude from the jigdo file",
" -jigdo-map PATTERN1=PATTERN2",
" Pattern(s) to map paths (e.g. Debian=/mirror/debian)",
" -md5-list FILE File containing MD5 sums of the files that should be checked",
" -checksum-list FILE File containing checksums of the files that should be checked",
" -md5-list FILE Outdated alias of -checksum-list",
" -jigdo-checksum-algorithm ALGORITHM",
" Choose algorithm for file matching checksums: md5, sha256",
" Expected in the -checksum-list FILE, written into .jigdo file.",
" -jigdo-template-compress ALGORITHM",
" Choose to use gzip or bzip2 compression for template data; default is gzip",
" -checksum_algorithm_iso alg1,alg2,...",
@ -2097,11 +2104,14 @@ not_enough_args:;
strcmp(argpt, "-jigdo-min-file-size") == 0 ||
strcmp(argpt, "-jigdo-exclude") == 0 ||
strcmp(argpt, "-jigdo-force-md5") == 0 ||
strcmp(argpt, "-jigdo-force-checksum") == 0 ||
strcmp(argpt, "-jigdo-map") == 0 ||
strcmp(argpt, "-jigdo-checksum-algorithm") == 0 ||
strcmp(argpt, "-jigdo-template-compress") == 0 ||
strcmp(argpt, "-checksum_algorithm_iso") == 0 ||
strcmp(argpt, "-checksum_algorithm_template") == 0 ||
strcmp(argpt, "-md5-list") == 0) {
strcmp(argpt, "-md5-list") == 0 ||
strcmp(argpt, "-checksum-list") == 0) {
i++;
ret= Xorriso_option_jigdo(xorriso, argpt, argv[i], 0);
if(ret <= 0)