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

pbatard empty array changes for iso9660.h. I think the last of the header patches.

Browse Source
This commit is contained in:
R. Bernstein
2012-03-03 11:38:44 -05:00
parent f00c1059d9
commit 0bdb015d47
3 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/cdio/iso9660.h
View File

@@ -60,7 +60,7 @@ typedef uint64_t iso733_t; /*! See section 7.3.3 */
typedef char achar_t; /*! See section 7.4.1 */ typedef char achar_t; /*! See section 7.4.1 */
typedef char dchar_t; /*! See section 7.4.1 */ typedef char dchar_t; /*! See section 7.4.1 */
#ifndef EMPTY_ARRAY_SIZE #ifndef EMPTY_ARRAY_SIZE
#define EMPTY_ARRAY_SIZE 0 #define EMPTY_ARRAY_SIZE 0
#endif #endif
@@ -273,8 +273,18 @@ struct iso9660_dir_s {
the Extent described by this the Extent described by this
Directory Record is Directory Record is
recorded. (9.1.9) */ recorded. (9.1.9) */
iso711_t filename_len; /*! number of bytes in filename field */ /*! MSVC compilers cannot handle a zero sized array in the middle
char filename[EMPTY_ARRAY_SIZE]; of a struct, and iso9660_dir_s is reused within iso9660_pvd_s.
Therefore, instead of defining:
iso711_t filename_len;
char filename[];
we leverage the fact that iso711_t and char are the same size
and use an union. The only gotcha is that the actual string
payload of filename.str[] starts at 1, not 0. */
union {
iso711_t len;
char str[1];
} filename;
} GNUC_PACKED; } GNUC_PACKED;
/*! /*!
@@ -976,7 +986,7 @@ uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso);
uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr); uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
#if FIXME #ifdef FIXME
uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr); uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr); lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);

32
lib/iso9660/iso9660.c
View File

@@ -301,7 +301,7 @@ iso9660_get_ltime (const iso9660_ltime_t *p_ldate,
*/ */
void void
iso9660_set_dtime_with_timezone (const struct tm *p_tm, iso9660_set_dtime_with_timezone (const struct tm *p_tm,
int timezone, int time_zone,
/*out*/ iso9660_dtime_t *p_idr_date) /*out*/ iso9660_dtime_t *p_idr_date)
{ {
memset (p_idr_date, 0, 7); memset (p_idr_date, 0, 7);
@@ -317,7 +317,7 @@ iso9660_set_dtime_with_timezone (const struct tm *p_tm,
/* The ISO 9660 timezone is in the range -48..+52 and each unit /* The ISO 9660 timezone is in the range -48..+52 and each unit
represents a 15-minute interval. */ represents a 15-minute interval. */
p_idr_date->dt_gmtoff = timezone / 15; p_idr_date->dt_gmtoff = time_zone / 15;
if (p_idr_date->dt_gmtoff < -48 ) { if (p_idr_date->dt_gmtoff < -48 ) {
@@ -337,14 +337,14 @@ iso9660_set_dtime_with_timezone (const struct tm *p_tm,
void void
iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date) iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date)
{ {
int timezone; int time_zone;
#ifdef HAVE_TM_GMTOFF #ifdef HAVE_TM_GMTOFF
/* Convert seconds to minutes */ /* Convert seconds to minutes */
timezone = p_tm->tm_gmtoff / 60; time_zone = p_tm->tm_gmtoff / 60;
#else #else
timezone = (p_tm->tm_isdst > 0) ? -60 : 0; time_zone = (p_tm->tm_isdst > 0) ? -60 : 0;
#endif #endif
iso9660_set_dtime_with_timezone (p_tm, timezone, p_idr_date); iso9660_set_dtime_with_timezone (p_tm, time_zone, p_idr_date);
} }
/*! /*!
@@ -354,7 +354,7 @@ iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date)
*/ */
void void
iso9660_set_ltime_with_timezone (const struct tm *p_tm, iso9660_set_ltime_with_timezone (const struct tm *p_tm,
int timezone, int time_zone,
/*out*/ iso9660_ltime_t *pvd_date) /*out*/ iso9660_ltime_t *pvd_date)
{ {
char *_pvd_date = (char *) pvd_date; char *_pvd_date = (char *) pvd_date;
@@ -371,7 +371,7 @@ iso9660_set_ltime_with_timezone (const struct tm *p_tm,
0 /* 1/100 secs */ ); 0 /* 1/100 secs */ );
/* Set time zone in 15-minute interval encoding. */ /* Set time zone in 15-minute interval encoding. */
pvd_date->lt_gmtoff -= (timezone / 15); pvd_date->lt_gmtoff -= (time_zone / 15);
if (pvd_date->lt_gmtoff < -48 ) { if (pvd_date->lt_gmtoff < -48 ) {
cdio_warn ("Converted ISO 9660 timezone %d is less than -48. Adjusted", cdio_warn ("Converted ISO 9660 timezone %d is less than -48. Adjusted",
@@ -390,14 +390,14 @@ iso9660_set_ltime_with_timezone (const struct tm *p_tm,
void void
iso9660_set_ltime (const struct tm *p_tm, /*out*/ iso9660_ltime_t *pvd_date) iso9660_set_ltime (const struct tm *p_tm, /*out*/ iso9660_ltime_t *pvd_date)
{ {
int timezone; int time_zone;
#ifdef HAVE_TM_GMTOFF #ifdef HAVE_TM_GMTOFF
/* Set time zone in 15-minute interval encoding. */ /* Set time zone in 15-minute interval encoding. */
timezone = p_tm->tm_gmtoff / 60; time_zone = p_tm->tm_gmtoff / 60;
#else #else
timezone = (p_tm->tm_isdst > 0) ? -60 : 0; time_zone = (p_tm->tm_isdst > 0) ? -60 : 0;
#endif #endif
iso9660_set_ltime_with_timezone (p_tm, timezone, pvd_date); iso9660_set_ltime_with_timezone (p_tm, time_zone, pvd_date);
} }
/*! /*!
@@ -771,10 +771,10 @@ iso9660_dir_add_entry_su(void *dir,
idr->volume_sequence_number = to_723(1); idr->volume_sequence_number = to_723(1);
idr->filename_len = to_711(strlen(filename) idr->filename.len = to_711(strlen(filename)
? strlen(filename) : 1); /* working hack! */ ? strlen(filename) : 1); /* working hack! */
memcpy(idr->filename, filename, from_711(idr->filename_len)); memcpy(&idr->filename.str[1], filename, from_711(idr->filename.len));
memcpy(&dir8[offset] + su_offset, su_data, su_size); memcpy(&dir8[offset] + su_offset, su_data, su_size);
} }
@@ -1126,7 +1126,7 @@ iso9660_get_application_id(iso9660_pvd_t *p_pvd)
return strdup(strip_trail(p_pvd->application_id, ISO_MAX_APPLICATION_ID)); return strdup(strip_trail(p_pvd->application_id, ISO_MAX_APPLICATION_ID));
} }
#if FIXME #ifdef FIXME
lsn_t lsn_t
iso9660_get_dir_extent(const iso9660_dir_t *idr) iso9660_get_dir_extent(const iso9660_dir_t *idr)
{ {
@@ -1142,7 +1142,7 @@ iso9660_get_dir_len(const iso9660_dir_t *idr)
return idr->length; return idr->length;
} }
#if FIXME #ifdef FIXME
uint8_t uint8_t
iso9660_get_dir_size(const iso9660_dir_t *idr) iso9660_get_dir_size(const iso9660_dir_t *idr)
{ {

95
lib/iso9660/iso9660_fs.c
View File

@@ -107,12 +107,10 @@ adjust_fuzzy_pvd( iso9660_t *p_iso )
frame and a header. frame and a header.
*/ */
if (CDIO_CD_FRAMESIZE_RAW == p_iso->i_framesize) { if (CDIO_CD_FRAMESIZE_RAW == p_iso->i_framesize) {
const int pre_user_data=CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE char buf[CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE];
+ CDIO_CD_SUBHEADER_SIZE;
char buf[pre_user_data]; i_byte_offset -= CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
i_byte_offset -= pre_user_data;
if ( DRIVER_OP_SUCCESS != cdio_stream_seek (p_iso->stream, i_byte_offset, if ( DRIVER_OP_SUCCESS != cdio_stream_seek (p_iso->stream, i_byte_offset,
SEEK_SET) ) SEEK_SET) )
return; return;
@@ -739,7 +737,7 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
if (!dir_len) return NULL; if (!dir_len) return NULL;
i_fname = from_711(p_iso9660_dir->filename_len); i_fname = from_711(p_iso9660_dir->filename.len);
/* .. string in statbuf is one longer than in p_iso9660_dir's listing '\1' */ /* .. string in statbuf is one longer than in p_iso9660_dir's listing '\1' */
stat_len = sizeof(iso9660_stat_t)+i_fname+2; stat_len = sizeof(iso9660_stat_t)+i_fname+2;
@@ -775,7 +773,7 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
calloc(1, sizeof(iso9660_stat_t)+i_rr_fname+2); calloc(1, sizeof(iso9660_stat_t)+i_rr_fname+2);
if (!p_stat_new) if (!p_stat_new)
{ {
cdio_warn("Couldn't calloc(1, %d)", sizeof(iso9660_stat_t)+i_rr_fname+2); cdio_warn("Couldn't calloc(1, %d)", (int)(sizeof(iso9660_stat_t)+i_rr_fname+2));
return NULL; return NULL;
} }
memcpy(p_stat_new, p_stat, stat_len); memcpy(p_stat_new, p_stat, stat_len);
@@ -784,15 +782,15 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
} }
strncpy(p_stat->filename, rr_fname, i_rr_fname+1); strncpy(p_stat->filename, rr_fname, i_rr_fname+1);
} else { } else {
if ('\0' == p_iso9660_dir->filename[0] && 1 == i_fname) if ('\0' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
strncpy (p_stat->filename, ".", sizeof(".")); strncpy (p_stat->filename, ".", sizeof("."));
else if ('\1' == p_iso9660_dir->filename[0] && 1 == i_fname) else if ('\1' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
strncpy (p_stat->filename, "..", sizeof("..")); strncpy (p_stat->filename, "..", sizeof(".."));
#ifdef HAVE_JOLIET #ifdef HAVE_JOLIET
else if (i_joliet_level) { else if (i_joliet_level) {
int i_inlen = i_fname; int i_inlen = i_fname;
cdio_utf8_t *p_psz_out = NULL; cdio_utf8_t *p_psz_out = NULL;
if (cdio_charset_to_utf8(p_iso9660_dir->filename, i_inlen, if (cdio_charset_to_utf8(&p_iso9660_dir->filename.str[1], i_inlen,
&p_psz_out, "UCS-2BE")) { &p_psz_out, "UCS-2BE")) {
strncpy(p_stat->filename, p_psz_out, i_fname); strncpy(p_stat->filename, p_psz_out, i_fname);
free(p_psz_out); free(p_psz_out);
@@ -804,7 +802,7 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
} }
#endif /*HAVE_JOLIET*/ #endif /*HAVE_JOLIET*/
else { else {
strncpy (p_stat->filename, p_iso9660_dir->filename, i_fname); strncpy (p_stat->filename, &p_iso9660_dir->filename.str[1], i_fname);
} }
} }
} }
@@ -878,12 +876,12 @@ iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir)
/* (iso9660_dir->file_flags & ISO_DIRECTORY) */ /* (iso9660_dir->file_flags & ISO_DIRECTORY) */
if (iso9660_dir->filename[0] == '\0') if (iso9660_dir->filename.str[1] == '\0')
return strdup("."); return strdup(".");
else if (iso9660_dir->filename[0] == '\1') else if (iso9660_dir->filename.str[1] == '\1')
return strdup(".."); return strdup("..");
else { else {
return strdup(iso9660_dir->filename); return strdup(&iso9660_dir->filename.str[1]);
} }
} }
@@ -982,13 +980,6 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
cdio_assert (_root->type == _STAT_DIR); cdio_assert (_root->type == _STAT_DIR);
if (_root->size != ISO_BLOCKSIZE * _root->secsize)
{
cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
(unsigned) _root->size,
(unsigned long int) ISO_BLOCKSIZE * _root->secsize);
}
_dirbuf = calloc(1, _root->secsize * ISO_BLOCKSIZE); _dirbuf = calloc(1, _root->secsize * ISO_BLOCKSIZE);
if (!_dirbuf) if (!_dirbuf)
{ {
@@ -1003,7 +994,7 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
while (offset < (_root->secsize * ISO_BLOCKSIZE)) while (offset < (_root->secsize * ISO_BLOCKSIZE))
{ {
iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset]; iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
iso9660_stat_t *p_stat; iso9660_stat_t *p_iso9660_stat;
int cmp; int cmp;
if (!iso9660_get_dir_len(p_iso9660_dir)) if (!iso9660_get_dir_len(p_iso9660_dir))
@@ -1012,27 +1003,26 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
continue; continue;
} }
p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, dunno, p_iso9660_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, dunno,
p_env->i_joliet_level); p_env->i_joliet_level);
cmp = strcmp(splitpath[0], p_stat->filename); cmp = strcmp(splitpath[0], p_iso9660_stat->filename);
if ( 0 != cmp && 0 == p_env->i_joliet_level if ( 0 != cmp && 0 == p_env->i_joliet_level
&& yep != p_stat->rr.b3_rock ) { && yep != p_iso9660_stat->rr.b3_rock ) {
char *trans_fname = NULL; char *trans_fname = NULL;
unsigned int i_trans_fname=strlen(p_stat->filename); unsigned int i_trans_fname=strlen(p_iso9660_stat->filename);
int trans_len;
if (i_trans_fname) { if (i_trans_fname) {
trans_fname = calloc(1, i_trans_fname+1); trans_fname = calloc(1, i_trans_fname+1);
if (!trans_fname) { if (!trans_fname) {
cdio_warn("can't allocate %lu bytes", cdio_warn("can't allocate %lu bytes",
(long unsigned int) strlen(p_stat->filename)); (long unsigned int) strlen(p_iso9660_stat->filename));
free(p_stat); free(p_iso9660_stat);
return NULL; return NULL;
} }
trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname, iso9660_name_translate_ext(p_iso9660_stat->filename, trans_fname,
p_env->i_joliet_level); p_env->i_joliet_level);
cmp = strcmp(splitpath[0], trans_fname); cmp = strcmp(splitpath[0], trans_fname);
free(trans_fname); free(trans_fname);
} }
@@ -1040,15 +1030,15 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
if (!cmp) { if (!cmp) {
iso9660_stat_t *ret_stat iso9660_stat_t *ret_stat
= _fs_stat_traverse (p_cdio, p_stat, &splitpath[1]); = _fs_stat_traverse (p_cdio, p_iso9660_stat, &splitpath[1]);
free(p_stat->rr.psz_symlink); free(p_iso9660_stat->rr.psz_symlink);
free(p_stat); free(p_iso9660_stat);
free (_dirbuf); free (_dirbuf);
return ret_stat; return ret_stat;
} }
free(p_stat->rr.psz_symlink); free(p_iso9660_stat->rr.psz_symlink);
free(p_stat); free(p_iso9660_stat);
offset += iso9660_get_dir_len(p_iso9660_dir); offset += iso9660_get_dir_len(p_iso9660_dir);
} }
@@ -1090,13 +1080,6 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
cdio_assert (_root->type == _STAT_DIR); cdio_assert (_root->type == _STAT_DIR);
if (_root->size != ISO_BLOCKSIZE * _root->secsize)
{
cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
(unsigned) _root->size,
(unsigned long int) ISO_BLOCKSIZE * _root->secsize);
}
_dirbuf = calloc(1, _root->secsize * ISO_BLOCKSIZE); _dirbuf = calloc(1, _root->secsize * ISO_BLOCKSIZE);
if (!_dirbuf) if (!_dirbuf)
{ {
@@ -1128,7 +1111,6 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
&& yep != p_stat->rr.b3_rock ) { && yep != p_stat->rr.b3_rock ) {
char *trans_fname = NULL; char *trans_fname = NULL;
unsigned int i_trans_fname=strlen(p_stat->filename); unsigned int i_trans_fname=strlen(p_stat->filename);
int trans_len;
if (i_trans_fname) { if (i_trans_fname) {
trans_fname = calloc(1, i_trans_fname+1); trans_fname = calloc(1, i_trans_fname+1);
@@ -1138,8 +1120,8 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
free(p_stat); free(p_stat);
return NULL; return NULL;
} }
trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname, iso9660_name_translate_ext(p_stat->filename, trans_fname,
p_iso->i_joliet_level); p_iso->i_joliet_level);
cmp = strcmp(splitpath[0], trans_fname); cmp = strcmp(splitpath[0], trans_fname);
free(trans_fname); free(trans_fname);
} }
@@ -1304,13 +1286,6 @@ iso9660_fs_readdir (CdIo_t *p_cdio, const char psz_path[], bool b_mode2)
uint8_t *_dirbuf = NULL; uint8_t *_dirbuf = NULL;
CdioList_t *retval = _cdio_list_new (); CdioList_t *retval = _cdio_list_new ();
if (p_stat->size != ISO_BLOCKSIZE * p_stat->secsize)
{
cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
(unsigned) p_stat->size,
(unsigned long int) ISO_BLOCKSIZE * p_stat->secsize);
}
_dirbuf = calloc(1, p_stat->secsize * ISO_BLOCKSIZE); _dirbuf = calloc(1, p_stat->secsize * ISO_BLOCKSIZE);
if (!_dirbuf) if (!_dirbuf)
{ {
@@ -1375,13 +1350,6 @@ iso9660_ifs_readdir (iso9660_t *p_iso, const char psz_path[])
uint8_t *_dirbuf = NULL; uint8_t *_dirbuf = NULL;
CdioList_t *retval = _cdio_list_new (); CdioList_t *retval = _cdio_list_new ();
if (p_stat->size != ISO_BLOCKSIZE * p_stat->secsize)
{
cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
(unsigned int) p_stat->size,
(unsigned long int) ISO_BLOCKSIZE * p_stat->secsize);
}
_dirbuf = calloc(1, p_stat->secsize * ISO_BLOCKSIZE); _dirbuf = calloc(1, p_stat->secsize * ISO_BLOCKSIZE);
if (!_dirbuf) if (!_dirbuf)
{ {
@@ -1450,7 +1418,7 @@ find_lsn_recurse (void *p_image, iso9660_readdir_t iso9660_readdir,
{ {
iso9660_stat_t *statbuf = _cdio_list_node_data (entnode); iso9660_stat_t *statbuf = _cdio_list_node_data (entnode);
const char *psz_filename = (char *) statbuf->filename; const char *psz_filename = (char *) statbuf->filename;
const unsigned int len = strlen(psz_path) + strlen(psz_filename)+2; unsigned int len = strlen(psz_path) + strlen(psz_filename)+2;
if (*ppsz_full_filename != NULL) free(*ppsz_full_filename); if (*ppsz_full_filename != NULL) free(*ppsz_full_filename);
*ppsz_full_filename = calloc(1, len); *ppsz_full_filename = calloc(1, len);
@@ -1463,8 +1431,7 @@ find_lsn_recurse (void *p_image, iso9660_readdir_t iso9660_readdir,
} }
if (statbuf->lsn == lsn) { if (statbuf->lsn == lsn) {
const unsigned int len2 = const unsigned int len2 = sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1;
sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1;
iso9660_stat_t *ret_stat = calloc(1, len2); iso9660_stat_t *ret_stat = calloc(1, len2);
if (!ret_stat) if (!ret_stat)
{ {