claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Issue #33636 make path names toc/cue files be relative to the toc/cue when no absolute path is specified in toc/cue FILENAME statements.

Browse Source
This commit is contained in:
R. Bernstein
2011-12-11 10:59:36 -05:00
parent 1841da6de0
commit 29b7baa1d6
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/driver/image/cdrdao.c
View File

@@ -682,7 +682,9 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
/* Handle "<filename>" */
if (cd) {
cd->tocent[i].filename = strdup (psz_field);
const char *dirname = cdio_dirname(psz_cue_name);
const char *filename = cdio_abspath (dirname, psz_field);
cd->tocent[i].filename = strdup (filename);
/* To do: do something about reusing existing files. */
if (!(cd->tocent[i].data_source = cdio_stdio_new (psz_field))) {
cdio_log (log_level,
@@ -755,7 +757,9 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
/* Handle <filename> */
if (cd) {
cd->tocent[i].filename = strdup (psz_field);
const char *dirname = cdio_dirname(psz_cue_name);
const char *filename = cdio_abspath (dirname, psz_field);
cd->tocent[i].filename = (char *) filename;
/* To do: do something about reusing existing files. */
if (!(cd->tocent[i].data_source = cdio_stdio_new (psz_field))) {
cdio_log (log_level,