"Fossies" - the Fresh Open Source Software Archive  

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

About: libisoburn is a frontend for the libraries libburn and libisofs which enables creation and expansion of ISO-9660 filesystems on all media and file types supported by libburn. It implements the API and command interpreter of program xorriso, and installs this program as small dynamically linked binary. xorriso is suitable for incremental data backup and for production of bootable ISO 9660 images. A statically linked version is available as GNU xorriso.

emulators.c  (libisoburn-1.5.0):emulators.c  (libisoburn-1.5.2)
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2017 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2019 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 56 skipping to change at line 56
int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag) int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag)
{ {
static char helptext[][80]= { static char helptext[][80]= {
"Usage: xorriso -as cdrecord [options|source_addresses]", "Usage: xorriso -as cdrecord [options|source_addresses]",
"Note: This is not cdrecord. See xorriso -help, xorriso -version, man xorrecord" , "Note: This is not cdrecord. See xorriso -help, xorriso -version, man xorrecord" ,
"Options:", "Options:",
"\t-version\tprint version information and exit emulation", "\t-version\tprint version information and exit emulation",
"\t--devices\tprint list of available MMC drives and exit emulation", "\t--devices\tprint list of available MMC drives and exit emulation",
"\tdev=target\tpseudo-SCSI target to use as CD-Recorder", "\tdev=target\tpseudo-SCSI target to use as CD-Recorder",
"\tdrive_scsi_dev_family=sr|scd|sg\t\tselect Linux device type", "\tdrive_scsi_dev_family=sr|scd|sg\t\tselect Linux device type",
"\t--drive_not_exclusive\tdo not try to prevent use of busy drive",
"\t-v\t\tincrement verbose level by one", "\t-v\t\tincrement verbose level by one",
"\t-V\t\tincrement SCSI command transport verbose level by one", "\t-V\t\tincrement SCSI command transport verbose level by one",
"\t-checkdrive\tcheck if a driver for the drive is present", "\t-checkdrive\tcheck if a driver for the drive is present",
"\t-inq\t\tdo an inquiry for the drive", "\t-inq\t\tdo an inquiry for the drive",
"\tspeed=#\t\tset speed of drive", "\tspeed=#\t\tset speed of drive",
"\tblank=type\tblank a CD-RW disc (see blank=help)", "\tblank=type\tblank a CD-RW disc (see blank=help)",
"\tfs=#\t\tSet fifo size to # (0 to disable, default is 4 MB)", "\tfs=#\t\tSet fifo size to # (0 to disable, default is 4 MB)",
"\t-eject\t\teject the disk after doing the work", "\t-eject\t\teject the disk after doing the work",
"\t-dummy\t\tdo everything with laser turned off", "\t-dummy\t\tdo everything with laser turned off",
"\t-msinfo\t\tretrieve multi-session info for mkisofs >= 1.10", "\t-msinfo\t\tretrieve multi-session info for mkisofs >= 1.10",
skipping to change at line 265 skipping to change at line 266
} else if(strcmp(argpt, "-dao")==0) { } else if(strcmp(argpt, "-dao")==0) {
xorriso->do_tao= -1; xorriso->do_tao= -1;
} else if(strcmp(argpt, "-data")==0) { } else if(strcmp(argpt, "-data")==0) {
/* ok */; /* ok */;
} else if(strncmp(argpt, "-dev=", 5)==0 || } else if(strncmp(argpt, "-dev=", 5)==0 ||
strncmp(argpt, "dev=", 4)==0) { strncmp(argpt, "dev=", 4)==0) {
cpt= strchr(argpt, '=')+1; cpt= strchr(argpt, '=')+1;
strcpy(dev_adr, cpt); strcpy(dev_adr, cpt);
} else if(strcmp(argv[i], "--devices")==0) { /* intentional: argv[i] */ } else if(strcmp(argv[i], "--devices")==0) { /* intentional: argv[i] */
do_scanbus= 2; do_scanbus= 2;
} else if(strcmp(argv[i], "--drive_not_exclusive") == 0) { /* intentional */
Xorriso_option_drive_access(xorriso, "shared:unrestricted", 0);
} else if(strncmp(argpt,"driveropts=", 11)==0 || } else if(strncmp(argpt,"driveropts=", 11)==0 ||
strncmp(argpt,"-driveropts=", 12)==0) { strncmp(argpt,"-driveropts=", 12)==0) {
if(strcmp(argpt+11, "help")==0) { if(strcmp(argpt+11, "help")==0) {
fprintf(stderr,"Driver options:\n"); fprintf(stderr,"Driver options:\n");
fprintf(stderr, fprintf(stderr,
"burnfree\tPrepare writer to use BURN-Free technology\n"); "burnfree\tPrepare writer to use BURN-Free technology\n");
} }
} else if(strcmp(argpt, "-dummy")==0) { } else if(strcmp(argpt, "-dummy")==0) {
xorriso->do_dummy= 1; xorriso->do_dummy= 1;
} else if(strncmp(argpt, "-dvd_obs=", 9)==0 || } else if(strncmp(argpt, "-dvd_obs=", 9)==0 ||
skipping to change at line 429 skipping to change at line 432
ret= 0; goto ex; ret= 0; goto ex;
} }
if(Sfile_str(track_source, argv[i], 0)<=0) if(Sfile_str(track_source, argv[i], 0)<=0)
{ret= -1; goto ex;} {ret= -1; goto ex;}
} }
} }
/* Perform actions */ /* Perform actions */
Xorriso_option_report_about(xorriso, "NOTE", 0); Xorriso_option_report_about(xorriso, "NOTE", 0);
if(do_version) { if(do_version) {
sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2017 see libburnia-project.org xorriso\n"); sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2019 see libburnia-project.org xorriso\n");
Xorriso_result(xorriso, 1); Xorriso_result(xorriso, 1);
Xorriso_option_version(xorriso, 0); Xorriso_option_version(xorriso, 0);
} }
if(do_help) { if(do_help) {
Xorriso_cdrskin_help(xorriso, 0); Xorriso_cdrskin_help(xorriso, 0);
} }
if(strcmp(blank_mode, "help")==0) { if(strcmp(blank_mode, "help")==0) {
for(i= 0; strcmp(blank_help[i], "@End_of_helptexT@")!=0; i++) { for(i= 0; strcmp(blank_help[i], "@End_of_helptexT@")!=0; i++) {
sprintf(xorriso->info_text, "%s\n", blank_help[i]); sprintf(xorriso->info_text, "%s\n", blank_help[i]);
skipping to change at line 875 skipping to change at line 878
" -hard-disk-boot Boot image is a hard disk image", " -hard-disk-boot Boot image is a hard disk image",
" -no-emul-boot Boot image is 'no emulation' image", " -no-emul-boot Boot image is 'no emulation' image",
" -boot-info-table Patch boot image with info table", " -boot-info-table Patch boot image with info table",
" --grub2-boot-info Patch boot image at byte 2548", " --grub2-boot-info Patch boot image at byte 2548",
" -eltorito-id ID Set El Torito Id String", " -eltorito-id ID Set El Torito Id String",
" -eltorito-selcrit HEXBYTES Set El Torito Selection Criteria", " -eltorito-selcrit HEXBYTES Set El Torito Selection Criteria",
" -isohybrid-gpt-basdat Mark El Torito boot image as Basic Data in GPT", " -isohybrid-gpt-basdat Mark El Torito boot image as Basic Data in GPT",
" -isohybrid-gpt-hfsplus Mark El Torito boot image as HFS+ in GPT", " -isohybrid-gpt-hfsplus Mark El Torito boot image as HFS+ in GPT",
" -isohybrid-apm-hfsplus Mark El Torito boot image as HFS+ in APM", " -isohybrid-apm-hfsplus Mark El Torito boot image as HFS+ in APM",
" -part_like_isohybrid Mark in MBR, GPT, APM without -isohybrid-mbr", " -part_like_isohybrid Mark in MBR, GPT, APM without -isohybrid-mbr",
" -iso_mbr_part_type Set type byte of ISO partition in MBR", " -iso_mbr_part_type Set type byte or GUID of ISO partition in MBR",
" or type GUID if a GPT ISO partition emerges.",
" --gpt_disk_guid GUID Set GPT disk GUID or choose automatic GUID", " --gpt_disk_guid GUID Set GPT disk GUID or choose automatic GUID",
" -G FILE, -generic-boot FILE Set generic boot image name", " -G FILE, -generic-boot FILE Set generic boot image name",
" --embedded-boot FILE Alias of -G", " --embedded-boot FILE Alias of -G",
" --protective-msdos-label Patch System Area by partition table", " --protective-msdos-label Patch System Area by partition table",
" --mbr-force-bootable Enforce existence of bootable flag in MBR", " --mbr-force-bootable Enforce existence of bootable flag in MBR",
" -partition_offset LBA Make image mountable by first partition, too", " -partition_offset LBA Make image mountable by first partition, too",
" -partition_sec_hd NUMBER Define number of sectors per head", " -partition_sec_hd NUMBER Define number of sectors per head",
" -partition_hd_cyl NUMBER Define number of heads per cylinder", " -partition_hd_cyl NUMBER Define number of heads per cylinder",
" -partition_cyl_align MODE Control cylinder alignment: off, on, auto, all", " -partition_cyl_align MODE Control cylinder alignment: off, on, auto, all",
" -mips-boot FILE Set mips boot image name (relative to image root) ", " -mips-boot FILE Set mips boot image name (relative to image root) ",
skipping to change at line 903 skipping to change at line 907
" -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image roo t)", " -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image roo t)",
" -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5", " -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5",
" -alpha-boot FILE Set alpha boot image name (relative to image root )", " -alpha-boot FILE Set alpha boot image name (relative to image root )",
" --grub2-sparc-core FILE Set path of core file for disk label patching", " --grub2-sparc-core FILE Set path of core file for disk label patching",
" -efi-boot-part DISKFILE|--efi-boot-image", " -efi-boot-part DISKFILE|--efi-boot-image",
" Set data source for EFI System Partition", " Set data source for EFI System Partition",
" -chrp-boot-part Mark ISO image size by MBR partition type 0x96", " -chrp-boot-part Mark ISO image size by MBR partition type 0x96",
" -chrp-boot Alias of -chrp-boot-part", " -chrp-boot Alias of -chrp-boot-part",
" -prep-boot-part DISKFILE Set data source for MBR partition type 0x41", " -prep-boot-part DISKFILE Set data source for MBR partition type 0x41",
" -append_partition NUMBER TYPE FILE", " -append_partition NUMBER TYPE FILE",
" Append FILE after image. TYPE is hex: 0x..", " Append FILE after image. TYPE is hex: 0x.. or",
" a GUID to be used if -appended_part_as_gpt.",
" -appended_part_as_gpt mark appended partitions in GPT instead of MBR.", " -appended_part_as_gpt mark appended partitions in GPT instead of MBR.",
" -appended_part_as_apm mark appended partitions in APM.", " -appended_part_as_apm mark appended partitions in APM.",
" --modification-date=YYYYMMDDhhmmsscc", " --modification-date=YYYYMMDDhhmmsscc",
" Override date of creation and modification", " Override date of creation and modification",
" --set_all_file_dates TIME Override mtime, atime, ctime in all files", " --set_all_file_dates TIME Override mtime, atime, ctime in all files",
" -isohybrid-mbr FILE Set SYSLINUX mbr/isohdp[fp]x*.bin for isohybrid", " -isohybrid-mbr FILE Set SYSLINUX mbr/isohdp[fp]x*.bin for isohybrid",
" --grub2-mbr FILE Set GRUB2 MBR for boot image address patching", " --grub2-mbr FILE Set GRUB2 MBR for boot image address patching",
#ifdef Xorriso_with_isohybriD #ifdef Xorriso_with_isohybriD
" isolinux_mbr=on|auto|off Control eventual isohybrid MBR generation", " isolinux_mbr=on|auto|off Control eventual isohybrid MBR generation",
#endif #endif
skipping to change at line 1025 skipping to change at line 1030
if(fret>=0) if(fret>=0)
continue; continue;
if(ret > 0) if(ret > 0)
ret= 0; ret= 0;
goto ex; goto ex;
} }
} }
} }
ret= 1; ret= 1;
ex:; ex:;
if(flag & 1) Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2);
Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2);
if(fp != NULL && fp != stdin) if(fp != NULL && fp != stdin)
fclose(fp); fclose(fp);
if(ret<=0) if(ret<=0)
return(ret); return(ret);
return(!was_failure); return(!was_failure);
} }
/* Strip surplus dash from known single-dash long options */ /* Strip surplus dash from known single-dash long options */
int Xorriso_genisofs_strip_dash(struct XorrisO *xorriso, char *arg_in, int Xorriso_genisofs_strip_dash(struct XorrisO *xorriso, char *arg_in,
char **arg_out, int flag) char **arg_out, int flag)
skipping to change at line 1317 skipping to change at line 1321
int root_seen= 0, do_md5_mem, option_d= 0, arg_count; int root_seen= 0, do_md5_mem, option_d= 0, arg_count;
mode_t mode_and, mode_or; mode_t mode_and, mode_or;
int with_boot_image= 0, with_cat_path= 0, with_emul_toc= 0; int with_boot_image= 0, with_cat_path= 0, with_emul_toc= 0;
int old_root_md5= 1, old_root_dev= 0, old_root_ino= 1, sort_file_pattern= 0; int old_root_md5= 1, old_root_dev= 0, old_root_ino= 1, sort_file_pattern= 0;
int *weight_list= NULL, weight_count= 0; int *weight_list= NULL, weight_count= 0;
int *delay_opt_list= NULL, delay_opt_count= 0; int *delay_opt_list= NULL, delay_opt_count= 0;
int mkisofs_b_platform_id= 0x00; int mkisofs_b_platform_id= 0x00;
char *sfe= NULL, *adr= NULL, ra_text[80], *pathspec= NULL, *sort_file= NULL; char *sfe= NULL, *adr= NULL, ra_text[80], *pathspec= NULL, *sort_file= NULL;
char *ept, *add_pt, *eff_path= NULL, *indev= NULL, msc[80], *cpt; char *ept, *add_pt, *eff_path= NULL, *indev= NULL, msc[80], *cpt;
char *old_root= NULL, *argpt, *hargv[1]; char *old_root= NULL, *argpt, *hargv[1];
char *boot_path, partno_text[8], *iso_rr_pt, *disk_pt, *rpt, *wpt; char *boot_path, partno_text[24], *iso_rr_pt, *disk_pt, *rpt, *wpt;
char *rm_merge_args[3], *rr_reloc_dir_pt= NULL; char *rm_merge_args[3], *rr_reloc_dir_pt= NULL;
char *sort_weight_args[4], *bless_args[6], *sa_path; char *sort_weight_args[4], *bless_args[6], *sa_path;
struct stat stbuf; struct stat stbuf;
Xorriso_alloc_meM(sfe, char, 5*SfileadrL); Xorriso_alloc_meM(sfe, char, 5*SfileadrL);
Xorriso_alloc_meM(adr, char, SfileadrL+8); Xorriso_alloc_meM(adr, char, SfileadrL+8);
Xorriso_alloc_meM(pathspec, char, 2*SfileadrL); Xorriso_alloc_meM(pathspec, char, 2*SfileadrL);
Xorriso_alloc_meM(eff_path, char, SfileadrL); Xorriso_alloc_meM(eff_path, char, SfileadrL);
Xorriso_alloc_meM(indev, char, SfileadrL+8); Xorriso_alloc_meM(indev, char, SfileadrL+8);
skipping to change at line 1386 skipping to change at line 1390
adr[0]= indev[0]= msc[0]= old_root[0]= sort_file[0]= 0; adr[0]= indev[0]= msc[0]= old_root[0]= sort_file[0]= 0;
for(i= 0; i<argc; i++) { for(i= 0; i<argc; i++) {
ret= Xorriso_genisofs_strip_dash(xorriso, argv[i], &argpt, 0); ret= Xorriso_genisofs_strip_dash(xorriso, argv[i], &argpt, 0);
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
ret= Xorriso_genisofs_ignore(xorriso, whom, argpt, &i, 1); ret= Xorriso_genisofs_ignore(xorriso, whom, argpt, &i, 1);
if(ret == 1) if(ret == 1)
continue; continue;
if(strcmp(argpt, "-version")==0) { if(strcmp(argpt, "-version")==0) {
sprintf(xorriso->result_line, sprintf(xorriso->result_line,
"mkisofs 2.01-Emulation Copyright (C) 2017 see libburnia-project.org xorriso\n" "mkisofs 2.01-Emulation Copyright (C) 2019 see libburnia-project.org xorriso\n"
); );
fd= xorriso->dev_fd_1; fd= xorriso->dev_fd_1;
if(fd<0) if(fd<0)
fd= 1; fd= 1;
ret= write(fd, xorriso->result_line, strlen(xorriso->result_line)); ret= write(fd, xorriso->result_line, strlen(xorriso->result_line));
/* (result of write intentionally ignored) */ /* (result of write intentionally ignored) */
fsync(fd); fsync(fd);
Xorriso_option_version(xorriso, 0); Xorriso_option_version(xorriso, 0);
} else if(strcmp(argpt, "-o")==0 || strcmp(argpt, "-output")==0) { } else if(strcmp(argpt, "-o")==0 || strcmp(argpt, "-output")==0) {
skipping to change at line 1767 skipping to change at line 1771
arg_count= 1; arg_count= 1;
if(strcmp(argpt, "-hfs-bless-by") == 0) if(strcmp(argpt, "-hfs-bless-by") == 0)
arg_count= 2; arg_count= 2;
else if(strcmp(argpt, "-hfsplus-file-creator-type") == 0) else if(strcmp(argpt, "-hfsplus-file-creator-type") == 0)
arg_count= 3; arg_count= 3;
if(i + arg_count >= argc) if(i + arg_count >= argc)
goto not_enough_args; goto not_enough_args;
/* Memorize command until all pathspecs are processed */ /* Memorize command until all pathspecs are processed */
delay_opt_list[delay_opt_count++]= i; delay_opt_list[delay_opt_count++]= i;
if(argv[i] != argpt) if(argv[i] != argpt)
delay_opt_list[delay_opt_count - 1]|= 1<<31; delay_opt_list[delay_opt_count - 1]|= 1u<<31;
i+= arg_count; i+= arg_count;
} else if(strcmp(argpt, "-hfsplus") == 0) { } else if(strcmp(argpt, "-hfsplus") == 0) {
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argpt, "-hfsplus-serial-no") == 0) { } else if(strcmp(argpt, "-hfsplus-serial-no") == 0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
i++; i++;
sprintf(pathspec, "hfsplus_serial=%.80s", argv[i]); sprintf(pathspec, "hfsplus_serial=%.80s", argv[i]);
ret= Xorriso_option_boot_image(xorriso, "any", pathspec, 0); ret= Xorriso_option_boot_image(xorriso, "any", pathspec, 0);
if(ret <= 0) if(ret <= 0)
skipping to change at line 1921 skipping to change at line 1925
strcmp(argpt, "-eltorito-alt-boot")==0 || strcmp(argpt, "-eltorito-alt-boot")==0 ||
strcmp(argpt, "--protective-msdos-label")==0 || strcmp(argpt, "--protective-msdos-label")==0 ||
strcmp(argpt, "--mbr-force-bootable")==0 || strcmp(argpt, "--mbr-force-bootable")==0 ||
strcmp(argpt, "--boot-catalog-hide")==0 || strcmp(argpt, "--boot-catalog-hide")==0 ||
strcmp(argpt, "-isohybrid-gpt-basdat")==0 || strcmp(argpt, "-isohybrid-gpt-basdat")==0 ||
strcmp(argpt, "-isohybrid-gpt-hfsplus")==0 || strcmp(argpt, "-isohybrid-gpt-hfsplus")==0 ||
strcmp(argpt, "-isohybrid-apm-hfsplus")==0 || strcmp(argpt, "-isohybrid-apm-hfsplus")==0 ||
strcmp(argpt, "-part_like_isohybrid")==0) { strcmp(argpt, "-part_like_isohybrid")==0) {
delay_opt_list[delay_opt_count++]= i; delay_opt_list[delay_opt_count++]= i;
if(argv[i] != argpt) if(argv[i] != argpt)
delay_opt_list[delay_opt_count - 1]|= 1<<31; delay_opt_list[delay_opt_count - 1]|= 1u<<31;
} else if(strcmp(argpt, "-b") == 0 || } else if(strcmp(argpt, "-b") == 0 ||
strcmp(argpt, "-eltorito-boot") == 0 || strcmp(argpt, "-eltorito-boot") == 0 ||
strcmp(argpt, "-eltorito-platform") == 0 || strcmp(argpt, "-eltorito-platform") == 0 ||
strcmp(argpt, "--efi-boot") == 0 || strcmp(argpt, "--efi-boot") == 0 ||
strcmp(argpt, "-e") == 0 || strcmp(argpt, "-e") == 0 ||
strcmp(argpt, "-mips-boot") == 0 || strcmp(argpt, "-mips-boot") == 0 ||
strcmp(argpt, "-mipsel-boot") == 0 || strcmp(argpt, "-mipsel-boot") == 0 ||
strcmp(argpt, "-c") == 0 || strcmp(argpt, "-c") == 0 ||
strcmp(argpt, "-eltorito-catalog") == 0 || strcmp(argpt, "-eltorito-catalog") == 0 ||
strcmp(argpt, "-boot-load-size") == 0 || strcmp(argpt, "-boot-load-size") == 0 ||
skipping to change at line 1951 skipping to change at line 1955
strcmp(argpt, "-isohybrid-mbr") == 0 || strcmp(argpt, "-isohybrid-mbr") == 0 ||
strcmp(argpt, "--grub2-mbr") == 0 || strcmp(argpt, "--grub2-mbr") == 0 ||
strncmp(argpt, "-hppa-", 6) == 0 || strncmp(argpt, "-hppa-", 6) == 0 ||
strcmp(argpt, "-alpha-boot") == 0 || strcmp(argpt, "-alpha-boot") == 0 ||
strcmp(argpt, "--gpt_disk_guid") == 0 || strcmp(argpt, "--gpt_disk_guid") == 0 ||
strcmp(argpt, "-iso_mbr_part_type") == 0) { strcmp(argpt, "-iso_mbr_part_type") == 0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
delay_opt_list[delay_opt_count++]= i; delay_opt_list[delay_opt_count++]= i;
if(argv[i] != argpt) if(argv[i] != argpt)
delay_opt_list[delay_opt_count - 1]|= 1<<31; delay_opt_list[delay_opt_count - 1]|= 1u<<31;
i++; i++;
} else if(strncmp(argpt, "--modification-date=", 20)==0) { } else if(strncmp(argpt, "--modification-date=", 20)==0) {
ret= Xorriso_option_volume_date(xorriso, "uuid", argpt + 20, 0); ret= Xorriso_option_volume_date(xorriso, "uuid", argpt + 20, 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_2; goto problem_handler_2;
} else if(strcmp(argpt, "--set_all_file_dates") == 0) { } else if(strcmp(argpt, "--set_all_file_dates") == 0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
i++; i++;
skipping to change at line 2427 skipping to change at line 2431
continue; continue;
goto ex; goto ex;
} }
if(option_d) if(option_d)
Xorriso_relax_compliance(xorriso, "deep_paths:long_paths", 0); Xorriso_relax_compliance(xorriso, "deep_paths:long_paths", 0);
/* After all pathspecs are added: perform delayed options, mostly boot related /* After all pathspecs are added: perform delayed options, mostly boot related
*/ */
for(j= 0; j < delay_opt_count; j++) { for(j= 0; j < delay_opt_count; j++) {
i= delay_opt_list[j] & ~(1 << 31); i= delay_opt_list[j] & ~(1u << 31);
if(delay_opt_list[j] & (1 << 31)) if(delay_opt_list[j] & (1u << 31))
argpt= argv[i] + 1; argpt= argv[i] + 1;
else else
argpt= argv[i]; argpt= argv[i];
if(strcmp(argpt, "-no-emul-boot")==0) { if(strcmp(argpt, "-no-emul-boot")==0) {
xorriso->boot_image_emul= 0; xorriso->boot_image_emul= 0;
xorriso->boot_emul_default= 0; xorriso->boot_emul_default= 0;
} else if(strcmp(argpt, "-hard-disk-boot")==0) { } else if(strcmp(argpt, "-hard-disk-boot")==0) {
xorriso->boot_image_emul= 1; xorriso->boot_image_emul= 1;
xorriso->boot_emul_default= 0; xorriso->boot_emul_default= 0;
} else if(strcmp(argpt, "-boot-info-table")==0) { } else if(strcmp(argpt, "-boot-info-table")==0) {
 End of changes. 13 change blocks. 
13 lines changed or deleted 17 lines changed or added

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