From f7b46d31a4662a0d1af5aa336a0a02a5165b8b08 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 1 Dec 2008 12:50:14 +0000 Subject: [PATCH] Bug fix: disk patterns with relative addresses were not properly resolved --- xorriso/xorriso.c | 5 ++++- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index 649afc22..ace7caff 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -6843,8 +6843,11 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso, if(patterns[i][0]=='/' || abs_adr) { strcpy(dir_adr, "/"); abs_adr= 4; - } else + } else { strcpy(dir_adr, xorriso->wdx); + if(dir_adr[0]==0) + strcpy(dir_adr, "/"); + } was_filec= *filec; ret= Xorriso_obtain_pattern_files_x(xorriso, "", dir_adr, filec, *filev, diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 0e89f2d9..7af2fbf6 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.12.01.110022" +#define Xorriso_timestamP "2008.12.01.122825"