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

Find/fix another place in TOC reader where we need to use relative paths. Here in a branch of code for the DATAFILE statement.

Browse Source
This commit is contained in:
R. Bernstein
2012-01-25 23:36:08 -05:00
parent 3800908aed
commit 5224ff9556
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,10 +756,10 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
if (0 <= i) { if (0 <= i) {
if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) { if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
/* Handle <filename> */ /* Handle <filename> */
const char *psz_dirname = cdio_dirname(psz_cue_name);
const char *psz_filename = cdio_abspath (psz_dirname, psz_field);
if (cd) { if (cd) {
const char *dirname = cdio_dirname(psz_cue_name); cd->tocent[i].filename = (char *) psz_filename;
const char *filename = cdio_abspath (dirname, psz_field);
cd->tocent[i].filename = (char *) filename;
/* To do: do something about reusing existing files. */ /* To do: do something about reusing existing files. */
if (!(cd->tocent[i].data_source = cdio_stdio_new (psz_field))) { if (!(cd->tocent[i].data_source = cdio_stdio_new (psz_field))) {
cdio_log (log_level, cdio_log (log_level,
@@ -768,7 +768,7 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
goto err_exit; goto err_exit;
} }
} else { } else {
CdioDataSource_t *s = cdio_stdio_new (psz_field); CdioDataSource_t *s = cdio_stdio_new (psz_filename);
if (!s) { if (!s) {
cdio_log (log_level, cdio_log (log_level,
"%s line %d: can't open file `%s' for reading", "%s line %d: can't open file `%s' for reading",

2
test/data/vcd2.toc
View File

@@ -6,7 +6,7 @@ CD_ROM_XA
// Track 1 // Track 1
TRACK MODE2_FORM_MIX TRACK MODE2_FORM_MIX
COPY COPY
DATAFILE "../cdda.bin" 00:00:00 // comment DATAFILE "../data/cdda.bin" 00:00:00 // comment
// Track 2 // Track 2