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

Smallish cosmetic changes. Bigger ones to iso9660_fs_readdir will

Browse Source 
probably occur later...
This commit is contained in:
rocky
2003-11-10 04:01:16 +00:00
parent 349b387c8b
commit a168b77870
2 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/cdio/iso9660.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: iso9660.h,v 1.29 2003/11/09 13:53:28 rocky Exp $ $Id: iso9660.h,v 1.30 2003/11/10 04:01:16 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -82,7 +82,7 @@
#define ISO_PVD_SECTOR 16 /**< Sector of Primary Volume Descriptor */ #define ISO_PVD_SECTOR 16 /**< Sector of Primary Volume Descriptor */
#define ISO_EVD_SECTOR 17 /**< Sector of End Volume Descriptor */ #define ISO_EVD_SECTOR 17 /**< Sector of End Volume Descriptor */
#define ISO_STANDARD_ID "CD001" /**< String inside track identifiying an #define ISO_STANDARD_ID "CD001" /**< String inside track identifying an
ISO 9660 filesystem. */ ISO 9660 filesystem. */
#define ISO_BLOCKSIZE 2048 /**< Number of bytes in an ISO #define ISO_BLOCKSIZE 2048 /**< Number of bytes in an ISO
9660 block */ 9660 block */
@@ -381,31 +381,33 @@ bool iso9660_find_fs_lsn(const CdIo *cdio, lsn_t lsn,
int iso9660_fs_stat (const CdIo *obj, const char pathname[], int iso9660_fs_stat (const CdIo *obj, const char pathname[],
/*out*/ iso9660_stat_t *stat, bool is_mode2); /*out*/ iso9660_stat_t *stat, bool is_mode2);
void * /* list of char* -- caller must free it */ /*! Read pathname (a directory) and return a list of of the files
iso9660_fs_readdir (const CdIo *obj, const char pathname[], bool mode2); inside that (char *). The caller must free the returned result.
*/
void * iso9660_fs_readdir (const CdIo *obj, const char pathname[], bool mode2);
uint8_t uint8_t iso9660_get_dir_len(const iso9660_dir_t *idr);
iso9660_get_dir_len(const iso9660_dir_t *idr);
#if FIXME #if FIXME
uint8_t uint8_t iso9660_get_dir_size(const iso9660_dir_t *idr);
iso9660_get_dir_size(const iso9660_dir_t *idr);
lsn_t lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
iso9660_get_dir_extent(const iso9660_dir_t *idr);
#endif #endif
uint8_t /*!
iso9660_get_pvd_type(const iso9660_pvd_t *pvd); Return the directory name stored in the iso9660_dir_t
const char * A string is allocated: the caller must deallocate.
iso9660_get_pvd_id(const iso9660_pvd_t *pvd); */
char * iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir);
int uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *pvd);
iso9660_get_pvd_space_size(const iso9660_pvd_t *pvd);
int const char * iso9660_get_pvd_id(const iso9660_pvd_t *pvd);
iso9660_get_pvd_block_size(const iso9660_pvd_t *pvd) ;
int iso9660_get_pvd_space_size(const iso9660_pvd_t *pvd);
int iso9660_get_pvd_block_size(const iso9660_pvd_t *pvd) ;
/*! Return the primary volume id version number (of pvd). /*! Return the primary volume id version number (of pvd).
If there is an error 0 is returned. If there is an error 0 is returned.

71
lib/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: iso9660_fs.c,v 1.11 2003/09/21 01:14:30 rocky Exp $ $Id: iso9660_fs.c,v 1.12 2003/11/10 04:01:16 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -38,30 +38,32 @@
#include <stdio.h> #include <stdio.h>
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.11 2003/09/21 01:14:30 rocky Exp $"; static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.12 2003/11/10 04:01:16 rocky Exp $";
static void static void
_idr2statbuf (const iso9660_dir_t *idr, iso9660_stat_t *stat, bool is_mode2) _iso9660_dir_to_statbuf (const iso9660_dir_t *iso9660_dir,
iso9660_stat_t *stat, bool is_mode2)
{ {
iso9660_xa_t *xa_data = NULL; iso9660_xa_t *xa_data = NULL;
uint8_t dir_len= iso9660_get_dir_len(idr); uint8_t dir_len= iso9660_get_dir_len(iso9660_dir);
memset ((void *) stat, 0, sizeof (iso9660_stat_t)); memset ((void *) stat, 0, sizeof (iso9660_stat_t));
if (!dir_len) return; if (!dir_len) return;
stat->type = (idr->file_flags & ISO_DIRECTORY) ? _STAT_DIR : _STAT_FILE; stat->type = (iso9660_dir->file_flags & ISO_DIRECTORY)
stat->lsn = from_733 (idr->extent); ? _STAT_DIR : _STAT_FILE;
stat->size = from_733 (idr->size); stat->lsn = from_733 (iso9660_dir->extent);
stat->size = from_733 (iso9660_dir->size);
stat->secsize = _cdio_len2blocks (stat->size, ISO_BLOCKSIZE); stat->secsize = _cdio_len2blocks (stat->size, ISO_BLOCKSIZE);
iso9660_get_dtime(&(idr->recording_time), true, &(stat->tm)); iso9660_get_dtime(&(iso9660_dir->recording_time), true, &(stat->tm));
cdio_assert (dir_len >= sizeof (iso9660_dir_t)); cdio_assert (dir_len >= sizeof (iso9660_dir_t));
if (is_mode2) { if (is_mode2) {
int su_length = iso9660_get_dir_len(idr) - sizeof (iso9660_dir_t); int su_length = iso9660_get_dir_len(iso9660_dir) - sizeof (iso9660_dir_t);
su_length -= idr->filename_len; su_length -= iso9660_dir->filename_len;
if (su_length % 2) if (su_length % 2)
su_length--; su_length--;
@@ -69,15 +71,17 @@ _idr2statbuf (const iso9660_dir_t *idr, iso9660_stat_t *stat, bool is_mode2)
if (su_length < 0 || su_length < sizeof (iso9660_xa_t)) if (su_length < 0 || su_length < sizeof (iso9660_xa_t))
return; return;
xa_data = (void *) (((char *) idr) + (iso9660_get_dir_len(idr) - su_length)); xa_data = (void *) (((char *) iso9660_dir)
+ (iso9660_get_dir_len(iso9660_dir) - su_length));
if (xa_data->signature[0] != 'X' if (xa_data->signature[0] != 'X'
|| xa_data->signature[1] != 'A') || xa_data->signature[1] != 'A')
{ {
cdio_warn ("XA signature not found in ISO9660's system use area;" cdio_warn ("XA signature not found in ISO9660's system use area;"
" ignoring XA attributes for this file entry."); " ignoring XA attributes for this file entry.");
cdio_debug ("%d %d %d, '%c%c' (%d, %d)", iso9660_get_dir_len(idr), cdio_debug ("%d %d %d, '%c%c' (%d, %d)",
idr->filename_len, iso9660_get_dir_len(iso9660_dir),
iso9660_dir->filename_len,
su_length, su_length,
xa_data->signature[0], xa_data->signature[1], xa_data->signature[0], xa_data->signature[1],
xa_data->signature[0], xa_data->signature[1]); xa_data->signature[0], xa_data->signature[1]);
@@ -88,24 +92,29 @@ _idr2statbuf (const iso9660_dir_t *idr, iso9660_stat_t *stat, bool is_mode2)
} }
static char * /*!
_idr2name (const iso9660_dir_t *idr) Return the directory name stored in the iso9660_dir_t
A string is allocated: the caller must deallocate.
*/
char *
iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir)
{ {
char namebuf[256] = { 0, }; char namebuf[256] = { 0, };
uint8_t len=iso9660_get_dir_len(idr); uint8_t len=iso9660_get_dir_len(iso9660_dir);
if (!len) return NULL; if (!len) return NULL;
cdio_assert (len >= sizeof (iso9660_dir_t)); cdio_assert (len >= sizeof (iso9660_dir_t));
/* (idr->file_flags & ISO_DIRECTORY) */ /* (iso9660_dir->file_flags & ISO_DIRECTORY) */
if (idr->filename[0] == '\0') if (iso9660_dir->filename[0] == '\0')
strcpy (namebuf, "."); strcpy (namebuf, ".");
else if (idr->filename[0] == '\1') else if (iso9660_dir->filename[0] == '\1')
strcpy (namebuf, ".."); strcpy (namebuf, "..");
else else
strncpy (namebuf, idr->filename, idr->filename_len); strncpy (namebuf, iso9660_dir->filename, iso9660_dir->filename_len);
return strdup (namebuf); return strdup (namebuf);
} }
@@ -116,7 +125,7 @@ _fs_stat_root (const CdIo *cdio, iso9660_stat_t *stat, bool is_mode2)
{ {
char block[ISO_BLOCKSIZE] = { 0, }; char block[ISO_BLOCKSIZE] = { 0, };
const iso9660_pvd_t *pvd = (void *) &block; const iso9660_pvd_t *pvd = (void *) &block;
const iso9660_dir_t *idr = (void *) pvd->root_directory_record; const iso9660_dir_t *iso9660_dir = (void *) pvd->root_directory_record;
if (is_mode2) { if (is_mode2) {
if (cdio_read_mode2_sector (cdio, &block, ISO_PVD_SECTOR, false)) if (cdio_read_mode2_sector (cdio, &block, ISO_PVD_SECTOR, false))
@@ -126,7 +135,7 @@ _fs_stat_root (const CdIo *cdio, iso9660_stat_t *stat, bool is_mode2)
cdio_assert_not_reached (); cdio_assert_not_reached ();
} }
_idr2statbuf (idr, stat, is_mode2); _iso9660_dir_to_statbuf (iso9660_dir, stat, is_mode2);
} }
static int static int
@@ -169,18 +178,18 @@ _fs_stat_traverse (const CdIo *cdio, const iso9660_stat_t *_root,
while (offset < (_root->secsize * ISO_BLOCKSIZE)) while (offset < (_root->secsize * ISO_BLOCKSIZE))
{ {
const iso9660_dir_t *idr = (void *) &_dirbuf[offset]; const iso9660_dir_t *iso9660_dir = (void *) &_dirbuf[offset];
iso9660_stat_t stat; iso9660_stat_t stat;
char *name; char *name;
if (!iso9660_get_dir_len(idr)) if (!iso9660_get_dir_len(iso9660_dir))
{ {
offset++; offset++;
continue; continue;
} }
name = _idr2name (idr); name = iso9660_dir_to_name (iso9660_dir);
_idr2statbuf (idr, &stat, is_mode2); _iso9660_dir_to_statbuf (iso9660_dir, &stat, is_mode2);
if (!strcmp (splitpath[0], name)) if (!strcmp (splitpath[0], name))
{ {
@@ -193,7 +202,7 @@ _fs_stat_traverse (const CdIo *cdio, const iso9660_stat_t *_root,
free (name); free (name);
offset += iso9660_get_dir_len(idr); offset += iso9660_get_dir_len(iso9660_dir);
} }
cdio_assert (offset == (_root->secsize * ISO_BLOCKSIZE)); cdio_assert (offset == (_root->secsize * ISO_BLOCKSIZE));
@@ -228,7 +237,11 @@ iso9660_fs_stat (const CdIo *cdio, const char pathname[],
return retval; return retval;
} }
void * /* list of char* -- caller must free it */
/*! Read pathname (a directory) and return a list of of the files
inside that (char *). The caller must free the returned result.
*/
void *
iso9660_fs_readdir (const CdIo *cdio, const char pathname[], bool is_mode2) iso9660_fs_readdir (const CdIo *cdio, const char pathname[], bool is_mode2)
{ {
iso9660_stat_t stat; iso9660_stat_t stat;
@@ -276,7 +289,7 @@ iso9660_fs_readdir (const CdIo *cdio, const char pathname[], bool is_mode2)
continue; continue;
} }
_cdio_list_append (retval, _idr2name (idr)); _cdio_list_append (retval, iso9660_dir_to_name (idr));
offset += iso9660_get_dir_len(idr); offset += iso9660_get_dir_len(idr);
} }