-avoid duplicate option designation

-don't exit on trivial cddb errors
-don't print NULL string on error
arrgh - this stuff sucks, too bad serious programs are depending on it

3 files changed, 39 insertions, 1 deletions

diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index a67a6ada785..b84a6477ab9 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/04/08 18:52:33 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/04/19 18:08:27 drochner Exp $
 
 SHA1 (libcdio-0.68.tar.gz) = c3935f6fd66d6f6fe1451862d5281fd292eabb89
 Size (libcdio-0.68.tar.gz) = 1253630 bytes
+SHA1 (patch-aa) = ebda7a5453404e6adf4755f768a5293ca9871878
+SHA1 (patch-ab) = 2d937aa72b392264777c24fdc454d7863b5e8544
diff --git a/misc/libcdio/patches/patch-aa b/misc/libcdio/patches/patch-aa
new file mode 100644
index 00000000000..84e4a0c2b88
--- /dev/null
+++ b/misc/libcdio/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2004/04/19 18:08:27 drochner Exp $
+
+--- lib/logging.c.orig	2004-04-18 17:24:27.000000000 +0000
++++ lib/logging.c	2004-04-18 17:25:33.000000000 +0000
+@@ -44,7 +44,9 @@
+         fprintf (stderr, "**ERROR: %s\n", message);
+         fflush (stderr);
+       }
++#if 0
+       exit (EXIT_FAILURE);
++#endif
+       break;
+     case CDIO_LOG_DEBUG:
+       if (level >= cdio_loglevel_default) {
diff --git a/misc/libcdio/patches/patch-ab b/misc/libcdio/patches/patch-ab
new file mode 100644
index 00000000000..f4e56e9a3f7
--- /dev/null
+++ b/misc/libcdio/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2004/04/19 18:08:27 drochner Exp $
+
+--- src/cd-info.c.orig	2004-03-20 22:46:57.000000000 +0000
++++ src/cd-info.c	2004-04-18 17:50:54.000000000 +0000
+@@ -123,7 +123,7 @@
+   int opt;
+ 
+   struct poptOption optionsTable[] = {
+-    {"access-mode",       'a', POPT_ARG_STRING, &opts.access_mode, 0,
++    {"access-mode",       'm', POPT_ARG_STRING, &opts.access_mode, 0,
+      "Set CD access methed"},
+     
+     {"debug",       'd', POPT_ARG_INT, &opts.debug_level, 0,
+@@ -426,7 +426,7 @@
+   matches = cddb_query(conn, disc);
+ 
+   if (-1 == matches) 
+-    printf("%s: %s\n", program_name, cddb_error_str(errno));
++    printf("%s: %s\n", program_name, cddb_error_str(cddb_errno(conn)));
+   else {
+     printf("%s: Found %d matches in CDDB\n", program_name, matches);
+     for (i=1; i<=matches; i++) {