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

New command -sh_style_result

Browse Source
This commit is contained in:
Thomas Schmitt
2013-07-01 18:06:39 +00:00
parent 76cd101944
commit aa51bde75c
15 changed files with 211 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xorriso/opts_a_c.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -1209,8 +1209,10 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag)
Xorriso_warn_of_wildcards(xorriso, iso_rr_path, 1);
sprintf(xorriso->info_text,"previous working directory:\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);
if(strcmp(iso_rr_path,"/")==0 || iso_rr_path[0]==0) {
strcpy(xorriso->wdi,"");
@ -1270,8 +1272,10 @@ int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag)
Xorriso_warn_of_wildcards(xorriso, disk_path, 1|2);
sprintf(xorriso->info_text,"previous working directory on hard disk:\n");
Xorriso_info(xorriso,0);
Text_shellsafe(xorriso->wdx, xorriso->result_line, 0);
strcat(xorriso->result_line, "/\n");
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);
if(strcmp(disk_path,"/")==0) {
strcpy(xorriso->wdx,"");