New command -sh_style_result

This commit is contained in:
2013-07-01 18:06:39 +00:00
parent 533585e9e0
commit 93435822c3
15 changed files with 211 additions and 84 deletions

View File

@ -416,8 +416,10 @@ int Xorriso_option_pwdi(struct XorrisO *xorriso, int flag)
{
sprintf(xorriso->info_text,"current working directory in ISO image:\n");
Xorriso_info(xorriso,0);
Text_shellsafe(xorriso->wdi, xorriso->result_line, 0);
strcat(xorriso->result_line, "/\n");
Xorriso_esc_filepath(xorriso, xorriso->wdi, xorriso->result_line, 0);
if(xorriso->sh_style_result == 0 || xorriso->wdi[0] == 0)
strcat(xorriso->result_line, "/");
strcat(xorriso->result_line, "\n");
Xorriso_result(xorriso,0);
return(1);
}
@ -428,7 +430,10 @@ int Xorriso_option_pwdx(struct XorrisO *xorriso, int flag)
{
sprintf(xorriso->info_text,"current working directory on hard disk:\n");
Xorriso_info(xorriso,0);
sprintf(xorriso->result_line,"%s/\n",xorriso->wdx);
Xorriso_esc_filepath(xorriso, xorriso->wdx, xorriso->result_line, 0);
if(xorriso->sh_style_result == 0 || xorriso->wdx[0] == 0)
strcat(xorriso->result_line, "/");
strcat(xorriso->result_line, "\n");
Xorriso_result(xorriso,0);
return(1);
}
@ -1223,6 +1228,23 @@ ex:;
}
/* Option -sh_style_result */
int Xorriso_option_sh_style_result(struct XorrisO *xorriso, char *mode,
int flag)
{
if(strcmp(mode, "off") == 0) {
xorriso->sh_style_result= 0;
} else if(strcmp(mode, "on") == 0) {
xorriso->sh_style_result= 1;
} else {
sprintf(xorriso->info_text, "-sh_style_result: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
}
return(1);
}
/* Option -signal_handling */
/* @param flag bit0= prescan mode: do not yet install the eventual handler
else: when switching from other modes to "off":