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

Deal with OS's that don't have a stat'able filesystem.

Browse Source 
More SuSe spec removal.

More SuSE spec removal
This commit is contained in:
rocky
2005-02-05 23:16:34 +00:00
parent 79d7a57f1f
commit 187c314225
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.34 2005/02/05 13:24:06 rocky Exp $ # $Id: Makefile.am,v 1.35 2005/02/05 23:16:34 rocky Exp $
# #
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
# #
@@ -21,7 +21,6 @@
## which make can then use to produce stuff. Isn't configuration simple? ## which make can then use to produce stuff. Isn't configuration simple?
EXTRA_DIST = libpopt.m4 THANKS README.libcdio \ EXTRA_DIST = libpopt.m4 THANKS README.libcdio \
package/libcdio-suse.spec \
package/libcdio.spec.in package/libcdio.spec \ package/libcdio.spec.in package/libcdio.spec \
libcdio.pc.in libcdio.pc \ libcdio.pc.in libcdio.pc \
libcdio_cdda.pc.in libcdio_cdda.pc \ libcdio_cdda.pc.in libcdio_cdda.pc \

3
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 73)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.140 2005/02/03 08:07:24 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.141 2005/02/05 23:16:34 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -545,7 +545,6 @@ AC_CONFIG_FILES([ \
libcdio_cdda.pc \ libcdio_cdda.pc \
libcdio_paranoia.pc \ libcdio_paranoia.pc \
libiso9660.pc \ libiso9660.pc \
package/libcdio-suse.spec \
package/libcdio.spec \ package/libcdio.spec \
src/cd-paranoia/Makefile \ src/cd-paranoia/Makefile \
src/cd-paranoia/usage.txt \ src/cd-paranoia/usage.txt \

4
doc/version.texi
View File

@@ -1,4 +1,4 @@
@set UPDATED 31 January 2005 @set UPDATED 5 February 2005
@set UPDATED-MONTH January 2005 @set UPDATED-MONTH February 2005
@set EDITION 0.73cvs @set EDITION 0.73cvs
@set VERSION 0.73cvs @set VERSION 0.73cvs

11
lib/cdda_interface/common_interface.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: common_interface.h,v 1.5 2005/01/22 03:45:19 rocky Exp $ $Id: common_interface.h,v 1.6 2005/02/05 23:16:34 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -29,6 +29,15 @@
#include <cdio/types.h> #include <cdio/types.h>
#include "low_interface.h" #include "low_interface.h"
#if defined(HAVE_LSTAT) && !defined(HAVE_WIN32_CDROM)
/* Define this if the CD-ROM device is a file in the filesystem
that can be lstat'd
*/
#define DEVICE_IN_FILESYSTEM 1
#else
#undef DEVICE_IN_FILESYSTEM
#endif
/** Test for presence of a cdrom by pinging with the 'CDROMVOLREAD' ioctl() */ /** Test for presence of a cdrom by pinging with the 'CDROMVOLREAD' ioctl() */
extern int ioctl_ping_cdrom(int fd); extern int ioctl_ping_cdrom(int fd);

4
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scan_devices.c,v 1.21 2005/02/05 04:23:56 rocky Exp $ $Id: scan_devices.c,v 1.22 2005/02/05 23:16:34 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -312,7 +312,7 @@ cdio_cddap_identify_cooked(const char *psz_dev, int messagedest,
{ {
CdIo_t *p_cdio = NULL; CdIo_t *p_cdio = NULL;
#ifdef HAVE_LSTAT #ifdef DEVICE_IN_FILESYSTEM
if (psz_dev) { if (psz_dev) {
char *psz_device = test_resolve_symlink(psz_dev, messagedest, char *psz_device = test_resolve_symlink(psz_dev, messagedest,
ppsz_messages); ppsz_messages);