"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xorriso/emulators.c" between
xorriso-1.5.2.tar.gz and xorriso-1.5.4.tar.gz

About: GNU xorriso creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. It is suitable for incremental data backup and for production of bootable ISO 9660 images. GNU xorriso is a statical compilation of the libraries libburn, libisofs, libisoburn, and libjte.

emulators.c  (xorriso-1.5.2):emulators.c  (xorriso-1.5.4)
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2019 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2020 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
This file contains the implementation of emulators for mkisofs and cdrecord. This file contains the implementation of emulators for mkisofs and cdrecord.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"
#endif #endif
skipping to change at line 94 skipping to change at line 94
"\t--grow_overwriteable_iso\temulate multi-session on DVD+RW, BD-RE", "\t--grow_overwriteable_iso\temulate multi-session on DVD+RW, BD-RE",
"\twrite_start_address=#\t\twrite to byte address on DVD+RW, BD-RE", "\twrite_start_address=#\t\twrite to byte address on DVD+RW, BD-RE",
"\tstream_recording=on|number\ttry to get full speed on DVD-RAM, BD", "\tstream_recording=on|number\ttry to get full speed on DVD-RAM, BD",
"\tuse_immed_bit=on|off|default\tcontrol use of Immed bit", "\tuse_immed_bit=on|off|default\tcontrol use of Immed bit",
"\tdvd_obs=default|32k|64k\t\tbytes per DVD/BD write operation", "\tdvd_obs=default|32k|64k\t\tbytes per DVD/BD write operation",
"\tstdio_sync=on|off|end|number\twhether to fsync output to \"stdio:\"", "\tstdio_sync=on|off|end|number\twhether to fsync output to \"stdio:\"",
"\t--no_rc\t\tDo not execute xorriso startup files", "\t--no_rc\t\tDo not execute xorriso startup files",
"\t-help\t\tprint this text to stderr and exit emulation", "\t-help\t\tprint this text to stderr and exit emulation",
"Actually this is the integrated ISO RockRidge filesystem manipulator xorriso", "Actually this is the integrated ISO RockRidge filesystem manipulator xorriso",
"lending its libburn capabilities to a very limited cdrecord emulation. Only", "lending its libburn capabilities to a very limited cdrecord emulation. Only",
"a single data track can be burnt to blank, appendable or overwriteable media.", "a single data track can be burnt to blank, appendable or overwritable media.",
"A much more elaborate cdrecord emulator is cdrskin from the same project.", "A much more elaborate cdrecord emulator is cdrskin from the libburn package.",
"",
#ifdef Xorriso_GNU_xorrisO
"Report bugs to: bug-xorriso@gnu.org , or in private to: scdbackup@gmx.net .",
"xorriso home page: <https://www.gnu.org/software/xorriso/>",
"General help using GNU software: <https://www.gnu.org/gethelp/>",
#else
"Report any bugs to bug-xorriso@gnu.org or in private to scdbackup@gmx.net .",
#endif
"@End_of_helptexT@" "@End_of_helptexT@"
}; };
int i; int i;
for(i= 0; strcmp(helptext[i], "@End_of_helptexT@")!=0; i++) { for(i= 0; strcmp(helptext[i], "@End_of_helptexT@")!=0; i++) {
sprintf(xorriso->info_text, "%s\n", helptext[i]); sprintf(xorriso->info_text, "%s\n", helptext[i]);
Xorriso_info(xorriso,0); Xorriso_info(xorriso,0);
} }
return(1); return(1);
} }
skipping to change at line 493 skipping to change at line 501
ret= Wait_for_input(0,1000000,0); ret= Wait_for_input(0,1000000,0);
if(ret<0 || feof(stdin)) { if(ret<0 || feof(stdin)) {
Xorriso_msgs_submit(xorriso, 0, Xorriso_msgs_submit(xorriso, 0,
"stdin produces exception rather than data", 0, "NOTE", 0); "stdin produces exception rather than data", 0, "NOTE", 0);
} }
sprintf(xorriso->info_text, "xorriso: Option -waiti pausing is done.\n"); sprintf(xorriso->info_text, "xorriso: Option -waiti pausing is done.\n");
} }
if(dev_adr[0]) { if(dev_adr[0]) {
hflag= 2 | 64; /* ts B11201 no more: | 32 */ hflag= 2 | 64; /* ts B11201 no more: | 32 */
if(!do_grow) if(!do_grow)
hflag|= 8; /* consider overwriteables as blank */ hflag|= 8; /* consider overwritables as blank */
ret= Xorriso_option_dev(xorriso, dev_adr, hflag); ret= Xorriso_option_dev(xorriso, dev_adr, hflag);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
if(xorriso->out_drive_handle==NULL) { if(xorriso->out_drive_handle==NULL) {
sprintf(xorriso->info_text, "-as %s: No output drive selected", whom); sprintf(xorriso->info_text, "-as %s: No output drive selected", whom);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
skipping to change at line 626 skipping to change at line 634
"-untranslated-filenames", "-verbose", "-version", "-g", "-h", "-untranslated-filenames", "-verbose", "-version", "-g", "-h",
"-no-mac-files", "-chrp-boot", "-no-mac-files", "-chrp-boot",
"--hardlinks", "--acl", "--xattr", "--xattr-any", "--md5", "--for_backup", "--hardlinks", "--acl", "--xattr", "--xattr-any", "--md5", "--for_backup",
"--protective-msdos-label", "--boot-catalog-hide", "--no-emul-toc", "--protective-msdos-label", "--boot-catalog-hide", "--no-emul-toc",
"--emul-toc", "-disallow_dir_id_ext", "--old-empty", "--emul-toc", "-disallow_dir_id_ext", "--old-empty",
"--old-root-no-md5", "--old-root-devno", "--old-root-no-ino", "--old-root-no-md5", "--old-root-devno", "--old-root-no-ino",
"--no_rc", "--norock", "-hfsplus", "-fat", "-chrp-boot-part", "--no_rc", "--norock", "-hfsplus", "-fat", "-chrp-boot-part",
"-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus", "-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus",
"-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16", "-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16",
"-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable", "-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable",
"-part_like_isohybrid", "-part_like_isohybrid", "--zisofs-version-2", "--zisofs2-susp-z2",
"--zisofs2-susp-zf",
"" ""
}; };
static char arg1_options[][41]= { static char arg1_options[][41]= {
"-abstract", "-A", "-appid", "--application_use", "-abstract", "-A", "-appid", "--application_use",
"-biblio", "-b", "-B", "-boot-load-seg", "-biblio", "-b", "-B", "-boot-load-seg",
"-boot-load-size", "-C", "-c", "-check-session", "-copyright", "-boot-load-size", "-C", "-c", "-check-session", "-copyright",
"-dir-mode", "-eltorito-id", "-eltorito-selcrit", "-dir-mode", "-eltorito-id", "-eltorito-selcrit",
"-file-mode", "-G", "-gid", "-hide", "-hide-list", "-file-mode", "-G", "-gid", "-hide", "-hide-list",
"-hidden", "-hidden-list", "-hide-joliet", "-hide-joliet-list", "-hidden", "-hidden-list", "-hide-joliet", "-hide-joliet-list",
"-hide-hfsplus", "-hide-hfsplus-list", "-hide-hfsplus", "-hide-hfsplus-list",
skipping to change at line 655 skipping to change at line 664
"-map", "-magic", "-hfs-creator", "-hfs-type", "-boot-hfs-file", "-auto", "-map", "-magic", "-hfs-creator", "-hfs-type", "-boot-hfs-file", "-auto",
"-cluster-size", "-hide-hfs", "-hide-hfs-list", "-hfs-volid", "-cluster-size", "-hide-hfs", "-hide-hfs-list", "-hfs-volid",
"-root-info", "-prep-boot", "-input-hfs-charset", "-output-hfs-charset", "-root-info", "-prep-boot", "-input-hfs-charset", "-output-hfs-charset",
"-hfs-bless", "-hfs-parms", "-hfs-bless", "-hfs-parms",
"-eltorito-boot", "-generic-boot", "-eltorito-catalog", "-cdrecord-params", "-eltorito-boot", "-generic-boot", "-eltorito-catalog", "-cdrecord-params",
"-errctl", "-exclude", "-prev-session", "-output", "-use-fileversion", "-errctl", "-exclude", "-prev-session", "-output", "-use-fileversion",
"-volid", "-old-exclude", "-volid", "-old-exclude",
"-alpha-boot", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64", "-alpha-boot", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
"-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot", "-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot",
"-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size", "-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size",
"-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list", "-jigdo-force-md5", "-jigdo-force-checksum",
"-jigdo-template-compress", "-md5-list", "-checksum-list",
"-jigdo-exclude", "-jigdo-map",
"-jigdo-template-compress", "-jigdo-checksum-algorithm",
"-checksum_algorithm_iso", "-checksum_algorithm_template", "-checksum_algorithm_iso", "-checksum_algorithm_template",
"--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot", "--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot",
"-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl", "-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl",
"-partition_sec_hd", "-partition_cyl_align", "-untranslated_name_len", "-partition_sec_hd", "-partition_cyl_align", "-untranslated_name_len",
"-rr_reloc_dir", "-hfsplus-serial-no", "-prep-boot-part", "-efi-boot-part", "-rr_reloc_dir", "-hfsplus-serial-no", "-prep-boot-part", "-efi-boot-part",
"-hfsplus-block-size", "-apm-block-size", "--grub2-mbr", "-hfsplus-block-size", "-apm-block-size", "--grub2-mbr",
"--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns", "--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns",
"-hppa-hdrversion", "-file_name_limit", "--set_all_file_dates", "-hppa-hdrversion", "-file_name_limit", "--set_all_file_dates",
"--gpt_disk_guid", "-iso_mbr_part_type", "-eltorito-platform", "--gpt_disk_guid", "-iso_mbr_part_type", "-eltorito-platform",
"" ""
skipping to change at line 720 skipping to change at line 731
*/ */
int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom, int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom,
char *argpt, int *i, int flag) char *argpt, int *i, int flag)
{ {
/* mkisofs 2.01 options which are not scheduled for implementation, yet */ /* mkisofs 2.01 options which are not scheduled for implementation, yet */
static char ignored_arg0_options[][41]= { static char ignored_arg0_options[][41]= {
"-allow-leading-dots", "-ldots", "-allow-multidot", "-allow-leading-dots", "-ldots", "-allow-multidot",
"-cache-inodes", "-check-oldnames", "-cache-inodes", "-check-oldnames",
"-L", "-no-bak", "-no-cache-inodes", "-L", "-no-bak", "-no-cache-inodes",
"-no-split-symlink-components", "-no-split-symlink-fields", "-nobak", "-no-split-symlink-components", "-no-split-symlink-fields", "-nobak",
"-force-rr", "-T", "-force-rr", "-T", "-translation-table",
"-no-iso-translate", "-no-iso-translate",
"" ""
}; };
static char ignored_arg1_options[][41]= { static char ignored_arg1_options[][41]= {
"-check-session", "-hide-hfs", "-hide-hfs-list", "-check-session", "-hide-hfs", "-hide-hfs-list",
"-table-name", "-volset-seqno", "-volset-size", "-sort", "-table-name", "-volset-seqno", "-volset-size", "-sort",
"" ""
}; };
int k; int k;
skipping to change at line 847 skipping to change at line 858
" -A ID, -appid ID Set Application ID", " -A ID, -appid ID Set Application ID",
" -sysid ID Set System ID", " -sysid ID Set System ID",
" -p PREP, -preparer PREP Set Volume preparer", " -p PREP, -preparer PREP Set Volume preparer",
" -abstract FILE Set Abstract filename", " -abstract FILE Set Abstract filename",
" -biblio FILE Set Bibliographic filename", " -biblio FILE Set Bibliographic filename",
" -copyright FILE Set Copyright filename", " -copyright FILE Set Copyright filename",
" --application_use CHAR|PATH Set content of Application Use field", " --application_use CHAR|PATH Set content of Application Use field",
" -jigdo-jigdo FILE Produce a jigdo .jigdo file as well as the .iso", " -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 .is o", " -jigdo-template FILE Produce a jigdo .template file as well as the .is o",
" -jigdo-min-file-size SIZE Minimum size for a file to be listed in the jigdo file", " -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-s " -jigdo-force-checksum PTRN Pattern(s) where files MUST match an externally-s
upplied MD5sum", upplied checksum",
" -jigdo-force-md5 PATTERN Outdated alias of -jigdo-force-checksum",
" -jigdo-exclude PATTERN Pattern(s) to exclude from the jigdo file", " -jigdo-exclude PATTERN Pattern(s) to exclude from the jigdo file",
" -jigdo-map PATTERN1=PATTERN2", " -jigdo-map PATTERN1=PATTERN2",
" Pattern(s) to map paths (e.g. Debian=/mirror/debi an)", " Pattern(s) to map paths (e.g. Debian=/mirror/debi an)",
" -md5-list FILE File containing MD5 sums of the files that should " -checksum-list FILE File containing checksums of the files that shoul
be checked", d 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", " -jigdo-template-compress ALGORITHM",
" Choose to use gzip or bzip2 compression for templ ate data; default is gzip", " Choose to use gzip or bzip2 compression for templ ate data; default is gzip",
" -checksum_algorithm_iso alg1,alg2,...", " -checksum_algorithm_iso alg1,alg2,...",
" Specify the checksum types desired for the output image (in .jigdo)", " Specify the checksum types desired for the output image (in .jigdo)",
" -checksum_algorithm_template alg1,alg2,...", " -checksum_algorithm_template alg1,alg2,...",
" Specify the checksum types desired for the output jigdo template", " Specify the checksum types desired for the output jigdo template",
" -eltorito-platform Set El Torito platform id for the next boot entry ", " -eltorito-platform Set El Torito platform id for the next boot entry ",
" -b FILE, -eltorito-boot FILE", " -b FILE, -eltorito-boot FILE",
" Set El Torito boot image name", " Set El Torito boot image name",
" -eltorito-alt-boot Start specifying alternative El Torito boot param eters", " -eltorito-alt-boot Start specifying alternative El Torito boot param eters",
skipping to change at line 928 skipping to change at line 944
#endif #endif
" --sort-weight NUMBER FILE Set LBA weight number to file or file tree", " --sort-weight NUMBER FILE Set LBA weight number to file or file tree",
" --sort-weight-list DISKFILE Read list of NUMBER FILE pairs for --sort-weight" , " --sort-weight-list DISKFILE Read list of NUMBER FILE pairs for --sort-weight" ,
" --sort-weight-patterns DISKFILE --sort-weight-list with pattern expansion", " --sort-weight-patterns DISKFILE --sort-weight-list with pattern expansion",
" --stdio_sync on|off|number Control forced output to disk files", " --stdio_sync on|off|number Control forced output to disk files",
" --no-emul-toc Save 64 kB size on random access output files", " --no-emul-toc Save 64 kB size on random access output files",
" --emul-toc Multi-session history on such output files", " --emul-toc Multi-session history on such output files",
" --old-empty Use old style block addresses for empty files", " --old-empty Use old style block addresses for empty files",
" -z, -transparent-compression", " -z, -transparent-compression",
" Enable transparent compression of files", " Enable transparent compression of files",
" --zisofs-version-2 Enable processing of zisofs version 2 files",
" --zisofs2-susp-z2 Produce Z2 entries for zisofs version 2",
" --zisofs2-susp-zf Produce ZF entries for zisofs version 2",
" -root DIR Set root directory for all new files and director ies", " -root DIR Set root directory for all new files and director ies",
" -old-root DIR Set root directory in previous session that is se arched for files", " -old-root DIR Set root directory in previous session that is se arched for files",
" --old-root-no-md5 Do not record and use MD5 with -old-root", " --old-root-no-md5 Do not record and use MD5 with -old-root",
" --old-root-no-ino Do not use disk inode numbers with -old-root", " --old-root-no-ino Do not use disk inode numbers with -old-root",
" --old-root-devno Use disk device numbers with -old-root", " --old-root-devno Use disk device numbers with -old-root",
" -log-file LOG_FILE Re-direct messages to LOG_FILE", " -log-file LOG_FILE Re-direct messages to LOG_FILE",
" --no_rc Do not execute startup files", " --no_rc Do not execute startup files",
" -v, -verbose Verbose", " -v, -verbose Verbose",
" -version Print the current version", " -version Print the current version",
"",
#ifdef Xorriso_GNU_xorrisO
"Report bugs to: bug-xorriso@gnu.org , or in private to: scdbackup@gmx.net .",
"xorriso home page: <https://www.gnu.org/software/xorriso/>",
"General help using GNU software: <https://www.gnu.org/gethelp/>",
#else
"Report any bugs to bug-xorriso@gnu.org or in private to scdbackup@gmx.net .",
#endif
"@End_of_helptexT@" "@End_of_helptexT@"
}; };
char ra_text[80]; char ra_text[80];
int i; int i;
strcpy(ra_text, xorriso->report_about_text); strcpy(ra_text, xorriso->report_about_text);
Xorriso_option_report_about(xorriso, "NOTE", 0); Xorriso_option_report_about(xorriso, "NOTE", 0);
for(i= 0; strcmp(helptext[i], "@End_of_helptexT@")!=0; i++) { for(i= 0; strcmp(helptext[i], "@End_of_helptexT@")!=0; i++) {
skipping to change at line 1564 skipping to change at line 1591
ret= Xorriso_option_scdbackup_tag(xorriso, argv[i-1], argv[i], 0); ret= Xorriso_option_scdbackup_tag(xorriso, argv[i-1], argv[i], 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_1; goto problem_handler_1;
} else if(strcmp(argpt, "--for_backup")==0) { } else if(strcmp(argpt, "--for_backup")==0) {
Xorriso_option_hardlinks(xorriso, "on", 0); Xorriso_option_hardlinks(xorriso, "on", 0);
Xorriso_option_acl(xorriso, "on", 0); Xorriso_option_acl(xorriso, "on", 0);
Xorriso_option_xattr(xorriso, "any", 0); Xorriso_option_xattr(xorriso, "any", 0);
Xorriso_option_md5(xorriso, "on", 0); Xorriso_option_md5(xorriso, "on", 0);
} else if(strcmp(argpt, "-z")==0 || } else if(strcmp(argpt, "-z")==0 ||
strcmp(argpt, "-transparent-compression")==0) { strcmp(argpt, "-transparent-compression")==0) {
ret= Xorriso_genisofs_fused_options(xorriso, whom, "z",
&option_d, &iso_level, &lower_r, ra_text, 2);
if(ret <= 0)
goto problem_handler_1;
Xorriso_option_zisofs(xorriso, "by_magic=on", 0); Xorriso_option_zisofs(xorriso, "by_magic=on", 0);
} else if(strcmp(argpt, "--zisofs-version-2") == 0) {
Xorriso_option_zisofs(xorriso, "by_magic=v2", 0);
} else if(strcmp(argpt, "--zisofs2-susp-z2") == 0) {
Xorriso_option_zisofs(xorriso, "susp_z2=on", 0);
} else if(strcmp(argpt, "--zisofs2-susp-zf") == 0) {
Xorriso_option_zisofs(xorriso, "susp_z2=off", 0);
} else if(strcmp(argpt, "--stdio_sync")==0) { } else if(strcmp(argpt, "--stdio_sync")==0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
i++; i++;
Xorriso_option_stdio_sync(xorriso, argv[i], 0); Xorriso_option_stdio_sync(xorriso, argv[i], 0);
} else if(strcmp(argpt, "-disallow_dir_id_ext")==0) { } else if(strcmp(argpt, "-disallow_dir_id_ext")==0) {
allow_dir_id_ext= 0; allow_dir_id_ext= 0;
} else if(strcmp(argpt, "--emul-toc")==0) { } else if(strcmp(argpt, "--emul-toc")==0) {
with_emul_toc= 1; with_emul_toc= 1;
xorriso->no_emul_toc&= ~1; xorriso->no_emul_toc&= ~1;
skipping to change at line 1637 skipping to change at line 1666
/* ok */; /* ok */;
} else if(ret==2 || ret==3) { } else if(ret==2 || ret==3) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-as %s: Cannot accept %s as target: -o %s", "-as %s: Cannot accept %s as target: -o %s",
whom, (ret==3 ? "symbolic link" : "directory"), whom, (ret==3 ? "symbolic link" : "directory"),
Text_shellsafe(adr+6, sfe, 0)); Text_shellsafe(adr+6, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
} }
/* Regard overwriteable as blank, truncate regular files on write start */ /* Regard overwritable as blank, truncate regular files on write start */
ret= Xorriso_option_dev(xorriso, adr, 2|8|16); ret= Xorriso_option_dev(xorriso, adr, 2|8|16);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
if(was_other_option && xorriso->out_drive_handle==NULL) { if(was_other_option && xorriso->out_drive_handle==NULL) {
ret= Xorriso_option_dev(xorriso, "-", 2|4); /* set outdev to stdout */ ret= Xorriso_option_dev(xorriso, "-", 2|4); /* set outdev to stdout */
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
skipping to change at line 2001 skipping to change at line 2030
} else if(strcmp(argpt, "--sort-weight-list") == 0 || } else if(strcmp(argpt, "--sort-weight-list") == 0 ||
strcmp(argpt, "--sort-weight-patterns") == 0) { strcmp(argpt, "--sort-weight-patterns") == 0) {
if(i + 1 >= argc) if(i + 1 >= argc)
goto not_enough_args; goto not_enough_args;
i++; i++;
if(Sfile_str(sort_file, argv[i], 0) <= 0) if(Sfile_str(sort_file, argv[i], 0) <= 0)
{ret= -1; goto ex;} {ret= -1; goto ex;}
sort_file_pattern= (strcmp(argpt, "--sort-weight-patterns") == 0); sort_file_pattern= (strcmp(argpt, "--sort-weight-patterns") == 0);
} else if(strcmp(argpt, "-z")==0 || } else if(strcmp(argpt, "-z")==0 ||
strcmp(argpt, "-transparent-compression")==0) { strcmp(argpt, "-transparent-compression")==0 ||
strcmp(argpt, "--zisofs-version-2") == 0 ||
strcmp(argpt, "--zisofs2-susp-z2") == 0 ||
strcmp(argpt, "--zisofs2-susp-zf") == 0) {
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argpt, "-U") == 0 || } else if(strcmp(argpt, "-U") == 0 ||
strcmp(argpt, "-untranslated-filenames") == 0) { strcmp(argpt, "-untranslated-filenames") == 0) {
ret= Xorriso_genisofs_fused_options(xorriso, whom, "U", ret= Xorriso_genisofs_fused_options(xorriso, whom, "U",
&option_d, &iso_level, &lower_r, ra_text, 0); &option_d, &iso_level, &lower_r, ra_text, 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_2; goto problem_handler_2;
} else if(strcmp(argpt, "-untranslated_name_len") == 0) { } else if(strcmp(argpt, "-untranslated_name_len") == 0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
skipping to change at line 2084 skipping to change at line 2116
ret= Xorriso_convert_modstring(xorriso, "-as mkisofs -file-mode", ret= Xorriso_convert_modstring(xorriso, "-as mkisofs -file-mode",
argv[i], &mode_and, &mode_or, 0); argv[i], &mode_and, &mode_or, 0);
if(ret<=0) if(ret<=0)
goto problem_handler_2; goto problem_handler_2;
file_mode= mode_or; file_mode= mode_or;
} else if(strcmp(argpt, "-jigdo-jigdo") == 0 || } else if(strcmp(argpt, "-jigdo-jigdo") == 0 ||
strcmp(argpt, "-jigdo-template") == 0 || strcmp(argpt, "-jigdo-template") == 0 ||
strcmp(argpt, "-jigdo-min-file-size") == 0 || strcmp(argpt, "-jigdo-min-file-size") == 0 ||
strcmp(argpt, "-jigdo-exclude") == 0 || strcmp(argpt, "-jigdo-exclude") == 0 ||
strcmp(argpt, "-jigdo-force-md5") == 0 || strcmp(argpt, "-jigdo-force-md5") == 0 ||
strcmp(argpt, "-jigdo-force-checksum") == 0 ||
strcmp(argpt, "-jigdo-map") == 0 || strcmp(argpt, "-jigdo-map") == 0 ||
strcmp(argpt, "-jigdo-checksum-algorithm") == 0 ||
strcmp(argpt, "-jigdo-template-compress") == 0 || strcmp(argpt, "-jigdo-template-compress") == 0 ||
strcmp(argpt, "-checksum_algorithm_iso") == 0 || strcmp(argpt, "-checksum_algorithm_iso") == 0 ||
strcmp(argpt, "-checksum_algorithm_template") == 0 || strcmp(argpt, "-checksum_algorithm_template") == 0 ||
strcmp(argpt, "-md5-list") == 0) { strcmp(argpt, "-md5-list") == 0 ||
strcmp(argpt, "-checksum-list") == 0) {
i++; i++;
ret= Xorriso_option_jigdo(xorriso, argpt, argv[i], 0); ret= Xorriso_option_jigdo(xorriso, argpt, argv[i], 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_2; goto problem_handler_2;
} else if(strcmp(argpt, "-chrp-boot-part") == 0 || } else if(strcmp(argpt, "-chrp-boot-part") == 0 ||
strcmp(argpt, "-chrp-boot") == 0) { strcmp(argpt, "-chrp-boot") == 0) {
ret= Xorriso_option_boot_image(xorriso, "any", "chrp_boot_part=on", 0); ret= Xorriso_option_boot_image(xorriso, "any", "chrp_boot_part=on", 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_2; goto problem_handler_2;
 End of changes. 17 change blocks. 
19 lines changed or deleted 56 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)