New upstream version 11.6.2.1

1 files changed, 8 insertions, 2 deletions

diff --git a/src/audiocd.c b/src/audiocd.c
index 183c0a2..8a6abe6 100644
--- a/src/audiocd.c
+++ b/src/audiocd.c
@@ -95,16 +95,22 @@ void get_toc_audiocd (misc_t *misc, daisy_t *daisy)
    dir = "";
    if ((cd = cdio_open (misc->cd_dev, DRIVER_UNKNOWN)) == NULL)
    {
+      int e = errno;
       endwin ();
       beep ();
-      _exit (0);
+      printf ("open %s: %s\n", misc->cd_dev, strerror (e));
+      _exit (EXIT_FAILURE);
    } // if
    misc->total_items = cdio_get_num_tracks (cd);
    first_track = cdio_get_first_track_num (cd);
    for (misc->current = 0; misc->current < misc->total_items; misc->current++)
    {
+      int x;
+
       snprintf (daisy[misc->current].label, 15, "Track %2d", misc->current + 1);
-      snprintf (daisy[misc->current].filename, MAX_STR - 1,
+      x = strlen (dir) + 15;
+      daisy[misc->current].filename = malloc (x);
+      snprintf (daisy[misc->current].filename, x,
                 "%s/Track %d.wav", dir, misc->current + 1);
       daisy[misc->current].first_lsn = cdio_get_track_lsn (cd,
                                                      first_track + misc->current);