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

Bug fix: -pathspecs "on" did not properly handle "\\="

Browse Source
This commit is contained in:
Thomas Schmitt 2015-12-09 16:23:12 +00:00
parent bafcf288f9
commit 8877bf1417
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libisoburn/trunk/xorriso/misc_funct.c
View File

@ -1108,9 +1108,8 @@ int Hex_to_bin(char *hex,
#ifndef Xorriso_fileliste_externaL #ifndef Xorriso_fileliste_externaL
/* ??? ts A71006 : Is this compatible with mkisofs pathspecs ? /* @param flag bit0= pathspec mode "on" rather than "as_mkisofs"
I dimly remember so */ */
int Fileliste__target_source_limit(char *line, char sep, char **limit_pt, int Fileliste__target_source_limit(char *line, char sep, char **limit_pt,
int flag) int flag)
{ {
@ -1118,7 +1117,7 @@ int Fileliste__target_source_limit(char *line, char sep, char **limit_pt,
for(npt= line;*npt!=0;npt++) { for(npt= line;*npt!=0;npt++) {
if(*npt=='\\') { if(*npt=='\\') {
if(*(npt+1)!=0) if(*(npt + 1) == '=' || (*(npt + 1) == '\\' && !(flag & 1)))
npt++; npt++;
continue; continue;
} }

3
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -146,7 +146,8 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
strcpy(source, optv[i]); strcpy(source, optv[i]);
split= 0; split= 0;
if(xorriso->allow_graft_points) { if(xorriso->allow_graft_points) {
ret= Fileliste__target_source_limit(target, '=', &ept, 0); ret= Fileliste__target_source_limit(target, '=', &ept,
!(xorriso->allow_graft_points & 2));
if(ret>0) { if(ret>0) {
*ept= 0; *ept= 0;
strcpy(source, ept+1); strcpy(source, ept+1);

5
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -530,9 +530,8 @@ struct XorrisO { /* the global context of xorriso */
/* XORRISO options */ /* XORRISO options */
int allow_graft_points; /* if not zero: yes int allow_graft_points; /* if not zero: yes
special options: special options:
bit1= continue unescaping after first real '=' bit1= unescape '\\' too,
(as mkisofs does, continue unescaping after first real '='
but xorriso did not for years)
*/ */
int allow_restore; /* -2=disallowed until special mode "unblock" int allow_restore; /* -2=disallowed until special mode "unblock"

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.12.09.132636" #define Xorriso_timestamP "2015.12.09.162402"