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.

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

View File

@@ -369,7 +369,9 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
/* FILE "<filename>" <BINARY|WAVE|other?> */
} else if (0 == strcmp ("FILE", psz_keyword)) {
if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
if (cd) cd->tocent[i + 1].filename = strdup (psz_field);
const char *dirname = cdio_dirname(psz_cue_name);
const char *filename = cdio_abspath (dirname, psz_field);
if (cd) cd->tocent[i + 1].filename = (char *) filename;
} else {
goto format_error;
}