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

Renamed new option -relax_compliance to -compliance, added _off rules

Browse Source
This commit is contained in:
Thomas Schmitt
2008-11-29 09:10:59 +00:00
parent f81eb3a144
commit 968025ff49
4 changed files with 94 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libisoburn/trunk/xorriso/xorriso.c
View File

@ -5690,7 +5690,7 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (Xorriso_get_relax_text(xorriso, sfe, 0) == 2);
sprintf(line,"-relax_compliance %s\n", sfe);
sprintf(line,"-compliance %s\n", sfe);
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
@ -12479,7 +12479,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" Specifies the application id. (128 chars)",
" -joliet \"on\"|\"off\"",
" Generate Joliet info additional to Rock Ridge info.",
" -relax_compliance rule[:rule...]",
" -compliance rule[:rule...]",
" Allow more or less harmless deviations from strict standards",
" compliance.",
" -boot_image \"any\"|\"isolinux\" \"discard\"|\"keep\"|\"patch\"|\"dir=\"",
@ -14200,8 +14200,8 @@ int Xorriso_option_reassure(struct XorrisO *xorriso, char *mode, int flag)
}
/* Option -relax_compliance */
int Xorriso_option_relax_compliance(struct XorrisO *xorriso, char *mode,
/* Option -compliance */
int Xorriso_option_compliance(struct XorrisO *xorriso, char *mode,
int flag)
{
return(Xorriso_relax_compliance(xorriso, mode, 0));
@ -14872,7 +14872,7 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
};
static char arg1_commands[][40]= {
"abort_on","add_plainly","application_id","backslash_codes","blank",
"cd","cdi","cdx","charset","close","commit_eject",
"cd","cdi","cdx","charset","close","commit_eject","compliance",
"dev", "dummy","dialog","disk_pattern","eject","iso_rr_pattern","follow",
"format","fs","gid","grow_blindly",
"history","indev","in_charset","joliet","list_delimiter","local_charset",
@ -14880,7 +14880,7 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
"options_from_file","osirrox","outdev","out_charset","overwrite",
"pacifier","padding","path_list","pathspecs","pkt_output","print","prompt",
"prog","prog_help","publisher","quoted_not_list","quoted_path_list",
"reassure","relax_compliance","report_about","rom_toc_scan",
"reassure","report_about","rom_toc_scan",
"session_log","speed","split_size","status","status_history_max",
"stream_recording","temp_mem_limit","uid","volid","use_readline",
""
@ -15447,9 +15447,9 @@ next_command:;
(*idx)++;
ret= Xorriso_option_reassure(xorriso, arg1, 0);
} else if(strcmp(cmd,"relax_compliance")==0) {
} else if(strcmp(cmd,"compliance")==0) {
(*idx)++;
Xorriso_option_relax_compliance(xorriso, arg1, 0);
Xorriso_option_compliance(xorriso, arg1, 0);
} else if(strcmp(cmd,"report_about")==0) {
(*idx)++;