Add routine cdio_is_bincue to test if file is a cue file.

cdio_open does a better job in automatically determining the type of file.

lib/_cdio_bincue.c

@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_bincue.c,v 1.14 2003/04/11 17:30:30 rocky Exp $
+    $Id: _cdio_bincue.c,v 1.15 2003/04/12 03:38:00 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.14 2003/04/11 17:30:30 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.15 2003/04/12 03:38:00 rocky Exp $";
 
 #include <stdio.h>
 #include <ctype.h>
@@ -524,6 +524,9 @@ _cdio_read_mode2_sectors (void *user_data, void *data, uint32_t lsn,
   return 0;
 }
 
+#define free_if_notnull(obj) \
+  if (NULL != obj) free(obj);
+
 /*!
   Set the device to use in I/O operations.
 */
@@ -534,7 +537,7 @@ _cdio_set_arg (void *user_data, const char key[], const char value[])
 
   if (!strcmp (key, "source"))
     {
-      free (_obj->gen.source_name);
+      free_if_notnull (_obj->gen.source_name);
 
       if (!value)
 	return -2;
@@ -552,7 +555,7 @@ _cdio_set_arg (void *user_data, const char key[], const char value[])
     }
   else if (!strcmp (key, "cue"))
     {
-      free (_obj->cue_name);
+      free_if_notnull (_obj->cue_name);
 
       if (!value)
 	return -2;
@@ -702,52 +705,42 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
     return false;
 }
 
-CdIo *
+/*! 
-cdio_open_bincue (const char *source_name)
+  Return corresponding BIN file if cue_name is a cue file or NULL
+  if not a CUE file.
+
+*/
+/* We can imagine more elaborate checks later. But this gets us 
+   started for now.
+*/
+char *
+cdio_is_cuefile(const char *cue_name) 
 {
-  CdIo *ret;
+  int   i;
-  _img_private_t *_data;
+  char *source_name;
   
-  cdio_funcs _funcs = {
+  if (cue_name == NULL) return false;
-    .eject_media        = cdio_generic_bogus_eject_media,
-    .free               = cdio_generic_stream_free,
-    .get_arg            = _cdio_get_arg,
-    .get_default_device = cdio_get_default_device_bincue,
-    .get_first_track_num= _cdio_get_first_track_num,
-    .get_num_tracks     = _cdio_get_num_tracks,
-    .get_track_format   = _cdio_get_track_format,
-    .get_track_green    = _cdio_get_track_green,
-    .get_track_lba      = _cdio_get_track_lba, 
-    .get_track_msf      = _cdio_get_track_msf,
-    .read_audio_sector  = _cdio_read_audio_sector,
-    .read_mode2_sector  = _cdio_read_mode2_sector,
-    .read_mode2_sectors = _cdio_read_mode2_sectors,
-    .set_arg            = _cdio_set_arg,
-    .stat_size          = _cdio_stat_size
-  };
 
-  _data                 = _cdio_malloc (sizeof (_img_private_t));
+  source_name=strdup(cue_name);
-  _data->gen.init       = false;
+  i=strlen(source_name)-strlen("cue");
-  _data->sector_2336    = false;
   
-  /* FIXME: should set cue initially.  */
+  if (i>0) {
-  _data->cue_name       = NULL;
+    if (cue_name[i]=='c' && cue_name[i+1]=='u' && cue_name[i+2]=='e') {
-
+      source_name[i++]='b'; source_name[i++]='i'; source_name[i++]='n';
-  ret = cdio_new (_data, &_funcs);
+      return source_name;
-  if (ret == NULL) return NULL;
+    } 
-
+    else if (cue_name[i]=='C' && cue_name[i+1]=='U' && cue_name[i+2]=='E') {
-  _cdio_set_arg(_data, "source", (NULL == source_name) 
+      source_name[i++]='B'; source_name[i++]='I'; source_name[i++]='N';
-		? DEFAULT_CDIO_DEVICE: source_name);
+      return source_name;
-
+    }
-  return ret;
+  }
+  free(source_name);
+  return NULL;
 }
 
-CdIo *
+static CdIo *
-cdio_open_cue (const char *cue_name)
+cdio_open_common (_img_private_t **_data)
 {
-  CdIo *ret;
-  _img_private_t *_data;
-
   cdio_funcs _funcs = {
     .eject_media        = cdio_generic_bogus_eject_media,
     .free               = cdio_generic_stream_free,
@@ -768,32 +761,56 @@ cdio_open_cue (const char *cue_name)
     .stat_size          = _cdio_stat_size
   };
 
-  _data                 = _cdio_malloc (sizeof (_img_private_t));
+  *_data                = _cdio_malloc (sizeof (_img_private_t));
-  _data->gen.init       = false;
+  (*_data)->gen.init    = false;
+  (*_data)->sector_2336 = false;
+  (*_data)->cue_name    = NULL;
 
-  if (cue_name != NULL) {
+  return cdio_new (*_data, &_funcs);
-    char *source_name=strdup(cue_name);
+}
-    int i=strlen(source_name)-strlen("cue");
 
-    if (i>0) {
+CdIo *
-      if (cue_name[i]=='c' && cue_name[i+1]=='u' && cue_name[i+2]=='e') {
+cdio_open_bincue (const char *source_name)
-	source_name[i++]='b'; source_name[i++]='i'; source_name[i++]='n';
+{
-      } 
+  CdIo *ret;
-      else if (cue_name[i]=='C' && cue_name[i+1]=='U' && cue_name[i+2]=='E') {
+  _img_private_t *_data;
-	source_name[i++]='B'; source_name[i++]='I'; source_name[i++]='N';
+
+  char *bin_name = cdio_is_cuefile(source_name);
+
+  if (NULL != bin_name) {
+    return cdio_open_cue(source_name);
   }
+  
+  ret = cdio_open_common(&_data);
+  if (ret == NULL) return NULL;
+
+  _cdio_set_arg(_data, "source", (NULL == source_name) 
+		? DEFAULT_CDIO_DEVICE: source_name);
+
+  return ret;
 }
+
+CdIo *
+cdio_open_cue (const char *cue_name)
+{
+  CdIo *ret;
+  _img_private_t *_data;
+  char *source_name;
+
+  ret = cdio_open_common(&_data);
+  if (ret == NULL) return NULL;
+
+  source_name = cdio_is_cuefile(cue_name);
+
+  if (NULL != source_name) {
     _cdio_set_arg (_data, "cue", cue_name);
     _cdio_set_arg (_data, "source", source_name);
     free(source_name);
   }
 
-  ret = cdio_new (_data, &_funcs);
+  if (_cdio_init(_data)) {
-  if (ret == NULL) return NULL;
-
-  if (_cdio_init(_data))
     return ret;
-  else {
+  } else {
     cdio_generic_stream_free (_data);
     return NULL;
   }

lib/_cdio_bsdi.h

@@ -1,29 +0,0 @@
-/*
-    $Id: _cdio_bsdi.h,v 1.1 2003/03/24 19:01:09 rocky Exp $
-
-    Copyright (C) 2001 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __VCD_IMAGE_BSDICD_H__
-#define __VCD_IMAGE_BSDICD_H__
-
-#include <libvcd/vcd_image.h>
-
-VcdImageSource *
-vcd_image_source_new_bsdicd (void);
-
-#endif /* __VCD_IMAGE_BSDICD_H__ */

lib/cdio.c

@@ -1,5 +1,5 @@
 /*
-    $Id: cdio.c,v 1.7 2003/04/10 04:13:41 rocky Exp $
+    $Id: cdio.c,v 1.8 2003/04/12 03:38:00 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -19,16 +19,23 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
 #include "cdio_assert.h"
 #include "util.h"
 #include "logging.h"
 #include "cdio_private.h"
 
-static const char _rcsid[] = "$Id: cdio.c,v 1.7 2003/04/10 04:13:41 rocky Exp $";
+static const char _rcsid[] = "$Id: cdio.c,v 1.8 2003/04/12 03:38:00 rocky Exp $";
 
 
 const char *track_format2str[5] = 
@@ -522,8 +529,38 @@ cdio_open (const char *source_name, driver_id_t driver_id)
 {
   if (CdIo_last_driver == -1) cdio_init();
 
+  if (NULL == source_name) return NULL;
+
+ retry:
   switch (driver_id) {
   case DRIVER_UNKNOWN: 
+    {
+      struct stat buf;
+      if (0 != stat(source_name, &buf)) {
+        cdio_error ("Can't stat file %s:", strerror(errno));
+        return NULL;
+      }
+      if (S_ISBLK(buf.st_mode) || S_ISCHR(buf.st_mode)) {
+        driver_id = DRIVER_DEVICE;
+      } else if (S_ISREG(buf.st_mode)) {
+        /* FIXME: check to see if is a text file. If so, then 
+           set SOURCE_CUE. */
+        int i=strlen(source_name)-strlen("bin");
+        if (i > 0
+            && ( (source_name)[i]   =='n' || (source_name)[i]   =='N' )
+            && ( (source_name)[i+1] =='r' || (source_name)[i+1] =='R' )
+            && ( (source_name)[i+2] =='g' || (source_name)[i+2] =='G' ) )
+          driver_id = DRIVER_NRG;
+        else if (i > 0
+            && ( (source_name)[i]   =='c' || (source_name)[i]   =='C')
+            && ( (source_name)[i+1] =='u' || (source_name)[i+1] =='U')
+            && ( (source_name)[i+2] =='e' || (source_name)[i+2] =='E') ) 
+          driver_id = DRIVER_BINCUE;
+        else
+          driver_id = DRIVER_BINCUE;
+      }
+      goto retry;
+    }
   case DRIVER_DEVICE: 
     {  
       /* Scan for a driver. */

lib/cdio.h

@@ -1,5 +1,5 @@
 /*
-    $Id: cdio.h,v 1.8 2003/04/10 04:13:41 rocky Exp $
+    $Id: cdio.h,v 1.9 2003/04/12 03:38:00 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -304,6 +304,9 @@ extern "C" {
   
   char * cdio_get_default_device_nrg(void);
 
+  /*! Return true if cue_name is a cue file. */
+  char *cdio_is_cuefile(const char *cue_name);
+  
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */