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

Check in Mode 1 or Mode 2 on fuzzy searching.

Browse Source
This commit is contained in:
rocky
2005-02-05 18:58:36 +00:00
parent 1c5aa655ea
commit 79d7a57f1f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/iso4.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso4.c,v 1.1 2005/02/04 23:12:16 rocky Exp $
$Id: iso4.c,v 1.2 2005/02/05 18:58:36 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -69,7 +69,7 @@ main(int argc, const char *argv[])
p_iso = iso9660_open_fuzzy (psz_fname, 5);
if (NULL == p_iso) {
fprintf(stderr, "Sorry, could not find ISO 9660 image from %s\n",
fprintf(stderr, "Sorry, could not find an ISO 9660 image from %s\n",
psz_fname);
return 1;
}

12
lib/iso9660/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660_fs.c,v 1.8 2005/02/05 18:41:31 rocky Exp $
$Id: iso9660_fs.c,v 1.9 2005/02/05 18:58:36 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -58,7 +58,7 @@ typedef enum {
} bool_3way_t;
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.8 2005/02/05 18:41:31 rocky Exp $";
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.9 2005/02/05 18:58:36 rocky Exp $";
/* Implementation of iso9660_t type */
struct _iso9660 {
@@ -136,6 +136,10 @@ adjust_fuzzy_pvd( iso9660_t *p_iso )
cdio_warn ("Expecting the PVD sector header MSF to be 0x16, is: %x",
buf[14]);
}
if (buf[15+CDIO_CD_SUBHEADER_SIZE] != 0x1) {
cdio_warn ("Expecting the PVD sector mode to be Mode 1 is: %x",
buf[15]);
}
p_iso->b_mode2 = nope;
p_iso->b_xa = nope;
} else if (!memcmp(CDIO_SECTOR_SYNC_HEADER, buf, CDIO_CD_SYNC_SIZE)) {
@@ -144,6 +148,10 @@ adjust_fuzzy_pvd( iso9660_t *p_iso )
cdio_warn ("Expecting the PVD sector header MSF to be 0x16, is: %x",
buf[14]);
}
if (buf[15] != 0x2) {
cdio_warn ("Expecting the PVD sector mode to be Mode 2 is: %x",
buf[15]);
}
p_iso->b_mode2 = yep;
/* Do do: check Mode 2 Form 2? */
} else {