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

A hacky OSX close drive routine. It doesn't handle the actual drive

Browse Source 
paramater because we don't really know how to pass that to druti.
This commit is contained in:
rocky
2005-03-13 04:42:38 +00:00
parent e80b06c4ce
commit 02ce555171
2 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio_private.h,v 1.26 2005/03/11 02:08:05 rocky Exp $ $Id: cdio_private.h,v 1.27 2005/03/13 04:42:38 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -473,10 +473,11 @@ extern "C" {
void cdio_add_device_list(char **device_list[], const char *psz_drive, void cdio_add_device_list(char **device_list[], const char *psz_drive,
unsigned int *i_drives); unsigned int *i_drives);
driver_return_code_t close_tray_freebsd (const char *psz_device); driver_return_code_t close_tray_freebsd (const char *psz_drive);
driver_return_code_t close_tray_linux (const char *psz_device); driver_return_code_t close_tray_linux (const char *psz_drive);
driver_return_code_t close_tray_solaris(const char *psz_device); driver_return_code_t close_tray_osx (const char *psz_drive);
driver_return_code_t close_tray_win32 (const char *psz_win32_drive); driver_return_code_t close_tray_solaris (const char *psz_drive);
driver_return_code_t close_tray_win32 (const char *psz_drive);
#ifdef __cplusplus #ifdef __cplusplus

76
lib/driver/osx.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: osx.c,v 1.1 2005/03/05 09:26:52 rocky Exp $ $Id: osx.c,v 1.2 2005/03/13 04:42:38 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
from vcdimager code: from vcdimager code:
@@ -34,7 +34,7 @@
#include "config.h" #include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: osx.c,v 1.1 2005/03/05 09:26:52 rocky Exp $"; static const char _rcsid[] = "$Id: osx.c,v 1.2 2005/03/13 04:42:38 rocky Exp $";
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -1324,29 +1324,29 @@ _eject_media_osx (void *user_data) {
_img_private_t *p_env = user_data; _img_private_t *p_env = user_data;
FILE *p_eject; FILE *p_file;
char *psz_disk; char *psz_drive;
char sz_cmd[32]; char sz_cmd[32];
if( ( psz_disk = (char *)strstr( p_env->gen.source_name, "disk" ) ) != NULL && if( ( psz_drive = (char *)strstr( p_env->gen.source_name, "disk" ) ) != NULL &&
strlen( psz_disk ) > 4 ) strlen( psz_drive ) > 4 )
{ {
#define EJECT_CMD "/usr/sbin/hdiutil eject %s" #define EJECT_CMD "/usr/sbin/hdiutil eject %s"
snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_disk ); snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_drive );
#undef EJECT_CMD #undef EJECT_CMD
if( ( p_eject = popen( sz_cmd, "r" ) ) != NULL ) if( ( p_file = popen( sz_cmd, "r" ) ) != NULL )
{ {
char psz_result[0x200]; char psz_result[0x200];
int i_ret = fread( psz_result, 1, sizeof(psz_result) - 1, p_eject ); int i_ret = fread( psz_result, 1, sizeof(psz_result) - 1, p_file );
if( i_ret == 0 && ferror( p_eject ) != 0 ) if( i_ret == 0 && ferror( p_file ) != 0 )
{ {
pclose( p_eject ); pclose( p_file );
return DRIVER_OP_ERROR; return DRIVER_OP_ERROR;
} }
pclose( p_eject ); pclose( p_file );
psz_result[ i_ret ] = 0; psz_result[ i_ret ] = 0;
@@ -1508,6 +1508,58 @@ set_speed_osx (void *p_user_data, int i_speed)
#endif /* HAVE_DARWIN_CDROM */ #endif /* HAVE_DARWIN_CDROM */
/*!
Close tray on CD-ROM.
@param psz_drive the CD-ROM drive to be closed.
*/
/* FIXME: We don't use the device name because we don't how
to.
*/
#define CLOSE_TRAY_CMD "/usr/sbin/drutil tray close"
driver_return_code_t
close_tray_osx (const char *psz_drive)
{
#ifdef HAVE_DARWIN_CDROM
FILE *p_file;
char sz_cmd[80];
if ( !psz_drive) return DRIVER_OP_UNINIT;
/* Right now we really aren't making use of snprintf, but
possibly someday we will.
*/
snprintf( sz_cmd, sizeof(sz_cmd), CLOSE_TRAY_CMD );
if( ( p_file = popen( sz_cmd, "r" ) ) != NULL )
{
char psz_result[0x200];
int i_ret = fread( psz_result, 1, sizeof(psz_result) - 1, p_file );
if( i_ret == 0 && ferror( p_file ) != 0 )
{
pclose( p_file );
return DRIVER_OP_ERROR;
}
pclose( p_file );
psz_result[ i_ret ] = 0;
if( 0 == i_ret )
{
return DRIVER_OP_SUCCESS;
}
}
return DRIVER_OP_ERROR;
#else
return DRIVER_OP_NO_DRIVER;
#endif /*HAVE_DARWIN_CDROM*/
}
/*! /*!
Return a string containing the default CD device if none is specified. Return a string containing the default CD device if none is specified.
*/ */