From bf40f778d1056aafebe910562131409682dfbffb Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Thu, 26 Jan 2012 00:35:57 -0500
Subject: [PATCH] CDTEXTFILE directifile should be relative to CUE file.

---
 lib/driver/image/bincue.c | 4 +++-
 test/check_cue.sh.in      | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/driver/image/bincue.c b/lib/driver/image/bincue.c
index a46f91b1..fb314a73 100644
--- a/lib/driver/image/bincue.c
+++ b/lib/driver/image/bincue.c
@@ -331,8 +331,10 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
         uint8_t *ptr;
         int size;
         CdioDataSource_t *source;
+	const char *dirname = cdio_dirname(psz_cue_name);
+	const char *psz_filename = cdio_abspath (dirname, psz_field);
 
-        if(NULL == (source = cdio_stdio_new(psz_field))) {
+        if(NULL == (source = cdio_stdio_new(psz_filename))) {
           cdio_log (log_level, "%s line %d: can't open file `%s' for reading", psz_cue_name, i_line, psz_field);
           goto err_exit;
         }
diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in
index e408803e..60815ee5 100644
--- a/test/check_cue.sh.in
+++ b/test/check_cue.sh.in
@@ -50,10 +50,8 @@ testnum="CD-Text binary parser"
 if test -f ${srcdir}/data/${fname}.bin ; then
   if test -f ${srcdir}/data/${fname}.cdt ; then
     opts="--quiet --no-device-info --cue-file ${srcdir}/data/${fname}.cue --no-cddb"
-    cp ${srcdir}/data/${fname}.cdt ${srcdir}/${fname}.cdt
     test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
     RC=$?
-    rm ${srcdir}/${fname}.cdt
     check_result $RC "cd-info CD-Text CUE test $testnum" "${CD_INFO} $opts"
   else
     echo "Don't see CD-Text file ${srcdir}/data/${fname}.cdt. Test $testnum skipped."