From 694a61cdf1dc0574ff2f0a1a90dab6002bca2e26 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Fri, 3 Oct 2003 02:36:52 +0000
Subject: [PATCH] cdio.{c,h}: update initializations for get_devices.

---
 NEWS                | 1 +
 include/cdio/cdio.h | 4 +++-
 lib/_cdio_bincue.c  | 7 +++++--
 lib/cdio.c          | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 373c9e41..ad0cface 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@
    for plugins that want to find a CD-DA to play or find a plugin that handles
    a particular device. 
 -  Start Darwin driver.
+-  BSDI fixes
 
 0.63
 -  create libiso9660 library and install that.
diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h
index 04cbd882..842cdb33 100644
--- a/include/cdio/cdio.h
+++ b/include/cdio/cdio.h
@@ -1,5 +1,5 @@
 /* -*- c -*-
-    $Id: cdio.h,v 1.28 2003/10/03 01:12:23 rocky Exp $
+    $Id: cdio.h,v 1.29 2003/10/03 02:36:52 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -392,6 +392,8 @@ extern "C" {
   
   char * cdio_get_default_device_solaris(void);
   
+  char **cdio_get_devices_solaris(void);
+  
   /*! Darwin OS X CD-reading routines. 
      NULL is returned on error.
    */
diff --git a/lib/_cdio_bincue.c b/lib/_cdio_bincue.c
index 18be4f2a..9736aae6 100644
--- a/lib/_cdio_bincue.c
+++ b/lib/_cdio_bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_bincue.c,v 1.34 2003/10/02 02:59:58 rocky Exp $
+    $Id: _cdio_bincue.c,v 1.35 2003/10/03 02:36:52 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.34 2003/10/02 02:59:58 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.35 2003/10/03 02:36:52 rocky Exp $";
 
 #include "cdio_assert.h"
 #include "cdio_private.h"
@@ -43,6 +43,9 @@ static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.34 2003/10/02 02:59:58 roc
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #ifdef HAVE_GLOB_H
 #include <glob.h>
 #endif
diff --git a/lib/cdio.c b/lib/cdio.c
index b251fe6b..b4dd5273 100644
--- a/lib/cdio.c
+++ b/lib/cdio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdio.c,v 1.31 2003/10/02 02:59:58 rocky Exp $
+    $Id: cdio.c,v 1.32 2003/10/03 02:36:52 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -37,7 +37,7 @@
 #include <cdio/logging.h>
 #include "cdio_private.h"
 
-static const char _rcsid[] = "$Id: cdio.c,v 1.31 2003/10/02 02:59:58 rocky Exp $";
+static const char _rcsid[] = "$Id: cdio.c,v 1.32 2003/10/03 02:36:52 rocky Exp $";
 
 
 const char *track_format2str[6] = 
@@ -88,7 +88,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
    &cdio_open_bsdi,
    &cdio_get_default_device_bsdi,
    &cdio_is_device_generic,
-   NULL
+   &cdio_get_devices_bsdi
   },
 
   {DRIVER_FREEBSD, 
@@ -121,7 +121,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
    &cdio_open_solaris,
    &cdio_get_default_device_solaris,
    &cdio_is_device_generic,
-   NULL
+   &cdio_get_devices_solaris
   },
 
   {DRIVER_OSX,