Checking MD5 of whole session with -check_md5 and empty path list

This commit is contained in:
2009-08-12 20:23:31 +00:00
parent 16d84807da
commit d152de91f4
6 changed files with 121 additions and 16 deletions

View File

@ -8357,8 +8357,9 @@ int Xorriso_opt_args(struct XorrisO *xorriso, char *cmd,
*optc= 0;
*optv= NULL;
sprintf(xorriso->info_text, "%s : Not enough arguments given", cmd);
if(!(flag & 128))
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
if((flag & 128))
return(1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
return(0);
}
*end_idx= Xorriso_end_idx(xorriso, argc, argv, idx,
@ -12470,8 +12471,8 @@ ex:;
}
int Xorriso_report_m5_outcome(struct XorrisO *xorriso, char *severity,
int flag)
int Xorriso_report_md5_outcome(struct XorrisO *xorriso, char *severity,
int flag)
{
if((xorriso->find_check_md5_result & 3) == 0) {
sprintf(xorriso->result_line,
@ -13367,21 +13368,20 @@ int Xorriso_option_check_md5(struct XorrisO *xorriso,
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(ret);
}
(*idx)++;
ret= Xorriso_opt_args(xorriso, "-check_md5", argc, argv, (*idx) + 1,
ret= Xorriso_opt_args(xorriso, "-check_md5", argc, argv, *idx,
&end_idx, &optc, &optv, 128);
if(ret<=0)
goto ex;
xorriso->find_check_md5_result= 0;
if(optc == 0) {
/* >>> check whole session */;
ret= 1;
return(ret);
ret= Xorriso_check_session_md5(xorriso, severity, 0);
goto ex;
}
xorriso->find_check_md5_result= 0;
for(i= 0; i < optc; i++) {
if(flag & 8) {
ret= Findjob_new(&job, optv[i], 0);
@ -13422,7 +13422,7 @@ int Xorriso_option_check_md5(struct XorrisO *xorriso,
Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1);
report_outcome:;
Xorriso_report_m5_outcome(xorriso, severity, 0);
Xorriso_report_md5_outcome(xorriso, severity, 0);
ex:;
(*idx)= end_idx;