libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preparations for ISO/HFS+ hybrid images by Vladimir Serbinenko

Browse Source
This commit is contained in:
Thomas Schmitt
2012-05-24 07:13:20 +00:00
parent 1846f26acd
commit bcc39f10b4
18 changed files with 218 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libisoburn/trunk/xorriso/parse_exec.c
View File

@ -466,14 +466,15 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
"dev","dialog","disk_dev_ino","disk_pattern","displacement",
"dummy","dvd_obs","early_stdio_test", "eject",
"iso_rr_pattern","follow","format","fs","gid","grow_blindly","hardlinks",
"history","indev","in_charset","joliet",
"hfsplus","history","indev","in_charset","joliet",
"list_delimiter","list_extras","list_profiles","local_charset",
"mark","md5","mount_opts","not_leaf","not_list","not_mgt",
"options_from_file","osirrox","outdev","out_charset","overwrite",
"pacifier","padding","path_list","pathspecs","pkt_output",
"preparer_id","print","print_info","print_mark","prompt",
"prog","prog_help","publisher","quoted_not_list","quoted_path_list",
"reassure","report_about","rom_toc_scan","rr_reloc_dir","scsi_log",
"reassure","report_about","rockridge",
"rom_toc_scan","rr_reloc_dir","scsi_log",
"session_log","signal_handling","sleep",
"speed","split_size","status","status_history_max",
"stdio_sync","stream_recording","system_id","temp_mem_limit",
@ -659,7 +660,8 @@ int Xorriso_cmd_sorting_rank(struct XorrisO *xorriso,
"mount",
"* Settings for result writing:",
"joliet", "compliance", "rr_reloc_dir", "volid", "volset_id", "publisher",
"joliet", "hfsplus","compliance", "rr_reloc_dir",
"volid", "volset_id", "publisher",
"application_id", "system_id", "volume_date", "copyright_file",
"abstract_file", "biblio_file", "preparer_id", "out_charset",
"read_mkisofsrc",
@ -1270,6 +1272,10 @@ next_command:;
(*idx)++;
ret= Xorriso_option_hardlinks(xorriso, arg1, 0);
} else if(strcmp(cmd,"hfsplus")==0) {
(*idx)++;
ret= Xorriso_option_hfsplus(xorriso, arg1, 0);
} else if(strcmp(cmd,"help")==0) {
Xorriso_option_help(xorriso,0);
@ -1549,6 +1555,10 @@ next_command:;
} else if(strcmp(cmd,"rmdir")==0 || strcmp(cmd,"rmdiri")==0) {
ret= Xorriso_option_rmi(xorriso, argc, argv, idx, 2);
} else if(strcmp(cmd, "rockridge") == 0) {
(*idx)++;
ret= Xorriso_option_rockridge(xorriso, arg1, 0);
} else if(strcmp(cmd,"rollback")==0) {
ret= Xorriso_option_rollback(xorriso, 0);
@ -2529,6 +2539,11 @@ failure:;
goto failure;
if(ret > 0)
hide_attrs|= 2;
ret= Exclusions_match(xorriso->hfsplus_hidings, path, 0);
if(ret < 0)
goto failure;
if(ret > 0)
hide_attrs|= 4;
return(hide_attrs);
}