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

Make ds.h public. It should have been that way since it *is* public.

Browse Source 
Eventually though we'll redo things using glib and then ds.h will get
removed.
This commit is contained in:
rocky
2004-10-09 03:20:28 +00:00
parent 6d187c9f54
commit 0dd6c21281
11 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
example/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.7 2004/08/06 22:05:16 rocky Exp $
# $Id: Makefile.am,v 1.8 2004/10/09 03:20:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -21,10 +21,11 @@
####################################################
#
noinst_PROGRAMS = sample1 sample2 sample3 sample4 sample5 sample6 \
sample7 sample8 sample9 sample10
sample7 sample8 sample9 sample10 iso1
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS)
sample1_LDADD = $(LIBCDIO_LIBS)
sample2_LDADD = $(LIBCDIO_LIBS)
sample3_LDADD = $(LIBCDIO_LIBS)

3
include/cdio/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.11 2004/07/25 16:35:29 rocky Exp $
# $Id: Makefile.am,v 1.12 2004/10/09 03:20:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -26,6 +26,7 @@ libcdioinclude_HEADERS = \
cdio.h \
cdtext.h \
cd_types.h \
ds.h \
dvd.h \
iso9660.h \
logging.h \

7
lib/ds.h → include/cdio/ds.h
View File

@@ -1,7 +1,7 @@
/*
$Id: ds.h,v 1.3 2003/04/22 12:09:09 rocky Exp $
$Id: ds.h,v 1.1 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,6 +17,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Note: this header will is slated to get removed and libcdio will use
glib.h routines instead.
*/
#ifndef __CDIO_DS_H__
#define __CDIO_DS_H__

36
include/cdio/iso9660.h
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660.h,v 1.46 2004/09/04 23:49:47 rocky Exp $
$Id: iso9660.h,v 1.47 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -340,7 +340,7 @@ typedef struct _iso9660 iso9660_t;
Open an ISO 9660 image for reading. Maybe in the future we will have
flags and mode. NULL is returned on error.
*/
iso9660_t *iso9660_open (const char *pathname /*flags, mode */);
iso9660_t *iso9660_open (const char *psz_pathname /*flags, mode */);
/*!
Close previously opened ISO 9660 image.
@@ -354,7 +354,7 @@ typedef struct _iso9660 iso9660_t;
Seek to a position and then read n bytes. Size read is returned.
*/
long int iso9660_iso_seek_read (const iso9660_t *p_iso, void *ptr,
lsn_t start, long int size);
lsn_t start, long int i_size);
/*!
Read the Primary Volume Descriptor for an ISO 9660 image.
@@ -424,7 +424,7 @@ bool iso9660_isachar (int c);
The length of the translated string is returned.
*/
int iso9660_name_translate(const char *oldname, char *newname);
int iso9660_name_translate(const char *psz_oldname, char *psz_newname);
/*!
Pad string src with spaces to size len and copy this to dst. If
@@ -462,7 +462,7 @@ bool iso9660_dirname_valid_p (const char pathname[]);
number. For example, mydir/file.ext -> MYDIR/FILE.EXT;1 for version
1. The resulting ISO-9660 pathname is returned.
*/
char *iso9660_pathname_isofy (const char pathname[], uint16_t version);
char *iso9660_pathname_isofy (const char pathname[], uint16_t i_version);
/*!
Check that pathname is a valid ISO-9660 pathname.
@@ -562,7 +562,7 @@ void * iso9660_fs_readdir (const CdIo *obj, const char pathname[], bool mode2);
Read pathname (a directory) and return a list of iso9660_stat_t
of the files inside that. The caller must free the returned result.
*/
void * iso9660_ifs_readdir (iso9660_t *iso, const char pathname[]);
void * iso9660_ifs_readdir (iso9660_t *p_iso, const char pathname[]);
/*!
Return the PVD's application ID.
@@ -571,12 +571,12 @@ void * iso9660_ifs_readdir (iso9660_t *iso, const char pathname[]);
const char * iso9660_get_application_id(const iso9660_pvd_t *p_pvd);
uint8_t iso9660_get_dir_len(const iso9660_dir_t *idr);
uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
#if FIXME
uint8_t iso9660_get_dir_size(const iso9660_dir_t *idr);
uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
#endif
/*!
@@ -584,7 +584,7 @@ lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
A string is allocated: the caller must deallocate.
*/
char * iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir);
char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
/*!
Return a string containing the preparer id with trailing
@@ -596,15 +596,15 @@ const char *iso9660_get_preparer_id(const iso9660_pvd_t *pvd);
Return a string containing the PVD's publisher id with trailing
blanks removed.
*/
const char *iso9660_get_publisher_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_publisher_id(const iso9660_pvd_t *p_pvd);
uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *pvd);
uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *p_pvd);
const char * iso9660_get_pvd_id(const iso9660_pvd_t *pvd);
const char * iso9660_get_pvd_id(const iso9660_pvd_t *p_pvd);
int iso9660_get_pvd_space_size(const iso9660_pvd_t *pvd);
int iso9660_get_pvd_space_size(const iso9660_pvd_t *p_pvd);
int iso9660_get_pvd_block_size(const iso9660_pvd_t *pvd) ;
int iso9660_get_pvd_block_size(const iso9660_pvd_t *p_pvd) ;
/*! Return the primary volume id version number (of pvd).
If there is an error 0 is returned.
@@ -621,18 +621,18 @@ const char *iso9660_get_system_id(const iso9660_pvd_t *pvd);
/*! Return the LSN of the root directory for pvd.
If there is an error CDIO_INVALID_LSN is returned.
*/
lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *pvd);
lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *p_pvd);
/*!
Return the PVD's volume ID.
*/
const char *iso9660_get_volume_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_volume_id(const iso9660_pvd_t *p_pvd);
/*!
Return the PVD's volumeset ID.
NULL is returned if there is some problem in getting this.
*/
const char *iso9660_get_volumeset_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_volumeset_id(const iso9660_pvd_t *p_pvd);
/* pathtable */

5
lib/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.48 2004/09/02 00:49:31 rocky Exp $
# $Id: Makefile.am,v 1.49 2004/10/09 03:20:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -51,7 +51,7 @@ libiso9660_la_AGE := 0
EXTRA_DIST = image/Makefile FreeBSD/Makefile MSWindows/Makefile
noinst_HEADERS = cdio_assert.h bytesex.h bytesex_asm.h \
cdio_private.h ds.h
cdio_private.h
libcdio_sources = \
_cdio_bsdi.c \
@@ -70,7 +70,6 @@ libcdio_sources = \
cdtext.c \
cdtext_private.h \
ds.c \
ds.h \
FreeBSD/freebsd.c \
FreeBSD/freebsd.h \
FreeBSD/freebsd_cam.c \

6
lib/ds.c
View File

@@ -1,5 +1,5 @@
/*
$Id: ds.c,v 1.3 2003/04/22 12:09:09 rocky Exp $
$Id: ds.c,v 1.4 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -25,12 +25,12 @@
#include <stdlib.h>
#include <string.h>
#include "ds.h"
#include <cdio/ds.h>
#include <cdio/util.h>
#include <cdio/types.h>
#include "cdio_assert.h"
static const char _rcsid[] = "$Id: ds.c,v 1.3 2003/04/22 12:09:09 rocky Exp $";
static const char _rcsid[] = "$Id: ds.c,v 1.4 2004/10/09 03:20:28 rocky Exp $";
struct _CdioList
{

6
lib/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $
$Id: nrg.c,v 1.41 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -37,16 +37,16 @@
#include <glob.h>
#endif
#include <cdio/ds.h>
#include <cdio/logging.h>
#include <cdio/util.h>
#include <cdio/version.h>
#include "cdio_assert.h"
#include "bytesex.h"
#include "ds.h"
#include "_cdio_stdio.h"
#include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.41 2004/10/09 03:20:28 rocky Exp $";
/* reader */

30
lib/image_common.h
View File

@@ -1,5 +1,5 @@
/*
$Id: image_common.h,v 1.16 2004/08/13 13:04:37 rocky Exp $
$Id: image_common.h,v 1.17 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -40,22 +40,22 @@
static void
_free_image (void *user_data)
{
_img_private_t *env = user_data;
_img_private_t *p_env = user_data;
track_t i_track;
if (NULL == env) return;
if (NULL == p_env) return;
for (i_track=0; i_track < env->gen.i_tracks; i_track++) {
free_if_notnull(env->tocent[i_track].filename);
free_if_notnull(env->tocent[i_track].isrc);
cdtext_destroy(&(env->tocent[i_track].cdtext));
for (i_track=0; i_track < p_env->gen.i_tracks; i_track++) {
free_if_notnull(p_env->tocent[i_track].filename);
free_if_notnull(p_env->tocent[i_track].isrc);
cdtext_destroy(&(p_env->tocent[i_track].cdtext));
}
free_if_notnull(env->psz_mcn);
free_if_notnull(env->psz_cue_name);
cdtext_destroy(&(env->gen.cdtext));
cdio_generic_stdio_free(env);
free(env);
free_if_notnull(p_env->psz_mcn);
free_if_notnull(p_env->psz_cue_name);
cdtext_destroy(&(p_env->gen.cdtext));
cdio_generic_stdio_free(p_env);
free(p_env);
}
#ifdef NEED_MEDIA_EJECT_IMAGE
@@ -77,12 +77,12 @@ _eject_media_image(void *user_data)
static const char *
_get_arg_image (void *user_data, const char key[])
{
_img_private_t *env = user_data;
_img_private_t *p_env = user_data;
if (!strcmp (key, "source")) {
return env->gen.source_name;
return p_env->gen.source_name;
} else if (!strcmp (key, "cue")) {
return env->psz_cue_name;
return p_env->psz_cue_name;
} else if (!strcmp(key, "access-mode")) {
return "image";
}

6
lib/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660_fs.c,v 1.23 2004/06/21 16:18:08 rocky Exp $
$Id: iso9660_fs.c,v 1.24 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -28,19 +28,19 @@
#endif
#include <cdio/cdio.h>
#include <cdio/ds.h>
#include <cdio/iso9660.h>
#include <cdio/util.h>
/* Private headers */
#include "cdio_assert.h"
#include "bytesex.h"
#include "ds.h"
#include "_cdio_stdio.h"
#include "cdio_private.h"
#include <stdio.h>
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.23 2004/06/21 16:18:08 rocky Exp $";
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.24 2004/10/09 03:20:28 rocky Exp $";
/* Implementation of iso9660_t type */
struct _iso9660 {

4
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-info.c,v 1.89 2004/09/02 01:33:57 rocky Exp $
$Id: cd-info.c,v 1.90 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -37,6 +37,7 @@
#include <libvcd/info.h>
#endif
#include <cdio/ds.h>
#include <cdio/util.h>
#include <cdio/cd_types.h>
#include <cdio/cdtext.h>
@@ -45,7 +46,6 @@
#include "cdio_assert.h"
#include "bytesex.h"
#include "ds.h"
#include "iso9660_private.h"
#include <fcntl.h>

4
src/iso-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso-info.c,v 1.9 2004/06/19 19:15:15 rocky Exp $
$Id: iso-info.c,v 1.10 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -33,6 +33,7 @@
#endif
#include <sys/types.h>
#include <cdio/cdio.h>
#include <cdio/ds.h>
#include <cdio/iso9660.h>
#include <stdio.h>
@@ -45,7 +46,6 @@
#include <errno.h>
#include "ds.h"
#if 0
#define STRONG "\033[1m"